From 5021c7a55621de798eac7b7069c3f4e398a416fd Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 10 Jun 2018 18:29:04 +0200 Subject: [PATCH] clean and update code --- htdocs/projet/activity/index.php | 12 ------------ htdocs/projet/admin/project.php | 19 +------------------ htdocs/projet/index.php | 1 - htdocs/projet/stats/index.php | 5 ++--- htdocs/projet/tasks/stats/index.php | 5 ++--- htdocs/resource/list.php | 4 ---- htdocs/societe/consumption.php | 19 +++++-------------- 7 files changed, 10 insertions(+), 55 deletions(-) diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 3340fca4a99..92719093650 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -145,12 +145,10 @@ $sql.= " GROUP BY p.rowid, p.ref, p.title, p.public"; $resql = $db->query($sql); if ( $resql ) { - $var=true; $total=0; while ($row = $db->fetch_object($resql)) { - print ''; print ''; $projectstatic->id=$row->rowid; @@ -202,12 +200,10 @@ $sql.= " GROUP BY p.rowid, p.ref, p.title, p.public"; $resql = $db->query($sql); if ( $resql ) { - $var=true; $total=0; while ($row = $db->fetch_object($resql)) { - print ''; print ''; $projectstatic->id=$row->rowid; @@ -263,11 +259,9 @@ if ($db->type != 'pgsql') if ( $resql ) { $total = 0; - $var=true; while ($row = $db->fetch_object($resql)) { - print ''; print ''; $projectstatic->id=$row->rowid; @@ -320,8 +314,6 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH)) $resql = $db->query($sql); if ( $resql ) { - $var=false; - while ($row = $db->fetch_object($resql)) { print ''; @@ -369,7 +361,6 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR)) $sql.= " AND p.rowid in (".$projectsListId.")"; $sql.= " GROUP BY p.rowid, p.ref, p.title, p.public"; - $var=false; $resql = $db->query($sql); if ( $resql ) { @@ -463,8 +454,6 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S $sql.= " ORDER BY t.dateo desc, t.rowid desc, t.datee"; $sql.= $db->plimit($max+1); // We want more to know if we have more than limit - $var=true; - dol_syslog('projet:index.php: affectationpercent', LOG_DEBUG); $resql = $db->query($sql); if ( $resql ) @@ -492,7 +481,6 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S { $obj = $db->fetch_object($resql); - $username=''; if ($obj->userid && $userstatic->id != $obj->userid) // We have a user and it is not last loaded user { diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 9f5437daacf..80a13582d4d 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -2,7 +2,7 @@ /* Copyright (C) 2010-2014 Regis Houssin * Copyright (C) 2011-2016 Laurent Destailleur * Copyright (C) 2011-2015 Juanjo Menent - * Copyright (C) 2011-2015 Philippe Grand + * Copyright (C) 2011-2018 Philippe Grand * Copyright (C) 2013 Florian Henry * Copyright (C) 2015 Marcos García * Copyright (C) 2018 Ferran Marcet @@ -301,7 +301,6 @@ dol_fiche_head($head, 'project', $langs->trans("Projects"), -1, 'project'); // Main options $form=new Form($db); -$var=true; print '
'; print ''; @@ -313,8 +312,6 @@ print "".$langs->trans("Parameters")."\n"; print ''.$langs->trans("Value").''."\n"; print ' '."\n"; - - print ''; print ''.$langs->trans("ManageOpportunitiesStatus").''; print ''; @@ -372,8 +369,6 @@ foreach ($dirmodels as $reldir) $handle = opendir($dir); if (is_resource($handle)) { - $var=true; - while (($file = readdir($handle))!==false) { if (preg_match('/^(mod_.*)\.php$/i',$file,$reg)) @@ -391,7 +386,6 @@ foreach ($dirmodels as $reldir) if ($module->isEnabled()) { - print ''.$module->name."\n"; print $module->info(); print ''; @@ -476,8 +470,6 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) $handle = opendir($dir); if (is_resource($handle)) { - $var=true; - while (($file = readdir($handle))!==false) { if (preg_match('/^(mod_.*)\.php$/i',$file,$reg)) @@ -495,7 +487,6 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) if ($module->isEnabled()) { - print ''.$module->name."\n"; print $module->info(); print ''; @@ -600,7 +591,6 @@ print "\n"; clearstatcache(); -$var=true; foreach ($dirmodels as $reldir) { foreach (array('','/doc') as $valdir) @@ -637,7 +627,6 @@ foreach ($dirmodels as $reldir) if ($modulequalified) { - print ''; print (empty($module->name)?$name:$module->name); print "\n"; @@ -759,7 +748,6 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) clearstatcache(); - $var=true; foreach ($dirmodels as $reldir) { foreach (array('','/doc') as $valdir) @@ -796,7 +784,6 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) if ($modulequalified) { - $var = !$var; print ''; print (empty($module->name)?$name:$module->name); print "\n"; @@ -875,7 +862,6 @@ print load_fiche_titre($langs->trans("Other"), '', ''); // Other options $form=new Form($db); -$var=true; print ''; print ''; @@ -887,8 +873,6 @@ print "".$langs->trans("Parameters")."\n"; print ''.$langs->trans("Value").''."\n"; print ' '."\n"; - - print ''; print ''.$langs->trans("UseSearchToSelectProject").''; if (! $conf->use_javascript_ajax) @@ -912,7 +896,6 @@ else } print ''; - print ''; print ''.$langs->trans("AllowToSelectProjectFromOtherCompany").''; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 25c60eaf7fd..906cb3783f1 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -265,7 +265,6 @@ if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$soci $sql.= " GROUP BY s.nom, s.rowid"; $sql.= $db->order($sortfield, $sortorder); -$var=true; $resql = $db->query($sql); if ( $resql ) { diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php index c6ee1074b50..38e9bc327bc 100644 --- a/htdocs/projet/stats/index.php +++ b/htdocs/projet/stats/index.php @@ -315,7 +315,6 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) print ''; $oldyear=0; -$var=true; foreach ($data_all_year as $val) { $year = $val['year']; @@ -323,7 +322,7 @@ foreach ($data_all_year as $val) { // If we have empty year $oldyear--; - print ''; + print ''; print '0?'&userid='.$userid:'').'">'.$oldyear.''; if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { @@ -335,7 +334,7 @@ foreach ($data_all_year as $val) print ''; } - print ''; + print ''; print '0?'&userid='.$userid:'').'">'.$year.''; print ''.$val['nb'].''; if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php index 3d3599de1b1..fa9ebcf3b52 100644 --- a/htdocs/projet/tasks/stats/index.php +++ b/htdocs/projet/tasks/stats/index.php @@ -174,7 +174,6 @@ print ''.$langs->trans("NbOfTasks").''; print ''; $oldyear=0; -$var=true; foreach ($data_all_year as $val) { $year = $val['year']; @@ -182,13 +181,13 @@ foreach ($data_all_year as $val) { // If we have empty year $oldyear--; - print ''; + print ''; print '0?'&userid='.$userid:'').'">'.$oldyear.''; print '0'; print ''; } - print ''; + print ''; print '0?'&userid='.$userid:'').'">'.$year.''; print ''.$val['nb'].''; print ''; diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 6d3abfd84a7..a291726c567 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -162,10 +162,6 @@ if ($action == 'delete_resource') print $form->formconfirm($_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id."&lineid=".$lineid,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResourceElement"),"confirm_delete_resource",'','',1); } - - -$var=true; - $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 2bb08861342..551f168ded3 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -68,15 +68,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x', $thirdTypeSelect = GETPOST("third_select_id"); $type_element = GETPOST('type_element')?GETPOST('type_element'):''; - -$langs->load("companies"); -$langs->load("bills"); -$langs->load("orders"); -$langs->load("suppliers"); -$langs->load("propal"); -$langs->load("interventions"); -$langs->load("contracts"); -$langs->load("products"); +// Load translation files required by the page +$langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products")); // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context $hookmanager->initHooks(array('consumptionthirdparty')); @@ -365,8 +358,7 @@ if ($sql_select) { $resql=$db->query($sql); if (!$resql) dol_print_error($db); - - $var=true; + $num = $db->num_rows($resql); $param="&socid=".$socid."&type_element=".$type_element; @@ -433,7 +425,6 @@ if ($sql_select) if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status; - print ''; print ''; print $documentstatic->getNomUrl(1); @@ -643,7 +634,7 @@ else if (empty($type_element) || $type_element == -1) print_liste_field_titre('Quantity',$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder); print "\n"; - print ''.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).''; + print ''.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).''; print ""; } @@ -652,7 +643,7 @@ else { print ''."\n"; - print ''; + print ''; print "
'.$langs->trans("FeatureNotYetAvailable").'
'.$langs->trans("FeatureNotYetAvailable").'
"; }