alxarafe / alixar

public/htdocs/comm/propal/card.php

Spacing +5 added lines, -5 removed lines

@@ -1159,8 +1159,8 @@ 
                         if (count($prodcustprice->lines) > 0) {
                             $pu_ht = price($prodcustprice->lines[0]->price);
                             $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-                            $price_min =  price($prodcustprice->lines[0]->price_min);
-                            $price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
+                            $price_min = price($prodcustprice->lines[0]->price_min);
+                            $price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc);
                             $price_base_type = $prodcustprice->lines[0]->price_base_type;
                             /*$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
                             if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
@@ -1904,7 +1904,7 @@ 
     print '<form name="addprop" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
     print '<input type="hidden" name="token" value="' . newToken() . '">';
     print '<input type="hidden" name="action" value="add">';
-    print '<input type="hidden" name="changecompany" value="0">';   // will be set to 1 by javascript so we know post is done after a company change
+    print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change
     print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
     if ($origin != 'project' && $originid) {
         print '<input type="hidden" name="origin" value="' . $origin . '">';
@@ -2295,7 +2295,7 @@ 
         if (!getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) {
             $formquestion[] = array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">' . $langs->trans("CloseAs") . '</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED)));
         }
-        $formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '');               // Field to complete private note (not replace)
+        $formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => ''); // Field to complete private note (not replace)
 
         if (getDolGlobalInt('PROPOSAL_SUGGEST_DOWN_PAYMENT_INVOICE_CREATION')) {
             // This is a hidden option:
@@ -2479,7 +2479,7 @@ 
         $nbMandated = 0;
         foreach ($object->lines as $line) {
             $res = $line->fetch_product();
-            if ($res  > 0) {
+            if ($res > 0) {
                 if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) {
                     $nbMandated++;
                     break;

public/htdocs/comm/propal/list.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
 
 // Search Fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_user    = GETPOSTINT('search_user');
+$search_user = GETPOSTINT('search_user');
 if ($search_user == -1) {
     $search_user = 0;
 }
@@ -111,7 +111,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_date_end_startday = GETPOSTINT('search_date_end_startday');
 $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth');
@@ -119,7 +119,7 @@ 
 $search_date_end_endday = GETPOSTINT('search_date_end_endday');
 $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth');
 $search_date_end_endyear = GETPOSTINT('search_date_end_endyear');
-$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_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);
 $search_date_delivery_startday = GETPOSTINT('search_date_delivery_startday');
 $search_date_delivery_startmonth = GETPOSTINT('search_date_delivery_startmonth');

public/htdocs/comm/mailing/card.php

Spacing +3 added lines, -3 removed lines

@@ -471,7 +471,7 @@ 
     }
 
     // Action send test emailing
-    if ($action == 'send' && ! $cancel && $permissiontovalidatesend) {
+    if ($action == 'send' && !$cancel && $permissiontovalidatesend) {
         $error = 0;
 
         $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id, 2, 0, 1, $object, 'mailing');
@@ -549,7 +549,7 @@ 
     if ($action == 'add' && $permissiontocreate) {
         $mesgs = array();
 
-        $object->messtype       = (string) GETPOST("messtype");
+        $object->messtype = (string) GETPOST("messtype");
         if ($object->messtype == 'sms') {
             $object->email_from     = (string) GETPOST("from_phone", 'alphawithlgt'); // Must allow 'name <email>'
         } else {
@@ -1515,7 +1515,7 @@ 
                 $maxfilesizearray = getMaxFileSizeArray();
                 $maxmin = $maxfilesizearray['maxmin'];
                 if ($maxmin > 0) {
-                    $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';  // MAX_FILE_SIZE must precede the field type=file
+                    $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
                 }
                 $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="' . $langs->trans("Upload") . '" />';
                 $out .= ' ';

public/htdocs/comm/mailing/cibles.php

Spacing +4 added lines, -4 removed lines

@@ -394,7 +394,7 @@ 
             }
         }
         if (empty($nbemail)) {
-            $nbemail .= ' ' . img_warning($langs->trans('ToAddRecipientsChooseHere'));//.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
+            $nbemail .= ' ' . img_warning($langs->trans('ToAddRecipientsChooseHere')); //.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
         }
         if ($text) {
             // @phan-suppress-next-line PhanPluginSuspiciousParamPosition
@@ -549,12 +549,12 @@ 
                     }
                     print img_object($langs->trans("EmailingTargetSelector") . ': ' . get_class($obj), $obj->picto, 'class="valignmiddle width25 size15x"');
                     print '</div>';
-                    print '<div class="tagtd valignmiddle">';   //  style="height: 4em"
+                    print '<div class="tagtd valignmiddle">'; //  style="height: 4em"
                     print $obj->getDesc();
                     print '</div>';
 
                     try {
-                        $obj->evenunsubscribe = $object->evenunsubscribe;   // Set flag to include/exclude email that has opt-out.
+                        $obj->evenunsubscribe = $object->evenunsubscribe; // Set flag to include/exclude email that has opt-out.
 
                         $nbofrecipient = $obj->getNbOfRecipients('');
                     } catch (Exception $e) {
@@ -899,7 +899,7 @@ 
                 print '<td class="center nowraponall">';
                 if ($obj->status != $object::STATUS_DRAFT) {        // If status of target line is not draft
                     // Date sent
-                    print $obj->date_envoi;     // @TODO Must store date in date format
+                    print $obj->date_envoi; // @TODO Must store date in date format
                 }
                 print '</td>';
 

public/htdocs/comm/mailing/list.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 // Initialize technical objects
 $object = new Mailing($db);
 $extrafields = new ExtraFields($db);
-$hookmanager->initHooks(array($contextpage));   // Note that conf->hooks_modules contains array of activated contexes
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);

public/htdocs/comm/action/card.php

Spacing +10 added lines, -10 removed lines

@@ -75,7 +75,7 @@ 
 $offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
 $remindertype = GETPOST('selectremindertype', 'aZ09');
 $modelmail = GETPOSTINT('actioncommsendmodel_mail');
-$complete = GETPOST('complete', 'alpha');   // 'na' must be allowed
+$complete = GETPOST('complete', 'alpha'); // 'na' must be allowed
 $private = GETPOST('private', 'alphanohtml');
 if ($complete == 'na' || $complete == -2) {
     $complete = -1;
@@ -610,12 +610,12 @@ 
             if ($selectedrecurrulefreq == 'WEEKLY' && !empty($selectedrecurrulebyday)) {
                 $firstdatearray = dol_get_first_day_week(GETPOSTINT("apday"), GETPOSTINT("apmonth"), GETPOSTINT("apyear"));
                 $datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), $firstdatearray['month'], $firstdatearray['first_day'], $firstdatearray['year'], $tzforfullday ? $tzforfullday : 'tzuserrel');
-                $datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd');//We begin the week after
+                $datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd'); //We begin the week after
                 $dayoffset = 7;
                 $monthoffset = 0;
             } elseif ($selectedrecurrulefreq == 'MONTHLY' && !empty($selectedrecurrulebymonthday)) {
                 $firstday = $selectedrecurrulebymonthday;
-                $firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth");//We begin the week after
+                $firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth"); //We begin the week after
                 $datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), $firstmonth, $firstday, GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
                 $dayoffset = 0;
                 $monthoffset = 1;
@@ -819,7 +819,7 @@ 
             reset($object->socpeopleassigned);
             $object->contact_id = key($object->socpeopleassigned);
         }
-        $object->fk_project  = GETPOSTINT("projectid");
+        $object->fk_project = GETPOSTINT("projectid");
         $object->note_private = trim(GETPOST("note", "restricthtml"));
 
         if (GETPOST("elementtype", 'alpha')) {
@@ -1063,7 +1063,7 @@ 
 if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
     $error = 0;
 
-    $shour = dol_print_date($object->datep, "%H", 'tzuserrel');     // We take the date visible by user $newdate is also date visible by user.
+    $shour = dol_print_date($object->datep, "%H", 'tzuserrel'); // We take the date visible by user $newdate is also date visible by user.
     $smin = dol_print_date($object->datep, "%M", 'tzuserrel');
 
     $newdate = GETPOST('newdate', 'alpha');
@@ -1273,7 +1273,7 @@ 
         $default = getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT', 'AC_RDV');
         print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
         $selectedvalue = GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default);
-        print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1);   // TODO Replace 0 with -2 in onlyautoornot
+        print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1); // TODO Replace 0 with -2 in onlyautoornot
         print '</td></tr>';
     }
 
@@ -1587,7 +1587,7 @@ 
         }
         //var_dump('origin='.$origin.' originid='.$originid.' hasPermissionOnLinkedObject='.$hasPermissionOnLinkedObject);
 
-        if (! in_array($origin, array('societe', 'project', 'task', 'user'))) {
+        if (!in_array($origin, array('societe', 'project', 'task', 'user'))) {
             // We do not use link for object that already contains a hard coded field to make links with agenda events
             print '<tr><td class="titlefieldcreate">' . $langs->trans("LinkedObject") . '</td>';
             print '<td colspan="3">';
@@ -1738,7 +1738,7 @@ 
             $object->socpeopleassigned[$id] = array('id' => $tmpid);
         }
         $object->contact_id   = GETPOSTINT("contactid");
-        $object->fk_project  = GETPOSTINT("projectid");
+        $object->fk_project = GETPOSTINT("projectid");
 
         $object->note_private = GETPOST("note", 'restricthtml');
     }
@@ -1814,7 +1814,7 @@ 
         if ($backtopage) {
             print '<input type="hidden" name="backtopage" value="' . ($backtopage != '1' ? $backtopage : '') . '">';
         }
-        if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && ! preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
+        if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && !preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
             print '<input type="hidden" name="actioncode" value="' . $object->type_code . '">';
         }
 
@@ -2187,7 +2187,7 @@ 
                    })';
             print '</script>' . "\n";
 
-            print '</div>';     // End of div for reminderparameters
+            print '</div>'; // End of div for reminderparameters
         }
 
         print dol_get_fiche_end();

public/htdocs/comm/action/pertype.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 
 // $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
-$showbirthday = 0;    // will be hidden here
+$showbirthday = 0; // will be hidden here
 
 // If not choice done on calendar owner, we filter on user.
 if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
@@ -997,8 +997,8 @@ 
     // We are in a particular day for $username, now we scan all events
     foreach ($eventarray as $daykey => $notused) {
         $annee = dol_print_date($daykey, '%Y', 'tzuserrel');
-        $mois =  dol_print_date($daykey, '%m', 'tzuserrel');
-        $jour =  dol_print_date($daykey, '%d', 'tzuserrel');
+        $mois = dol_print_date($daykey, '%m', 'tzuserrel');
+        $jour = dol_print_date($daykey, '%d', 'tzuserrel');
 
         if ($day == $jour && (int) $month == (int) $mois && $year == $annee) {  // Is it the day we are looking for when calling function ?
             // Scan all event for this date

public/htdocs/comm/action/list.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
 
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
-    $mode = $action;    // For backward compatibility
+    $mode = $action; // For backward compatibility
 }
 $resourceid = GETPOSTINT("search_resourceid") ? GETPOSTINT("search_resourceid") : GETPOSTINT("resourceid");
 $pid = GETPOSTINT("search_projectid", 3) ? GETPOSTINT("search_projectid", 3) : GETPOSTINT("projectid", 3);
@@ -179,7 +179,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
 
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
 if ($user->socid && $socid) {
@@ -414,7 +414,7 @@ 
 if (isModEnabled('category') && $user->hasRight('agenda', 'myactions', 'create')) {
     $arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"') . $langs->trans("AffectTag");
 }
-if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
     $arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

public/htdocs/comm/action/peruser.php

Spacing +2 added lines, -2 removed lines

@@ -1156,8 +1156,8 @@
     // We are in a particular day for $username, now we scan all events
     foreach ($eventarray as $daykey => $notused) {
         $annee = dol_print_date($daykey, '%Y', 'tzuserrel');
-        $mois =  dol_print_date($daykey, '%m', 'tzuserrel');
-        $jour =  dol_print_date($daykey, '%d', 'tzuserrel');
+        $mois = dol_print_date($daykey, '%m', 'tzuserrel');
+        $jour = dol_print_date($daykey, '%d', 'tzuserrel');
         //var_dump("daykey=$daykey day=$day jour=$jour, month=$month mois=$mois, year=$year annee=$annee");