From 909fa496e5f3d2f544bb7197882c16a2a87d0202 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 4 Jun 2018 17:37:17 +0200 Subject: [PATCH] clean and update code --- htdocs/core/modules/printing/printgcp.modules.php | 5 +---- htdocs/core/modules/printing/printipp.modules.php | 4 +--- .../project/doc/doc_generic_project_odt.modules.php | 8 ++++---- .../core/modules/societe/doc/doc_generic_odt.modules.php | 6 +++--- htdocs/cron/list.php | 1 - 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php index f115000f953..7cda95174c2 100644 --- a/htdocs/core/modules/printing/printgcp.modules.php +++ b/htdocs/core/modules/printing/printgcp.modules.php @@ -176,7 +176,6 @@ class printing_printgcp extends PrintingDriver global $bc, $conf, $langs; $error = 0; $langs->load('printing'); - $var=true; $html = ''; $html.= ''.$langs->trans('GCP_Name').''; @@ -190,11 +189,9 @@ class printing_printgcp extends PrintingDriver $html.= ''."\n"; $list = $this->getlist_available_printers(); //$html.= '
'.print_r($list,true).'
'; - $var = true; foreach ($list['available'] as $printer_det) { - $var = !$var; - $html.= ""; + $html.= ''; $html.= ''.$printer_det['name'].''; $html.= ''.$printer_det['displayName'].''; $html.= ''.$printer_det['id'].''; // id to identify printer to use diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php index 3fc0d505e70..94d14426b55 100644 --- a/htdocs/core/modules/printing/printipp.modules.php +++ b/htdocs/core/modules/printing/printipp.modules.php @@ -144,7 +144,6 @@ class printing_printipp extends PrintingDriver { global $bc, $conf, $langs; $error = 0; - $var=true; $html = ''; $html.= ''.$langs->trans('IPP_Uri').''; @@ -160,12 +159,11 @@ class printing_printipp extends PrintingDriver $html.= ''.$langs->trans("Select").''; $html.= "\n"; $list = $this->getlist_available_printers(); - $var = true; foreach ($list as $value) { $printer_det = $this->get_printer_detail($value); - $html.= ""; + $html.= ''; $html.= ''.$value.''; //$html.= '
'.print_r($printer_det,true).'
'; $html.= ''.$printer_det->printer_name->_value0.''; diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index c804d6b1af8..d2dc063df78 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -67,9 +67,9 @@ class doc_generic_project_odt extends ModelePDFProjects function __construct($db) { global $conf,$langs,$mysoc; - - $langs->load("main"); - $langs->load("companies"); + + // Load traductions files requiredby by page + $langs->loadLangs(array("companies", "main")); $this->db = $db; $this->name = "ODT templates"; @@ -951,7 +951,7 @@ class doc_generic_project_odt extends ModelePDFProjects $elementarray = $object->get_element_list($keyref, $tablename); if (count($elementarray)>0 && is_array($elementarray)) { - $var=true; + $var=true; $total_ht = 0; $total_ttc = 0; $num=count($elementarray); diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index 4bdc083228e..3757f904ace 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -83,9 +83,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc function info($langs) { global $conf,$langs; - - $langs->load("companies"); - $langs->load("errors"); + + // Load traductions files requiredby by page + $langs->loadLangs(array("companies", "errors")); $form = new Form($this->db); diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 30dd908c823..2197309ddcf 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -419,7 +419,6 @@ if ($num > 0) $style='pair'; $now = dol_now(); $i=0; - $var=true; $totalarray=array(); while ($i < min($num,$limit)) {