alxarafe / alixar

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");
 
 

public/htdocs/comm/action/class/actioncomm.class.php

Spacing +9 added lines, -9 removed lines

@@ -565,8 +565,8 @@ 
         $sql .= "ip";
         $sql .= ") VALUES (";
         $sql .= "'(PROV)', ";
-        $sql .= "'" . $this->db->idate($now) . "', ";   // date creation
-        $sql .= "'" . $this->db->idate($this->datep) . "', ";   // date start event
+        $sql .= "'" . $this->db->idate($now) . "', "; // date creation
+        $sql .= "'" . $this->db->idate($this->datep) . "', "; // date start event
         $sql .= (strval($this->datef) != '' ? "'" . $this->db->idate($this->datef) . "'" : "null") . ", ";
         $sql .= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '') ? "'" . $this->db->escape($this->durationp) . "'" : "null") . ", "; // deprecated
         $sql .= (isset($this->type_id) ? $this->type_id : "null") . ",";
@@ -1335,7 +1335,7 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as a";
         // Fields from hook
         $parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
-        $reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters);    // Note that $action and $object may have been modified by hook
+        $reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters); // Note that $action and $object may have been modified by hook
         if (!empty($hookmanager->resPrint)) {
             $sql .= $hookmanager->resPrint;
         }
@@ -1359,7 +1359,7 @@ 
         }
         // Fields where hook
         $parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
-        $reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters);    // Note that $action and $object may have been modified by hook
+        $reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters); // Note that $action and $object may have been modified by hook
         if (!empty($hookmanager->resPrint)) {
             $sql .= $hookmanager->resPrint;
         }
