diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl index 4e6cd58fb..f4f9ddc47 100644 --- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl @@ -152,40 +152,40 @@ return false; }); - $('#testMemcachedServer').click(function() { - var host = $('input:text[name=memcachedIp]').val(); - var port = $('input:text[name=memcachedPort]').val(); - if (host && port) - { - $.ajax({ - url: 'index.php', - data: - { - controller: 'adminperformance', - token: '{$token}', - action: 'test_server', - sHost: host, - sPort: port, - ajax: true - }, - context: document.body, - dataType: 'json', - context: this, - async: false, - success: function(data) - { - if (data) - { - var color = data != 0 ? 'green' : 'red'; - $('#formMemcachedServerStatus').show(); - $('input:text[name=memcachedIp]').css('background', color); - $('input:text[name=memcachedPort]').css('background', color); - } - } - }); - } - return false; - }); + $('#testMemcachedServer').click(function() { + var host = $('input:text[name=memcachedIp]').val(); + var port = $('input:text[name=memcachedPort]').val(); + if (host && port) + { + $.ajax({ + url: 'index.php', + data: + { + controller: 'adminperformance', + token: '{$token}', + action: 'test_server', + sHost: host, + sPort: port, + ajax: true + }, + context: document.body, + dataType: 'json', + context: this, + async: false, + success: function(data) + { + if (data) + { + var color = data != 0 ? 'green' : 'red'; + $('#formMemcachedServerStatus').show(); + $('input:text[name=memcachedIp]').css('background', color); + $('input:text[name=memcachedPort]').css('background', color); + } + } + }); + } + return false; + }); $('input[name="smarty_force_compile"], input[name="smarty_cache"], input[name="smarty_console"]').change(function(){ $('#smarty_up').val(1); diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php index 623457f74..c66eb021a 100644 --- a/controllers/admin/AdminPerformanceController.php +++ b/controllers/admin/AdminPerformanceController.php @@ -760,28 +760,28 @@ class AdminPerformanceControllerCore extends AdminController return parent::postProcess(); } - public function ajaxProcess() - { - if (Tools::isSubmit('action') && Tools::getValue('action') == 'test_server') - { - $host = pSQL(Tools::getValue('sHost', '')); - $port = (int)Tools::getValue('sPort', 0); + public function ajaxProcess() + { + if (Tools::isSubmit('action') && Tools::getValue('action') == 'test_server') + { + $host = pSQL(Tools::getValue('sHost', '')); + $port = (int)Tools::getValue('sPort', 0); - if ($host != '' && $port != 0) - { - $res = 0; + if ($host != '' && $port != 0) + { + $res = 0; - if (function_exists('memcache_get_server_status') && - function_exists('memcache_connect') && - @fsockopen($host, $port)) - { - $memcache = @memcache_connect($host, $port); - $res = @memcache_get_server_status($memcache, $host, $port); - } - die(Tools::jsonEncode(array($res))); - } - } - die; + if (function_exists('memcache_get_server_status') && + function_exists('memcache_connect') && + @fsockopen($host, $port)) + { + $memcache = @memcache_connect($host, $port); + $res = @memcache_get_server_status($memcache, $host, $port); + } + die(Tools::jsonEncode(array($res))); + } + } + die; } }