alxarafe / alixar

public/htdocs/comm/action/index.php

Spacing +12 added lines, -12 removed lines

@@ -53,7 +53,7 @@ 
     $conf->global->AGENDA_EXT_NB = 5;
 }
 $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB');
-$DELAYFORCACHE = 300;   // 300 seconds
+$DELAYFORCACHE = 300; // 300 seconds
 
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
@@ -110,7 +110,7 @@ 
 
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && str_contains($action, 'show_')) {
-    $mode = $action;    // For backward compatibility
+    $mode = $action; // For backward compatibility
 }
 $resourceid = GETPOST("search_resourceid", 'int');
 $year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
@@ -145,7 +145,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;
 }
@@ -540,7 +540,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 = '';
@@ -551,7 +551,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'];
@@ -577,7 +577,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) {
@@ -659,7 +659,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";
@@ -1110,7 +1110,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)) . "'";
@@ -1656,7 +1656,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/action/list.php

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
 
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && str_contains($action, 'show_')) {
-    $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);
@@ -183,7 +183,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) {
@@ -418,7 +418,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/pertype.php

Spacing +21 added lines, -21 removed lines

@@ -57,7 +57,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')) {
@@ -257,7 +257,7 @@ 
 
 $week = $prev['week'];
 
-$day = (int)$day;
+$day = (int) $day;
 $next = dol_get_next_day($day, $month, $year);
 $next_year = $year + 1;
 $next_month = $month;
@@ -288,7 +288,7 @@ 
     }
 }
 if ($resourceid > 0) {
-    $param .= "&search_resourceid=" . urlencode((string)($resourceid));
+    $param .= "&search_resourceid=" . urlencode((string) ($resourceid));
 }
 if ($status || GETPOSTISSET('status') || GETPOSTISSET('search_status')) {
     $param .= "&search_status=" . urlencode($status);
@@ -300,16 +300,16 @@ 
     $param .= "&search_filtert=" . urlencode($filtert);
 }
 if ($usergroup > 0) {
-    $param .= "&search_usergroup=" . urlencode((string)($usergroup));
+    $param .= "&search_usergroup=" . urlencode((string) ($usergroup));
 }
 if ($socid > 0) {
-    $param .= "&search_socid=" . urlencode((string)($socid));
+    $param .= "&search_socid=" . urlencode((string) ($socid));
 }
 if ($showbirthday) {
     $param .= "&search_showbirthday=1";
 }
 if ($pid) {
-    $param .= "&search_projectid=" . urlencode((string)($pid));
+    $param .= "&search_projectid=" . urlencode((string) ($pid));
 }
 if ($type) {
     $param .= "&search_type=" . urlencode($type);
@@ -324,12 +324,12 @@ 
     $param .= '&end_h=' . urlencode($end_h);
 }
 if ($begin_d != '') {
-    $param .= '&begin_d=' . urlencode((string)($begin_d));
+    $param .= '&begin_d=' . urlencode((string) ($begin_d));
 }
 if ($end_d != '') {
-    $param .= '&end_d=' . urlencode((string)($end_d));
+    $param .= '&end_d=' . urlencode((string) ($end_d));
 }
-$param .= "&maxprint=" . urlencode((string)($maxprint));
+$param .= "&maxprint=" . urlencode((string) ($maxprint));
 
 $paramnoactionodate = $param;
 
@@ -343,7 +343,7 @@ 
 
 $week = $prev['week'];
 
-$day = (int)$day;
+$day = (int) $day;
 $next = dol_get_next_day(31, 12, $year);
 $next_year = $year + 1;
 $next_month = $month;
@@ -376,7 +376,7 @@ 
 $nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
 
 // Must be after the nav definition
-$param .= '&year=' . urlencode((string)($year)) . '&month=' . urlencode((string)($month)) . ($day ? '&day=' . urlencode((string)($day)) : '');
+$param .= '&year=' . urlencode((string) ($year)) . '&month=' . urlencode((string) ($month)) . ($day ? '&day=' . urlencode((string) ($day)) : '');
 //print 'x'.$param;
 
 
