diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php index 3e0e087c424..0cca1b94fc4 100644 --- a/htdocs/admin/system/xcache.php +++ b/htdocs/admin/system/xcache.php @@ -39,7 +39,6 @@ print load_fiche_titre("XCache", '', 'title_setup'); print "
\n"; -//function_exists('apc_cache_info') || function_exists('eaccelerator_info') || function_exists('xcache_info')) if (!function_exists('xcache_info')) { print 'XCache seems to be not installed. Function xcache_info not found.'; diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php deleted file mode 100644 index 660c1647783..00000000000 --- a/htdocs/admin/tools/eaccelerator.php +++ /dev/null @@ -1,338 +0,0 @@ - - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/admin/tools/eaccelerator.php - * \brief Page administration de eaccelerator - */ - -require '../../main.inc.php'; - -$langs->load("admin"); - -if (!$user->admin) accessforbidden(); - - -/* - * View - */ - -llxHeader(); - - -if (!function_exists('eaccelerator_info')) { - print 'eAccelerator is not installed.'; - llxFooter(); - exit; -} - - -$info = eaccelerator_info(); -if (isset($_POST['caching'])) { - if ($info['cache']) { - eaccelerator_caching(false); - } else { - eaccelerator_caching(true); - } -} elseif (isset($_POST['optimizer']) && function_exists('eaccelerator_optimizer')) { - if ($info['optimizer']) { - eaccelerator_optimizer(false); - } else { - eaccelerator_optimizer(true); - } -} elseif (isset($_POST['clear'])) { - eaccelerator_clear(); -} elseif (isset($_POST['clean'])) { - eaccelerator_clean(); -} elseif (isset($_POST['purge'])) { - eaccelerator_purge(); -} -$info = eaccelerator_info(); -if (!is_array($info)) { - dol_print_error('', 'An error occured getting eAccelerator information, this is caused if eAccelerator isn\'t initalised properly'); - exit; -} - - -/** - * Compare revisions - * - * @param array $x Parts of version 1 - * @param array $y Parts of version 2 - * @return int -1 if 1<2, 0 if 1=2, 1 if 1>2 - */ -function compare($x, $y) -{ - global $sortby; - - if ( $x[$sortby] == $y[$sortby] ) { - return 0; - } elseif ($x[$sortby] < $y[$sortby]) { - return -1; - } else { - return 1; - } -} - -/** - * Compare revisions - * - * @param array $x Parts of version 1 - * @param array $y Parts of version 2 - * @return int 1 if 1<2, 0 if 1=2, -1 if 1>2 - */ -function revcompare($x, $y) -{ - global $sortby; - - if ($x[$sortby] == $y[$sortby]) { - return 0; - } elseif ($x[$sortby] < $y[$sortby]) { - return 1; - } else { - return -1; - } -} - -/** - * Output table - * - * @param array $list Array of records - * @return void - */ -function create_script_table($list) -{ - global $sortby,$langs; - - if (GETPOT('order', 'alpha') == "asc" || GETPOST('order', 'alpha') == "desc") { - $order = GETPOST('order', 'alpha'); - } else { - $order = "asc"; - } - - if (GETPOST('order', 'alpha')) { - switch (GETPOST('order', 'alpha')) { - case "mtime": - case "size": - case "reloads": - case "hits": - $sortby = GETPOST('sort'); - ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); - break; - default: - $sortby = "file"; - ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); - } - } - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - switch ($sortby) { - case "mtime": - case "size": - case "reloads": - case "hits": - ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); - break; - case "file": - default: - $sortby = "file"; - ($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare')); - } - - foreach($list as $script) { - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - } - print '
'.$langs->trans("Filename").' '; - if($sortby == "file") - print ($order == "asc" ? "↓" : "↑").''.$langs->trans("Date").' '; - if($sortby == "mtime") - print ($order == "asc" ? "↓" : "↑").''.$langs->trans("Size").' '; - if($sortby == "size") - print ($order == "asc" ? "↓" : "↑").''.$langs->trans("Reloads").' '; - if($sortby == "reloads") - print ($order == "asc" ? "↓" : "↑").''.$langs->trans("Hits").' '; - if($sortby == "hits") - print ($order == "asc" ? "↓" : "↑").'
'.dol_trunc($script['file'], 80, 'left').''.dol_print_date($script['mtime'], 'dayhour').''.number_format($script['size'] / 1024, 2).'KB'.$script['reloads'].' ('.$script['usecount'].')'.$script['hits'].'
'; -} - -/** - * Output table - * - * @param array $list Array of records - * @return void - */ -function create_key_table($list) -{ - global $langs; - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - foreach($list as $key) { - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - } - print '
NameCreated'.$langs->trans("Size").'ttl
'.dol_trunc($key['name'], 80, 'left').''.dol_print_date($key['created'], 'dayhour').''.number_format($key['size']/1024, 3).'KB'; - if ($key['ttl'] == -1) { - print 'expired'; - } elseif ($key['ttl'] == 0) { - print 'none'; - } else { - print dol_print_date($key['ttl'], 'dayhour'); - } - print '
'; -} - - -$form=new Form($db); -print load_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel', '', 'title_setup'); - -print '
'; - -print ''; -print ''; -print ''; -print ''; - -print ''; -print ''; -print ''; -print ''; - -print ''; -print ''; -print ''; -print ''; - -print ''; -print ''; -print ''; -print ''; - -print ''; -print ''; -print ''; -print ''; - -print ''; -print ''; -print ''; -print ''; - -print ''; -print ''; -print ''; -print ''; - -print ''; -print ''; -print ''; -print ''; -print '
Information
Caching enabled'.($info['cache']?'yes':'no').'
Optimizer enabled'.$info['optimizer']?'yes':'no'.'
Memory usage'.number_format(100 * $info['memoryAllocated']/$info['memorySize'], 2).'%('.number_format($info['memoryAllocated'] / (1024*1024), 2).'MB / '.number_format($info['memorySize']/(1024*1024), 2).'MB)
Free memory in reserved cache'.number_format($info['memoryAvailable']/(1024*1024), 2).'MB
Cached scripts'.$info['cachedScripts'].'
Removed scripts'.$info['removedScripts'].'
Cached keys'.(isset($info['cachedKeys'])?$info['cachedKeys']:'').'
'; - -$resCached = @eaccelerator_cached_scripts(); // If success return an array -$resRemoved = @eaccelerator_removed_scripts(); - -if (is_array($resCached) || is_array($resRemoved)) { - print "
"; - print '
'; - print ''; - print ''; - print ''; - - if (is_array($resCached)) { - print ''; - print ""; - print ''; - print ""; - - print ''; - print ""; - print ''; - print ""; - } - - if (is_array($resRemoved)) { - print ''; - print ""; - print ''; - print ""; - - print ''; - print ""; - print ''; - print ""; - - print ''; - print ""; - print ''; - print "
Actions
Caching
Optimizer
Clear cache
Clean cache
Purge cache
"; - } - - if (is_array($resCached)) { - print "