@@ -1436,7 +1436,7 @@ 
 
         $resql = $this->db->query($sql);
         if ($resql) {
-            $response = null;  // Ensure the variable is defined
+            $response = null; // Ensure the variable is defined
             if (empty($load_state_board)) {
                 $agenda_static = new ActionComm($this->db);
                 $response = new WorkboardResponse();
@@ -1740,8 +1740,8 @@ 
         }
         if (!empty($this->note_private)) {
             $tooltip .= '<br><br><b>' . $langs->trans('Description') . ':</b><br>';
-            $texttoshow = dolGetFirstLineOfText($this->note_private, 8);    // Try to limit length of content
-            $tooltip .= '<div class="tenlinesmax">';                        // Restrict height of content into the tooltip
+            $texttoshow = dolGetFirstLineOfText($this->note_private, 8); // Try to limit length of content
+            $tooltip .= '<div class="tenlinesmax">'; // Restrict height of content into the tooltip
             $tooltip .= (dol_textishtml($texttoshow) ? str_replace(array("\r", "\n"), "", $texttoshow) : str_replace(array("\r", "\n"), '<br>', $texttoshow));
             $tooltip .= '</div>';
         }
@@ -2625,7 +2625,7 @@ 
         //Select all action comm reminders
         $sql = "SELECT rowid as id FROM " . MAIN_DB_PREFIX . "actioncomm_reminder";
         $sql .= " WHERE typeremind = 'email'";
-        $sql .= " AND status = 0";  // 0=No yet sent, -1=Error. TODO Include reminder in error once we can count number of error, so we can try 5 times and not more on errors.
+        $sql .= " AND status = 0"; // 0=No yet sent, -1=Error. TODO Include reminder in error once we can count number of error, so we can try 5 times and not more on errors.
         $sql .= " AND dateremind <= '" . $this->db->idate($now) . "'";
         $sql .= " AND entity IN (" . getEntity('actioncomm') . ")";
         $sql .= $this->db->order("dateremind", "ASC");
@@ -2634,7 +2634,7 @@ 
         if ($resql) {
             require_once constant('DOL_DOCUMENT_ROOT') . '/core/class/html.formmail.class.php';
             $formmail = new FormMail($this->db);
-            $to = null;  // Ensure 'to' is defined for static analysis
+            $to = null; // Ensure 'to' is defined for static analysis
 
             while ($obj = $this->db->fetch_object($resql)) {
                 $res = $actionCommReminder->fetch($obj->id);

public/htdocs/comm/action/class/cactioncomm.class.php

Spacing +3 added lines, -3 removed lines

@@ -263,7 +263,7 @@ 
                             }
                         }
                         // For the case type is not 'system...' neither 'module', we just check module is on
-                        if (! in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
+                        if (!in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
                             $tmpmodule = $obj->module;
                             //var_dump($tmpmodule);
                             if ($tmpmodule && isset($conf->$tmpmodule) && isModEnabled($tmpmodule)) {
@@ -351,10 +351,10 @@ 
                 $idorcode = 'all';
             }
             $TType = $TSystem[$idorcode];
-            if (! empty($TSystemAuto[$idorcode])) {
+            if (!empty($TSystemAuto[$idorcode])) {
                 $TType = array_merge($TType, $TSystemAuto[$idorcode]);
             }
-            if (! empty($TModule[$idorcode])) {
+            if (!empty($TModule[$idorcode])) {
                 $TType = array_merge($TType, $TModule[$idorcode]);
             }
             $this->liste_array = $TType;

public/htdocs/comm/action/index.php

Spacing +12 added lines, -12 removed lines

@@ -52,7 +52,7 @@ 
     $conf->global->AGENDA_EXT_NB = 5;
 }
 $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB');
-$DELAYFORCACHE = 300;   // 300 seconds
+$DELAYFORCACHE = 300; // 300 seconds
 
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
@@ -109,7 +109,7 @@ 
 
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
-    $mode = $action;    // For backward compatibility
+    $mode = $action; // For backward compatibility
 }
 $resourceid = GETPOST("search_resourceid", 'int');
 $year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
@@ -144,7 +144,7 @@ 
 }
 
 $defaultview = getDolGlobalString('AGENDA_DEFAULT_VIEW', 'show_month'); // default for app
-$defaultview = getDolUserString('AGENDA_DEFAULT_VIEW', $defaultview);   // default for user
+$defaultview = getDolUserString('AGENDA_DEFAULT_VIEW', $defaultview); // default for user
 if (empty($mode) && !GETPOSTISSET('mode')) {
     $mode = $defaultview;
 }
@@ -539,7 +539,7 @@ 
 
 $viewmode .= '</div>';
 
-$viewmode .= '<span class="marginrightonly"></span>';   // To add a space before the navigation tools
+$viewmode .= '<span class="marginrightonly"></span>'; // To add a space before the navigation tools
 
 
 $newparam = '';
@@ -550,7 +550,7 @@ 
     $newparam .= '&month=' . ((int) $month) . '&year=' . ((int) $tmpforcreatebutton['year']) . '&mode=' . urlencode($mode);
 
     //$param='month='.$monthshown.'&year='.$year;
-    $hourminsec = dol_print_date(dol_mktime(10, 0, 0, 1, 1, 1970, 'gmt'), '%H', 'gmt') . '0000';  // Set $hourminsec to '100000' to auto set hour to 10:00 at creation
+    $hourminsec = dol_print_date(dol_mktime(10, 0, 0, 1, 1, 1970, 'gmt'), '%H', 'gmt') . '0000'; // Set $hourminsec to '100000' to auto set hour to 10:00 at creation
 
     $urltocreateaction = constant('BASE_URL') . '/comm/action/card.php?action=create';
     $urltocreateaction .= '&apyear=' . $tmpforcreatebutton['year'] . '&apmonth=' . $tmpforcreatebutton['mon'] . '&apday=' . $tmpforcreatebutton['mday'] . '&aphour=' . $tmpforcreatebutton['hours'] . '&apmin=' . $tmpforcreatebutton['minutes'];
@@ -576,7 +576,7 @@ 
     $sql .= " WHERE bc.status = 1";
     $sql .= " AND ba.status = 1";
     if (!empty($filtert) && $filtert != -1) {
-        $sql .= " AND bc.visibility = " . (int) $filtert ;
+        $sql .= " AND bc.visibility = " . (int) $filtert;
     }
     $resql = $db->query($sql);
     if ($resql) {
@@ -658,7 +658,7 @@ 
         $s .= '</script>' . "\n";
 
         foreach ($showextcals as $val) {
-            $htmlname = md5($val['name']);  // not used for security purpose, only to get a string with no special char
+            $htmlname = md5($val['name']); // not used for security purpose, only to get a string with no special char
 
             if (!empty($val['default']) || GETPOSTINT('check_ext' . $htmlname)) {
                 $default = "checked";
@@ -1109,7 +1109,7 @@ 
 
     if ($mode == 'show_day') {
         // Request only leaves for the current selected day
-        $sql .= " AND '" . $db->escape($year) . "-" . $db->escape($month) . "-" . $db->escape($day) . "' BETWEEN x.date_debut AND x.date_fin";  // date_debut and date_fin are date without time
+        $sql .= " AND '" . $db->escape($year) . "-" . $db->escape($month) . "-" . $db->escape($day) . "' BETWEEN x.date_debut AND x.date_fin"; // date_debut and date_fin are date without time
     } elseif ($mode == 'show_week') {
         // Restrict on current month (we get more, but we will filter later)
         $sql .= " AND date_debut < '" . $db->idate(dol_get_last_day($year, $month)) . "'";
@@ -1655,7 +1655,7 @@ 
 
     for ($iter_day = 0; $iter_day < 7; $iter_day++) {
         // Show days of the current week
-        $curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');        // $firstdaytoshow is in timezone of server
+        $curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd'); // $firstdaytoshow is in timezone of server
         $tmpday = dol_print_date($curtime, '%d', 'tzuserrel');
         $tmpmonth = dol_print_date($curtime, '%m', 'tzuserrel');
         $tmpyear = dol_print_date($curtime, '%Y', 'tzuserrel');
@@ -1885,9 +1885,9 @@ 
     $tmpholiday = new Holiday($db);
 
     foreach ($eventarray as $daykey => $notused) {      // daykey is the 'YYYYMMDD' to show according to user
-        $annee = dol_print_date($daykey, '%Y', 'gmt');  // We use gmt because we want the value represented by string 'YYYYMMDD'
-        $mois =  dol_print_date($daykey, '%m', 'gmt');  // We use gmt because we want the value represented by string 'YYYYMMDD'
-        $jour =  dol_print_date($daykey, '%d', 'gmt');  // We use gmt because we want the value represented by string 'YYYYMMDD'
+        $annee = dol_print_date($daykey, '%Y', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
+        $mois = dol_print_date($daykey, '%m', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
+        $jour = dol_print_date($daykey, '%d', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
 
         //print 'event daykey='.$daykey.' dol_print_date(daykey)='.dol_print_date($daykey, 'dayhour', 'gmt').' jour='.$jour.' mois='.$mois.' annee='.$annee."<br>\n";
         //print 'event daykey='.$daykey.' dol_print_date(daykey)='.dol_print_date($daykey, 'dayhour', 'gmt').' day='.$day.' month='.$month.' year='.$year."<br>\n";

public/htdocs/comm/remx.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
  *      \brief      Page to edit absolute discounts for a customer
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
     define('CSRFCHECK_WITH_TOKEN', '1');
 }       // Force use of CSRF protection with tokens even for GET
 

public/htdocs/modulebuilder/template/admin/setup.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');