alxarafe / alixar

public/htdocs/projet/tasks.php

Spacing +6 added lines, -6 removed lines

@@ -52,7 +52,7 @@ 
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'projecttasklist';
-$backtopage = GETPOST('backtopage', 'alpha');                   // if not set, a default page will be used
+$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
 //$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');   // if not set, $backtopage will be used
 //$backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
 $optioncss  = GETPOST('optioncss', 'aZ');
@@ -94,20 +94,20 @@ 
 $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth');
 $search_date_start_startyear = GETPOSTINT('search_date_start_startyear');
 $search_date_start_startday = GETPOSTINT('search_date_start_startday');
-$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear);   // Use tzserver
+$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver
 $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth');
 $search_date_start_endyear = GETPOSTINT('search_date_start_endyear');
 $search_date_start_endday = GETPOSTINT('search_date_start_endday');
-$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear);    // Use tzserver
+$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver
 
 $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth');
 $search_date_end_startyear = GETPOSTINT('search_date_end_startyear');
 $search_date_end_startday = GETPOSTINT('search_date_end_startday');
-$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);   // Use tzserver
+$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver
 $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth');
 $search_date_end_endyear = GETPOSTINT('search_date_end_endyear');
 $search_date_end_endday = GETPOSTINT('search_date_end_endday');
-$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);    // Use tzserver
+$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver
 
 //if (! $user->rights->projet->all->lire) $mine=1;  // Special for projects
 
@@ -185,7 +185,7 @@ 
 include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 

public/htdocs/projet/contact.php

Spacing +1 added lines, -1 removed lines

@@ -187,7 +187,7 @@
             } else {
                 $error++;
             }
-        } elseif (! ($contactid > 0)) {
+        } elseif (!($contactid > 0)) {
             $error++;
             $langs->load("errors");
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');

public/htdocs/projet/activity/perweek.php

Spacing +1 added lines, -1 removed lines

@@ -766,7 +766,7 @@
             if (empty($totalforeachday[$tmpday])) {
                 $totalforeachday[$tmpday] = empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday];
             } else {
-                $totalforeachday[$tmpday] +=  empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday];
+                $totalforeachday[$tmpday] += empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday];
             }
         }
     }

public/htdocs/projet/list.php

Spacing +13 added lines, -13 removed lines

@@ -147,38 +147,38 @@ 
 $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth');
 $search_date_start_startyear = GETPOSTINT('search_date_start_startyear');
 $search_date_start_startday = GETPOSTINT('search_date_start_startday');
-$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear);   // Use tzserver
+$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver
 $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth');
 $search_date_start_endyear = GETPOSTINT('search_date_start_endyear');
 $search_date_start_endday = GETPOSTINT('search_date_start_endday');
-$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear);    // Use tzserver
+$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver
 
 $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth');
 $search_date_end_startyear = GETPOSTINT('search_date_end_startyear');
 $search_date_end_startday = GETPOSTINT('search_date_end_startday');
-$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);   // Use tzserver
+$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver
 $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth');
 $search_date_end_endyear = GETPOSTINT('search_date_end_endyear');
 $search_date_end_endday = GETPOSTINT('search_date_end_endday');
-$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);    // Use tzserver
+$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver
 
 $search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth');
 $search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear');
 $search_date_creation_startday = GETPOSTINT('search_date_creation_startday');
-$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);   // Use tzserver
+$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver
 $search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth');
 $search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear');
 $search_date_creation_endday = GETPOSTINT('search_date_creation_endday');
-$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);    // Use tzserver
+$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver
 
 $search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth');
 $search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear');
 $search_date_modif_startday = GETPOSTINT('search_date_modif_startday');
-$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear);   // Use tzserver
+$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver
 $search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth');
 $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear');
 $search_date_modif_endday = GETPOSTINT('search_date_modif_endday');
-$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);    // Use tzserver
+$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver
 
 $search_category_array = array();
 