"; - print "Cached scripts
"; - create_script_table($resCached); - } - - if (is_array($resRemoved)) { - print "

"; - print "Removed scripts
"; - create_script_table($resRemoved); - } -} else { - print "

"; - print "Check in your php.ini that eaccelerator.allowed_admin_path parameter is : "; - print "

"; - print "".$_SERVER["SCRIPT_FILENAME"].""; - print "

"; -} - -if (function_exists('eaccelerator_get')) { - print '

'; - print 'Cached keys
'; - $res=eaccelerator_list_keys(); - create_key_table($res); -} - -print "

"; - -// End of page -llxFooter(); -$db->close(); diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index dcd874bdf3d..10c9f2003c0 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -54,7 +54,6 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 301__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_export.php?mainmenu=home&leftmenu=admintools', 'Backup', 1, 'admin', '', '', 2, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 302__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools', 'Restore', 1, 'admin', '', '', 2, 7, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 305__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/update.php?mainmenu=home&leftmenu=admintools', 'MenuUpgrade', 1, 'admin', '', '', 2, 8, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools" && function_exists("eaccelerator_info")', __HANDLER__, 'left', 306__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/eaccelerator.php?mainmenu=home&leftmenu=admintools', 'EAccelerator', 1, 'admin', '', '', 2, 9, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 307__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php?mainmenu=home&leftmenu=admintools', 'Audit', 1, 'admin', '', '', 2, 10, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 308__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listsessions.php?mainmenu=home&leftmenu=admintools', 'Sessions', 1, 'admin', '', '', 2, 11, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 309__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?mainmenu=home&leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 12, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index d9f0d663754..a73132c366d 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -745,7 +745,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM $newmenu->add('/admin/system/phpinfo.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1); //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1); $newmenu->add('/admin/system/database.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1); - if (function_exists('eaccelerator_info')) $newmenu->add("/admin/tools/eaccelerator.php?mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"), 1); //$newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoPerf"),1); $newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&leftmenu=admintools", $langs->trans("Backup"), 1); $newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools", $langs->trans("Restore"), 1);