'.$val['description'].'
'.$this->l('Warning:').' '.$this->l('this tool can ONLY be used if you are hosted by an Apache web server. Please ask your webhost.').'
'.$this->l('This tool will automatically generate a ".htaccess" file that will give you the ability to do URL rewriting and to catch 404 errors.').'
'.$this->l('Warning:').' '.$this->l('Your file robots.txt MUST be in your website\'s root directory and nowhere else.').'
'.$this->l('eg: http://www.yoursite.com/robots.txt').'.
'.$this->l('The module must be either a zip file or a tarball.').'
'.$desc.''.$this->youEditFieldFor().'
diff --git a/admin-dev/tabs/AdminPerformance.php b/admin-dev/tabs/AdminPerformance.php index 6f18fb381..d1dd0b6b3 100644 --- a/admin-dev/tabs/AdminPerformance.php +++ b/admin-dev/tabs/AdminPerformance.php @@ -64,7 +64,7 @@ class AdminPerformance extends AdminTab { $settings = preg_replace('/define\(\'_PS_CACHE_ENABLED_\', \'([0-9])\'\);/Ui', 'define(\'_PS_CACHE_ENABLED_\', \''.(int)$cache_active.'\');', $settings); if (file_put_contents(dirname(__FILE__).'/../../config/settings.inc.php', $settings)) - Tools::redirectAdmin($currentIndex.'&token='.Tools::getValue('token').'&conf=4'); + Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4'); else $this->_errors[] = Tools::displayError('Cannot overwrite settings file.'); } @@ -85,7 +85,7 @@ class AdminPerformance extends AdminTab if (!sizeof($this->_errors)) { if (MCached::addServer(pSQL(Tools::getValue('memcachedIp')), (int)Tools::getValue('memcachedPort'), (int)Tools::getValue('memcachedWeight'))) - Tools::redirectAdmin($currentIndex.'&token='.Tools::getValue('token').'&conf=4'); + Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4'); else $this->_errors[] = Tools::displayError('Cannot add Memcached server'); } @@ -98,7 +98,7 @@ class AdminPerformance extends AdminTab if ($this->tabAccess['add'] === '1') { if (MCached::deleteServer((int)Tools::getValue('deleteMemcachedServer'))) - Tools::redirectAdmin($currentIndex.'&token='.Tools::getValue('token').'&conf=4'); + Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4'); else $this->_errors[] = Tools::displayError('Error in deleting Memcached server'); } @@ -137,7 +137,7 @@ class AdminPerformance extends AdminTab if (file_put_contents(dirname(__FILE__).'/../../config/settings.inc.php', $settings)) { Configuration::updateValue('PS_CIPHER_ALGORITHM', $algo); - Tools::redirectAdmin($currentIndex.'&token='.Tools::getValue('token').'&conf=4'); + Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4'); } else $this->_errors[] = Tools::displayError('Cannot overwrite settings file.'); @@ -160,7 +160,7 @@ class AdminPerformance extends AdminTab ) $this->_errors[] = Tools::displayError('Unknown error.'); else - Tools::redirectAdmin($currentIndex.'&token='.Tools::getValue('token').'&conf=4'); + Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4'); } else $this->_errors[] = Tools::displayError('You do not have permission to edit here.'); @@ -185,7 +185,7 @@ class AdminPerformance extends AdminTab unset($this->_fieldsGeneral['_MEDIA_SERVER_1_']); unset($this->_fieldsGeneral['_MEDIA_SERVER_2_']); unset($this->_fieldsGeneral['_MEDIA_SERVER_3_']); - Tools::redirectAdmin($currentIndex.'&token='.Tools::getValue('token').'&conf=4'); + Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4'); } } else @@ -197,7 +197,7 @@ class AdminPerformance extends AdminTab { Configuration::updateValue('PS_SMARTY_FORCE_COMPILE', Tools::getValue('smarty_force_compile', 0)); Configuration::updateValue('PS_SMARTY_CACHE', Tools::getValue('smarty_cache', 0)); - Tools::redirectAdmin($currentIndex.'&token='.Tools::getValue('token').'&conf=4'); + Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4'); } else $this->_errors[] = Tools::displayError('You do not have permission to edit here.'); @@ -246,7 +246,7 @@ class AdminPerformance extends AdminTab '; echo ' -
'.$this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.').'
'.$this->l('You must enter another domain or subdomain in order to use cookieless static content.').'
'.$this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.').'
'.$this->l('Indexation').'
'.$this->l('There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can refresh this index by clicking on the button below. Be aware that it may take a long time and it is only needed if you modified or added a referrer and if you want your changes to be retroactive.').'
'.$this->l('Cache').'
'.$this->l('For you to sort and filter your data, it is cached. You can refresh the cache by clicking on the button below.').'
'.$this->l('Export data from one language to a file (language pack).').''. $this->l('Choose the theme from which you want to export translations.').' @@ -790,7 +790,7 @@ class AdminTranslations extends AdminTab '; $allLanguages = Language::getLanguages(false); echo ' -
'.$this->l('Copies data from one language to another.').''. $this->l('Be careful, as it will replace all existing data for the destination language!').''. @@ -996,7 +996,7 @@ class AdminTranslations extends AdminTab if (!$this->suhosin_limit_exceed) { $str_output .= ' -
-
+
