From 828563d22890d92525c68b4fcf650b769be47430 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Tue, 12 Mar 2013 12:19:22 +0100 Subject: [PATCH] // Added hook call in adminperformance --- controllers/admin/AdminPerformanceController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php index 74ea8d846..8c1c4e2f5 100644 --- a/controllers/admin/AdminPerformanceController.php +++ b/controllers/admin/AdminPerformanceController.php @@ -548,6 +548,7 @@ class AdminPerformanceControllerCore extends AdminController return; } + Hook::exec('action'.get_class($this).ucfirst($this->action).'Before', array('controller' => $this)); if (Tools::isSubmit('submitAddServer')) { if ($this->tabAccess['add'] === '1') @@ -742,13 +743,13 @@ class AdminPerformanceControllerCore extends AdminController if ($cache_active && $caching_system == 'CacheMemcache' && !extension_loaded('memcache')) $this->errors[] = Tools::displayError('To use Memcached, you must install the Memcache PECL extension on your server.').' http://www.php.net/manual/en/memcache.installation.php'; - else if ($cache_active && $caching_system == 'CacheApc' && !extension_loaded('apc')) + elseif ($cache_active && $caching_system == 'CacheApc' && !extension_loaded('apc')) $this->errors[] = Tools::displayError('To use APC cache, you must install the APC PECL extension on your server.').' http://fr.php.net/manual/fr/apc.installation.php'; - else if ($cache_active && $caching_system == 'CacheXcache' && !extension_loaded('xcache')) + elseif ($cache_active && $caching_system == 'CacheXcache' && !extension_loaded('xcache')) $this->errors[] = Tools::displayError('To use Xcache, you must install the Xcache extension on your server.').' http://xcache.lighttpd.net'; - else if ($cache_active && $caching_system == 'CacheFs' && !is_writable(_PS_CACHEFS_DIRECTORY_)) + elseif ($cache_active && $caching_system == 'CacheFs' && !is_writable(_PS_CACHEFS_DIRECTORY_)) $this->errors[] = sprintf( Tools::displayError('To use CacheFS the directory %s must be writable.'), realpath(_PS_CACHEFS_DIRECTORY_) @@ -765,7 +766,7 @@ class AdminPerformanceControllerCore extends AdminController Configuration::updateValue('PS_CACHEFS_DIRECTORY_DEPTH', (int)$depth); } } - else if ($caching_system == 'CacheMemcache' && $cache_active && !_PS_CACHE_ENABLED_ && _PS_CACHING_SYSTEM_ == 'CacheMemcache') + elseif ($caching_system == 'CacheMemcache' && $cache_active && !_PS_CACHE_ENABLED_ && _PS_CACHING_SYSTEM_ == 'CacheMemcache') Cache::getInstance()->flush(); if (!count($this->errors)) @@ -785,7 +786,10 @@ class AdminPerformanceControllerCore extends AdminController $this->errors[] = Tools::displayError('You do not have permission to edit here.'); } if ($redirectAdmin && (!isset($this->errors) || !count($this->errors))) + { + Hook::exec('action'.get_class($this).ucfirst($this->action).'After', array('controller' => $this, 'return' => '')); Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4'); + } else return parent::postProcess(); }