| '.$langs->trans("DefaultMenuSmartphoneManager").' | ';
print '';
$formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled');
@@ -202,8 +198,6 @@ if ($action == 'edit')
else
{
// Gestionnaires de menu
- $var=true;
-
print '';
print '| '.$langs->trans("Menu").' | ';
print '';
@@ -267,7 +261,6 @@ if ($action == 'edit')
print '';
-
if ($action != 'edit')
{
print ' ';
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 339b4fef566..4fe15379629 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -26,10 +26,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-$langs->load("admin");
-$langs->load("errors");
-$langs->load('other');
-$langs->load('bills');
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin", "other", "errors", "bills"));
if (! $user->admin) accessforbidden();
@@ -131,8 +129,6 @@ foreach ($dirmodels as $reldir)
$handle = opendir($dir);
if (is_resource($handle))
{
- $var=true;
-
while (($file = readdir($handle))!==false)
{
if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
@@ -249,7 +245,6 @@ print ' | | ';
print " \n";
// Allow payments on different thirdparties bills but same parent company
-$var=! $var;
print '| ';
print $langs->trans("PaymentOnDifferentThirdBills");
print ' | ';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 21f34f2a770..203b4ed9bc5 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -274,7 +274,6 @@ print " | \n";
clearstatcache();
-$var=true;
foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index c533ea94795..7ee44a93b52 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -33,10 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-$langs->load("admin");
-$langs->load("errors");
-$langs->load('other');
-$langs->load('propal');
+
+// Load traductions files requiredby by page
+$langs->loadLangs(array("admin", "other", "errors", "propal"));
if (! $user->admin) accessforbidden();
@@ -266,8 +265,6 @@ foreach ($dirmodels as $reldir)
$handle = opendir($dir);
if (is_resource($handle))
{
- $var=true;
-
while (($file = readdir($handle))!==false)
{
if (substr($file, 0, 12) == 'mod_propale_' && substr($file, dol_strlen($file)-3, 3) == 'php')
@@ -386,7 +383,6 @@ print "\n";
clearstatcache();
-$var=true;
foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
@@ -531,7 +527,6 @@ print '';
print '';
/*
-$var=! $var;
print ' \n ";
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index ee22f377200..a9028635991 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -26,10 +26,8 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-$langs->load("users");
-$langs->load("admin");
-$langs->load("other");
-
+// Load traductions files requiredby by page
+$langs->loadLangs(array("other", "users", "admin"));
if (!$user->admin) accessforbidden();
@@ -124,7 +122,6 @@ if ($conf->use_javascript_ajax)
// Timeout
-$var=true;
print '';
@@ -163,7 +160,7 @@ print '';
print '';
-print '';
+print ' ';
print '| '.$langs->trans("MAIN_PROXY_HOST").' | ';
print ' | ';
print '';
@@ -172,7 +169,7 @@ print ' | ';
print ' ';
-print '';
+print ' ';
print '| '.$langs->trans("MAIN_PROXY_PORT").' | ';
print ' | ';
print '';
@@ -181,7 +178,7 @@ print ' | ';
print ' ';
-print '';
+print ' ';
print '| '.$langs->trans("MAIN_PROXY_USER").' | ';
print ' | ';
print '';
@@ -190,7 +187,7 @@ print ' | ';
print ' ';
-print '';
+print ' ';
print '| '.$langs->trans("MAIN_PROXY_PASS").' | ';
print ' | ';
print '';
| |