@@ -575,10 +575,10 @@ 
     }
 }
 if ($resourceid > 0) {
-    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . ((int)$resourceid);
+    $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = " . ((int) $resourceid);
 }
 if ($pid) {
-    $sql .= " AND a.fk_project = " . ((int)$pid);
+    $sql .= " AND a.fk_project = " . ((int) $pid);
 }
 // If the internal user must only see his customers, force searching by him
 $search_sale = 0;
@@ -590,12 +590,12 @@ 
     if ($search_sale == -2) {
         $sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = a.fk_soc)";
     } elseif ($search_sale > 0) {
-        $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = a.fk_soc AND sc.fk_user = " . ((int)$search_sale) . ")";
+        $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = a.fk_soc AND sc.fk_user = " . ((int) $search_sale) . ")";
     }
 }
 // Search on socid
 if ($socid) {
-    $sql .= " AND a.fk_soc = " . ((int)$socid);
+    $sql .= " AND a.fk_soc = " . ((int) $socid);
 }
 // We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
@@ -626,7 +626,7 @@ 
     $sql .= ')';
 }
 if ($type) {
-    $sql .= " AND ca.id = " . ((int)$type);
+    $sql .= " AND ca.id = " . ((int) $type);
 }
 if ($status == '0') {
     $sql .= " AND a.percent = 0";
@@ -652,7 +652,7 @@ 
         $sql .= "ar.fk_element = " . $filtert;
     }
     if ($usergroup > 0) {
-        $sql .= ($filtert > 0 ? " OR " : "") . " ugu.fk_usergroup = " . ((int)$usergroup);
+        $sql .= ($filtert > 0 ? " OR " : "") . " ugu.fk_usergroup = " . ((int) $usergroup);
     }
     $sql .= ")";
 }
@@ -1003,7 +1003,7 @@ 
         $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 ?
+        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
             foreach ($eventarray[$daykey] as $index => $event) {
                 //print 'daykey='.$daykey.' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
@@ -1079,9 +1079,9 @@ 
                     //if ($username->id == 1 && $day==1) print 'h='.$h;
                     $newcolor = ''; //init
                     if (empty($event->fulldayevent)) {
-                        $a = dol_mktime((int)$h, 0, 0, $month, $day, $year, 'tzuserrel', 0);
-                        $b = dol_mktime((int)$h, 30, 0, $month, $day, $year, 'tzuserrel', 0);
-                        $c = dol_mktime((int)$h + 1, 0, 0, $month, $day, $year, 'tzuserrel', 0);
+                        $a = dol_mktime((int) $h, 0, 0, $month, $day, $year, 'tzuserrel', 0);
+                        $b = dol_mktime((int) $h, 30, 0, $month, $day, $year, 'tzuserrel', 0);
+                        $c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'tzuserrel', 0);
 
                         $dateendtouse = $event->date_end_in_calendar;
                         if ($dateendtouse == $event->date_start_in_calendar) {

public/htdocs/core/modules/export/export_tsv.modules.php

Indentation +14 added lines, -14 removed lines

@@ -151,7 +151,7 @@ 
         return $this->version_lib;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *   Open output file
      *
@@ -161,7 +161,7 @@ 
      */
     public function open_file($file, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         dol_syslog("ExportTsv::open_file file=" . $file);
@@ -179,7 +179,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Output header into file
      *
@@ -188,12 +188,12 @@ 
      */
     public function write_header($outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return 0;
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Output title line into file
      *
@@ -205,7 +205,7 @@ 
      */
     public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
     {
-		// phpcs:enable
+        // phpcs:enable
         $selectlabel = array();
         foreach ($array_selected_sorted as $code => $value) {
             $newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
@@ -226,7 +226,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Output record line into file
      *
@@ -238,7 +238,7 @@ 
      */
     public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $this->col = 0;
@@ -284,7 +284,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Output footer into file
      *
@@ -293,11 +293,11 @@ 
      */
     public function write_footer($outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Close file handle
      *
@@ -305,12 +305,12 @@ 
      */
     public function close_file()
     {
-		// phpcs:enable
+        // phpcs:enable
         fclose($this->handle);
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Clean a cell to respect rules of TSV file cells
      *
@@ -320,7 +320,7 @@ 
      */
     public function tsv_clean($newvalue, $charset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // Rule Dolibarr: No HTML
         $newvalue = dol_string_nohtmltag($newvalue, 1, $charset);