From da2f07c8486b527e163067756a2e437c81b52d4c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 21 Jun 2018 15:01:45 +0200 Subject: [PATCH] clean and update code --- htdocs/ftp/admin/ftpclient.php | 2 -- htdocs/ftp/index.php | 3 +-- htdocs/hrm/admin/admin_establishment.php | 2 -- htdocs/imports/class/import.class.php | 1 - htdocs/imports/import.php | 9 ++------- htdocs/imports/index.php | 7 ++----- 6 files changed, 5 insertions(+), 19 deletions(-) diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index 9a8ada55de5..ee7acc9070d 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -234,8 +234,6 @@ else $idrss = $reg[0]; //print "x".join(',',$reg)."=".$obj->name."=".$idrss; - $var=true; - print "
"; print ''; print ''; diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 9881b89c6f1..943d4fa94e1 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -509,7 +509,6 @@ else } $nboflines=count($contents); - $var=true; $rawlisthasfailed=false; $i=0; while ($i < $nboflines && $i < 1000) @@ -553,7 +552,7 @@ else } - print ''; + print ''; // Name print ''; $newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file; diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 415bcf8fcbd..996ddd58ed3 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -98,8 +98,6 @@ if ($result) print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"e.status","","",'align="right"',$sortfield,$sortorder); print "\n"; - $var=true; - if ($num > 0) { $establishmentstatic=new Establishment($db); diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index 2235812bae8..f8754193515 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -71,7 +71,6 @@ class Import dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter); - $var=true; $i=0; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 0aa5ee35aa2..64e44aca793 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -440,7 +440,6 @@ if ($step == 2 && $datatoimport) print ''; $filetoimport=''; - $var=true; // Add format informations and link to download example print '
'; @@ -556,14 +555,12 @@ if ($step == 3 && $datatoimport) print ''; $filetoimport=''; - $var=true; print ''; //print ''; // Input file name box - $var=false; print '
'.$langs->trans("ChooseFileToImport",img_picto('','filenew')).'
'.$langs->trans("FileWithDataToImport").'
'; print '     '; $out = (empty($conf->global->MAIN_UPLOAD_DOC)?' disabled':''); @@ -907,13 +904,12 @@ if ($step == 4 && $datatoimport) // List of targets fields $height=24; $i = 0; - $var=true; $mandatoryfieldshavesource=true; print ''; foreach($fieldstarget as $code=>$label) { - print ''; + print ''; $i++; $entity=(! empty($objimport->array_import_entities[0][$code])?$objimport->array_import_entities[0][$code]:$objimport->array_import_icon[0]); @@ -1128,7 +1124,7 @@ if ($step == 4 && $datatoimport) print ''; print ''; print ''; - $var=false; + print ''; print ''; print ''; //print ''; print ''; -$val=true; + if (count($import->array_import_code)) { foreach ($import->array_import_code as $key => $value) { - $val=!$val; - print '
'.$langs->trans("ImportModelName").' 
'; print ''; @@ -1144,7 +1140,6 @@ if ($step == 4 && $datatoimport) { $num = $db->num_rows($resql); $i = 0; - $var=false; while ($i < $num) { diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 207055c6ce8..ed391d65292 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -60,13 +60,12 @@ print ''.$langs->trans("Module").''.$langs->trans("ImportableDatas").' 
'; + print '
'; print img_object($import->array_import_module[$key]->getName(),$import->array_import_module[$key]->picto).' '; print $import->array_import_module[$key]->getName(); print ''; @@ -108,7 +107,6 @@ print '
'; // List of available import format -$var=true; print ''; print ''; print ''; @@ -122,7 +120,6 @@ $liste=$model->liste_modeles($db); foreach($liste as $key) { - print ''; print ''; $text=$model->getDriverDescForKey($key);
'.$langs->trans("AvailableFormats").'
'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'