@@ -264,14 +264,14 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Add a groupby field. Set $groupby and $groupbyvalues.
 // TODO Move this into a inc file
 $groupbyvalues = array();
 if ($mode == 'kanban') {
     $groupbyold = null;
-    $groupby = GETPOST('groupby', 'aZ09');  // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
+    $groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
     $groupbyfield = preg_replace('/[a-z]\./', '', $groupby);
     if (!empty($object->fields[$groupbyfield]['alias'])) {
         $groupbyfield = $object->fields[$groupbyfield]['alias'];
@@ -1192,7 +1192,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -1653,7 +1653,7 @@ 
 
         if (!empty($groupby)) {
             if (is_null($groupbyold)) {
-                print '<div class="box-flex-container-columns kanban">';    // Start div for all kanban columns
+                print '<div class="box-flex-container-columns kanban">'; // Start div for all kanban columns
             }
             // Start kanban column
             if (is_null($obj->$groupbyfield)) {
@@ -1669,7 +1669,7 @@ 
                 //
                 //var_dump($groupbyvalues);
                 //var_dump($obj->$groupbyfield);
-                print '<div class="box-flex-container-column kanban column" data-html="column_' . preg_replace('/[^a-z0-9]/', '', $groupbyvalue) . '">';    // Start new column
+                print '<div class="box-flex-container-column kanban column" data-html="column_' . preg_replace('/[^a-z0-9]/', '', $groupbyvalue) . '">'; // Start new column
             }
             $groupbyold = $groupbyvalue;
         } elseif ($i == 0) {

public/htdocs/projet/tasks/time.php

Spacing +8 added lines, -8 removed lines

@@ -352,10 +352,10 @@ 
 }
 
 if ($action == 'confirm_deleteline' && $confirm == "yes" && ($user->hasRight('projet', 'time') || $user->hasRight('projet', 'all', 'creer'))) {
-    $object->fetchTimeSpent(GETPOSTINT('lineid'));    // load properties like $object->timespent_xxx
+    $object->fetchTimeSpent(GETPOSTINT('lineid')); // load properties like $object->timespent_xxx
 
     if (in_array($object->timespent_fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
-        $result = $object->delTimeSpent($user);    // delete line with $object->timespent_id
+        $result = $object->delTimeSpent($user); // delete line with $object->timespent_id
 
         if ($result < 0) {
             $langs->load("errors");
@@ -480,7 +480,7 @@ 
                 $arrayoftasks = array();
                 foreach ($toselect as $key => $value) {
                     // Get userid, timepent
-                    $object->fetchTimeSpent($value);    // $value is ID of 1 line in timespent table
+                    $object->fetchTimeSpent($value); // $value is ID of 1 line in timespent table
                     $arrayoftasks[$object->timespent_fk_user][(int) $object->timespent_fk_product]['timespent'] += $object->timespent_duration;
                     $arrayoftasks[$object->timespent_fk_user][(int) $object->timespent_fk_product]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
                 }
@@ -672,7 +672,7 @@ 
                 $arrayoftasks = array();
                 foreach ($toselect as $key => $value) {
                     // Get userid, timepent
-                    $object->fetchTimeSpent($value);        // Call method to get list of timespent for a timespent line id (We use the utiliy method found into Task object)
+                    $object->fetchTimeSpent($value); // Call method to get list of timespent for a timespent line id (We use the utiliy method found into Task object)
                     // $object->id is now the task id
                     $arrayoftasks[$object->id][(int) $object->timespent_fk_product]['timespent'] += $object->timespent_duration;
                     $arrayoftasks[$object->id][(int) $object->timespent_fk_product]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
@@ -1133,7 +1133,7 @@ 
         }
 
         $param = ($withproject ? '&withproject=1' : '');
-        $param .= ($param ? '&' : '') . 'id=' . $object->id;        // ID of task
+        $param .= ($param ? '&' : '') . 'id=' . $object->id; // ID of task
         $linkback = $withproject ? '<a href="' . constant('BASE_URL') . '/projet/tasks.php?id=' . $projectstatic->id . '">' . $langs->trans("BackToList") . '</a>' : '';
 
         if (!GETPOST('withproject') || empty($projectstatic->id)) {
@@ -1268,10 +1268,10 @@ 
         // Definition of fields for list
         $arrayfields = array();
         $arrayfields['t.element_date'] = array('label' => $langs->trans("Date"), 'checked' => 1);
-        $arrayfields['p.fk_soc'] = array('label' => $langs->trans("ThirdParty"), 'type' => 'integer:Societe:/societe/class/societe.class.php:1','checked' => 1);
+        $arrayfields['p.fk_soc'] = array('label' => $langs->trans("ThirdParty"), 'type' => 'integer:Societe:/societe/class/societe.class.php:1', 'checked' => 1);
         $arrayfields['s.name_alias'] = array('label' => $langs->trans("AliasNameShort"), 'type' => 'integer:Societe:/societe/class/societe.class.php:1');
         if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task
-            if (! empty($allprojectforuser)) {
+            if (!empty($allprojectforuser)) {
                 $arrayfields['p.project_ref'] = ['label' => $langs->trans('RefProject'), 'checked' => 1];
                 $arrayfields['p.project_label'] = ['label' => $langs->trans('ProjectLabel'), 'checked' => 1];
             }
@@ -1290,7 +1290,7 @@ 
         include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
 
         $arrayfields = dol_sort_array($arrayfields, 'position');
-        '@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+        '@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
         $param = '';
         if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {

public/htdocs/projet/tasks/task.php

Spacing +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
 
 if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('projet', 'creer')) {
     $task_origin_id = GETPOSTINT('task_origin');
-    $task_origin = new Task($db);       // The Task that we will delete
+    $task_origin = new Task($db); // The Task that we will delete
 
     if ($task_origin_id <= 0) {
         $langs->load('errors');
@@ -260,7 +260,7 @@ 
 
 $title = $object->ref;
 if (!empty($withproject)) {
-    $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '')  ;
+    $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '');
 }
 $help_url = '';
 

public/htdocs/projet/tasks/contact.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 
 $title = $object->ref . ' - ' . $langs->trans("Contacts");
 if (!empty($withproject)) {
-    $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '')  ;
+    $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '');
 }
 $help_url = '';
 

public/htdocs/projet/tasks/list.php

Spacing +5 added lines, -5 removed lines

@@ -96,7 +96,7 @@ 
 $search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_endmonth = GETPOSTINT('search_date_endmonth');
 $search_date_endyear = GETPOSTINT('search_date_endyear');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);   // Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_datelimit_startday = GETPOSTINT('search_datelimit_startday');
 $search_datelimit_startmonth = GETPOSTINT('search_datelimit_startmonth');
@@ -186,7 +186,7 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 $permissiontoread = $user->hasRight('projet', 'lire');
 $permissiontocreate = $user->hasRight('projet', 'creer');
@@ -589,7 +589,7 @@ 
 // Direct jump if only one record found
 if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
     $obj = $db->fetch_object($resql);
-    $id = $obj->id;     // in select, task id has been aliases into 'id'
+    $id = $obj->id; // in select, task id has been aliases into 'id'
     header("Location: " . constant('BASE_URL') . '/projet/tasks/task.php?id=' . $id . '&withproject=1');
     exit;
 }
@@ -598,7 +598,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');   // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -837,7 +837,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

public/htdocs/projet/tasks/document.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 
 $title = $object->ref . ' - ' . $langs->trans("Documents");
 if (!empty($withproject)) {
-    $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '')  ;
+    $title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': ' . $projectstatic->ref : '');
 }
 $help_url = '';