From 8f72e1644459b582abebc44a03d6fdaae83e3864 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 10 Jul 2013 15:34:36 +0200 Subject: [PATCH 1/3] Remove duplicate code --- htdocs/admin/commande.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index bc586140250..cdcd9008c58 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -200,14 +200,6 @@ else if ($action=='setModuleOptions') { $conf->global->COMMANDE_ADDON_PDF_ODT_PATH = GETPOST('value1'); } } -else if ($action=='setModuleOptions') { - if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF_ODT_PATH",GETPOST('value1'),'chaine',0,'',$conf->entity)) - { - // La constante qui a ete lue en avant du nouveau set - // on passe donc par une variable pour avoir un affichage coherent - $conf->global->COMMANDE_ADDON_PDF_ODT_PATH = GETPOST('value1'); - } -} /* From cfc999a06df4525e04f2cdb1a45f7f08d05140dc Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 10 Jul 2013 15:44:53 +0200 Subject: [PATCH 2/3] Merge --- htdocs/admin/geoipmaxmind.php | 2 +- htdocs/admin/system/perf.php | 142 +++++++++--------- ...terface_50_modAgenda_ActionsAuto.class.php | 28 ++-- htdocs/includes/jquery/plugins/flot/Makefile | 24 +-- 4 files changed, 98 insertions(+), 98 deletions(-) diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 2b72a4395ca..df082ed4881 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -90,7 +90,7 @@ if (! empty($conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE)) } else { - if (function_exists('geoip_country_code_by_name')) $geointernal=true; + if (function_exists('geoip_country_code_by_name')) $geointernal=true; } // Mode diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php index f0f95b62d15..9a270d2a5c2 100644 --- a/htdocs/admin/system/perf.php +++ b/htdocs/admin/system/perf.php @@ -22,8 +22,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; $langs->load("admin"); $langs->load("install"); @@ -55,18 +55,18 @@ print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.p print '
'; print ''.$langs->trans("XDebug").': '; $test=!function_exists('xdebug_is_enabled'); -if ($test) print img_picto('','tick.png').' '.$langs->trans("NotInstalled"); +if ($test) print img_picto('','tick.png').' '.$langs->trans("NotInstalled"); else { print img_picto('','warning').' '.$langs->trans("XDebugInstalled"); print $langs->trans("MoreInformation").' XDebug admin page'; -} -print '
'; +} +print '
'; // Applicative cache -print '
'; -print ''.$langs->trans("ApplicativeCache").': '; -$test=!empty($conf->memcached->enabled); +print '
'; +print ''.$langs->trans("ApplicativeCache").': '; +$test=!empty($conf->memcached->enabled); if ($test) { if (!empty($conf->global->MEMCACHED_SERVER)) @@ -78,28 +78,28 @@ if ($test) { print img_picto('','warning').' '.$langs->trans("MemcachedModuleAvailableButNotSetup"); } -} -else print img_picto('','warning').' '.$langs->trans("MemcachedNotAvailable"); +} +else print img_picto('','warning').' '.$langs->trans("MemcachedNotAvailable"); print '
'; // OPCode cache -print '
'; +print '
'; print ''.$langs->trans("OPCodeCache").': '; -$test1=function_exists('xcache_info'); +$test1=function_exists('xcache_info'); if ($test1) { print img_picto('','tick.png').' '.$langs->trans("XCacheInstalled"); - print $langs->trans("MoreInformation").' Xcache admin page'; -} + print $langs->trans("MoreInformation").' Xcache admin page'; +} else { $test2=function_exists('eaccelerator_info'); if ($test2) print img_picto('','tick.png').' '.$langs->trans("EAcceleratorInstalled"); else print $langs->trans("NoOPCodeCacheFound"); -} -print '
'; +} +print '
'; -// HTTPCacheStaticResources +// HTTPCacheStaticResources print '