alxarafe / alixar

public/htdocs/projet/class/api_tasks.class.php

Indentation +2 added lines, -2 removed lines

@@ -672,7 +672,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
      *
@@ -681,7 +681,7 @@ 
      */
     protected function _cleanObjectDatas($object)
     {
-		// phpcs:enable
+        // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
 
         unset($object->barcode_type);

Spacing +1 added lines, -1 removed lines

@@ -466,7 +466,7 @@
             }
             if ($field == 'array_options' && is_array($value)) {
                 foreach ($value as $index => $val) {
-                    $this->task->array_options[$index] = $this->_checkValForAPI($field, $val, $this->task);;
+                    $this->task->array_options[$index] = $this->_checkValForAPI($field, $val, $this->task); ;
                 }
                 continue;
             }

public/htdocs/projet/class/projectstats.class.php

Spacing +2 added lines, -2 removed lines

@@ -331,7 +331,7 @@ 
         if ($foundintocache) {    // Cache file found and is not too old
             dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
             $data = json_decode(file_get_contents($newpathofdestfile), true);
-            '@phan-var-force array $data';  // Phan can not interpret json_decode
+            '@phan-var-force array $data'; // Phan can not interpret json_decode
         } else {
             $year = $startyear;
             while ($year <= $endyear) {
@@ -442,7 +442,7 @@ 
         if ($foundintocache) { // Cache file found and is not too old
             dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
             $data = json_decode(file_get_contents($newpathofdestfile), true);
-            '@phan-var-force array $data';  // Phan can not interpret json_decode
+            '@phan-var-force array $data'; // Phan can not interpret json_decode
         } else {
             $year = $startyear;
             while ($year <= $endyear) {

public/htdocs/projet/class/project.class.php

Indentation +12 added lines, -12 removed lines

@@ -177,8 +177,8 @@ 
     public $usage_bill_time; // Is the time spent on project must be invoiced or not
 
     /**
-       * @var integer       Event organization: Use Event Organization
-       */
+     * @var integer       Event organization: Use Event Organization
+     */
     public $usage_organize_event;
 
     /**
@@ -812,7 +812,7 @@ 
         return $substitution;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of elements for type, linked to a project
      *
@@ -826,7 +826,7 @@ 
      */
     public function get_element_list($type, $tablename, $datefieldname = '', $date_start = null, $date_end = null, $projectkey = 'fk_projet')
     {
-		// phpcs:enable
+        // phpcs:enable
 
         global $hookmanager;
 
@@ -1285,7 +1285,7 @@ 
         return $this->LibStatut(isset($this->statut) ? $this->statut : $this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Renvoi status label for a status
      *
@@ -1295,7 +1295,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         if (is_null($status)) {
@@ -1976,7 +1976,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Associate element to a project
      *
@@ -1986,7 +1986,7 @@ 
      */
     public function update_element($tableName, $elementSelectId)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "UPDATE " . MAIN_DB_PREFIX . $tableName;
 
         if ($tableName == "actioncomm") {
@@ -2010,7 +2010,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Associate element to a project
      *
@@ -2022,7 +2022,7 @@ 
      */
     public function remove_element($tableName, $elementSelectId, $projectfield = 'fk_projet')
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "UPDATE " . MAIN_DB_PREFIX . $tableName;
 
         if ($tableName == "actioncomm") {
@@ -2207,7 +2207,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -2216,7 +2216,7 @@ 
      */
     public function load_board($user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         // For external user, no check is done on company because readability is managed by public status of project and assignment.

Spacing +5 added lines, -5 removed lines

@@ -746,7 +746,7 @@ 
                 $this->statut = $obj->status; // deprecated
                 $this->status = $obj->status;
                 $this->opp_status = $obj->fk_opp_status;
-                $this->opp_amount   = $obj->opp_amount;
+                $this->opp_amount = $obj->opp_amount;
                 $this->opp_percent = $obj->opp_percent;
                 $this->budget_amount = $obj->budget_amount;
                 $this->model_pdf = $obj->model_pdf;
@@ -1703,7 +1703,7 @@ 
         global $langs, $conf;
 
         $error = 0;
-        $clone_project_id = 0;   // For static toolcheck
+        $clone_project_id = 0; // For static toolcheck
 
         dol_syslog("createFromClone clone_contact=" . json_encode($clone_contact) . " clone_task=" . json_encode($clone_task) . " clone_project_file=" . json_encode($clone_project_file) . " clone_note=" . json_encode($clone_note) . " move_date=" . json_encode($move_date), LOG_DEBUG);
 
@@ -1997,7 +1997,7 @@ 
         if ($tableName == "actioncomm") {
             $sql .= " SET fk_project=" . $this->id;
             $sql .= " WHERE id=" . ((int) $elementSelectId);
-        } elseif (in_array($tableName, ["entrepot","mrp_mo","stocktransfer_stocktransfer"])) {
+        } elseif (in_array($tableName, ["entrepot", "mrp_mo", "stocktransfer_stocktransfer"])) {
             $sql .= " SET fk_project=" . $this->id;
             $sql .= " WHERE rowid=" . ((int) $elementSelectId);
         } else {
@@ -2188,7 +2188,7 @@ 
                     $date = explode('-', $obj->element_date);
                     $week_number = getWeekNumber($date[2], $date[1], $date[0]);
                 }
-                '@phan-var-force int $week_number';  // Needed because phan considers it might be null
+                '@phan-var-force int $week_number'; // Needed because phan considers it might be null
                 if (empty($weekalreadyfound[$week_number])) {
                     $this->monthWorkLoad[$week_number] = $obj->element_duration;
                     $this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = $obj->element_duration;
@@ -2535,7 +2535,7 @@ 
         if (method_exists($this, 'getLibStatut')) {
             $return .= '<div class="info-box-status small inline-block valignmiddle">' . $this->getLibStatut(3) . '</div>';
         }
-        $return .= '</div>';    // end div line status
+        $return .= '</div>'; // end div line status
 
         $return .= '</div>';
         $return .= '</div>';

public/htdocs/projet/class/task.class.php

Indentation +4 added lines, -4 removed lines

@@ -2175,7 +2175,7 @@ 
         return $this->LibStatut($this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return status label for an object
      *
@@ -2185,7 +2185,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         // list of Statut of the task
@@ -2302,7 +2302,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -2311,7 +2311,7 @@ 
      */
     public function load_board($user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         // For external user, no check is done on company because readability is managed by public status of project and assignment.

Spacing +5 added lines, -5 removed lines

@@ -536,7 +536,7 @@ 
                          * @param Task $task
                          * @return bool
                          */
-                        static function ($allTasksCompleted, $task) {
+                        static function($allTasksCompleted, $task) {
                             return $allTasksCompleted && $task->progress >= 100;
                         },
                         1
@@ -1596,11 +1596,11 @@ 
                 $newobj->timespent_line_id = $obj->rowid;
                 $newobj->timespent_line_ref_ext = $obj->ref_ext;
                 $newobj->timespent_line_date = $this->db->jdate($obj->task_date);
-                $newobj->timespent_line_datehour    = $this->db->jdate($obj->task_datehour);
+                $newobj->timespent_line_datehour = $this->db->jdate($obj->task_datehour);
                 $newobj->timespent_line_withhour = $obj->task_date_withhour;
                 $newobj->timespent_line_duration = $obj->task_duration;
                 $newobj->timespent_line_fk_user = $obj->fk_user;
-                $newobj->timespent_line_thm = $obj->thm;    // hourly rate
+                $newobj->timespent_line_thm = $obj->thm; // hourly rate
                 $newobj->timespent_line_note = $obj->note;
 
                 $arrayres[] = $newobj;
@@ -2139,7 +2139,7 @@ 
         }
         // End
         if ($error) {
-            $clone_task_id = 0;  // For static tool check
+            $clone_task_id = 0; // For static tool check
         } else {
             $clone_task_id = $clone_task->id;
             $clone_task_ref = $clone_task->ref;
@@ -2588,7 +2588,7 @@ 
         global $langs, $hookmanager, $user, $action;
 
         $error = 0;
-        $task_origin = new Task($this->db);     // The thirdparty that we will delete
+        $task_origin = new Task($this->db); // The thirdparty that we will delete
 
         dol_syslog("mergeTask merge task id=" . $task_origin_id . " (will be deleted) into the task id=" . $this->id);
 

public/htdocs/projet/class/api_projects.class.php

Indentation +5 added lines, -5 removed lines

@@ -18,10 +18,10 @@ 
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
- use Luracast\Restler\RestException;
+    use Luracast\Restler\RestException;
 
- require_once constant('DOL_DOCUMENT_ROOT') . '/projet/class/project.class.php';
- require_once constant('DOL_DOCUMENT_ROOT') . '/projet/class/task.class.php';
+    require_once constant('DOL_DOCUMENT_ROOT') . '/projet/class/project.class.php';
+    require_once constant('DOL_DOCUMENT_ROOT') . '/projet/class/task.class.php';
 
 /**
  * API class for projects
@@ -657,7 +657,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
      *
@@ -666,7 +666,7 @@ 
      */
     protected function _cleanObjectDatas($object)
     {
-		// phpcs:enable
+        // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
 
         unset($object->datec);

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 
         $sql = "SELECT t.rowid";
         $sql .= " FROM " . MAIN_DB_PREFIX . "projet as t";
-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_extrafields AS ef ON ef.fk_object = t.rowid";  // So we will be able to filter on extrafields
+        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "projet_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
         if ($category > 0) {
             $sql .= ", " . MAIN_DB_PREFIX . "categorie_project as c";
         }

public/htdocs/projet/index.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
     while ($i < $num) {
         $objp = $db->fetch_object($resql);
         $listofoppstatus[$objp->rowid] = $objp->percent;
-        $listofopplabel[$objp->rowid] = $objp->label;       // default label if translation from "OppStatus".code not found.
+        $listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found.
         $listofoppcode[$objp->rowid] = $objp->code;
         switch ($objp->code) {
             case 'PROSP':

public/htdocs/projet/element.php

Spacing +2 added lines, -2 removed lines

@@ -151,8 +151,8 @@
 $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$datesrfc = GETPOST('datesrfc');    // deprecated
-$dateerfc = GETPOST('dateerfc');    // deprecated
+$datesrfc = GETPOST('datesrfc'); // deprecated
+$dateerfc = GETPOST('dateerfc'); // deprecated
 $dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear'));
 $datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
 if (empty($dates) && !empty($datesrfc)) {   // deprecated

public/htdocs/contrat/card.php

Spacing +8 added lines, -8 removed lines

@@ -110,7 +110,7 @@ 
 $permissionnote = $user->hasRight('contrat', 'creer'); // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->hasRight('contrat', 'creer'); // Used by the include of actions_dellink.inc.php
 $permissiontodelete = ($user->hasRight('contrat', 'creer') && $object->statut == $object::STATUS_DRAFT) || $user->hasRight('contrat', 'supprimer');
-$permissiontoadd   = $user->hasRight('contrat', 'creer');     //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoadd   = $user->hasRight('contrat', 'creer'); //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontoedit = $permissiontoadd;
 $permissiontoactivate = $user->hasRight('contrat', 'activer');
 $error = 0;
@@ -155,7 +155,7 @@ 
 
     include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once
 
-    include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php';  // Must be include, not include_once
+    include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
     if ($action == 'confirm_active' && $confirm == 'yes' && $permissiontoactivate) {
         $date_start = '';
@@ -533,8 +533,8 @@ 
                     $result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
                     if ($result) {
                         if (count($prodcustprice->lines) > 0) {
-                            $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);
                             /*$tva_tx = $prodcustprice->lines[0]->tva_tx;
                             if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
                                 $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
@@ -711,7 +711,7 @@ 
         if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update) {
             setEventMessages($langs->trans("Error") . ': ' . $langs->trans("DateStartPlanned") . ' > ' . $langs->trans("DateEndPlanned"), null, 'errors');
             $action = 'editline';
-            $_GET['rowid'] = GETPOST('elrowid');    // Keep $_GET here. Used by GETPOST('rowid') later
+            $_GET['rowid'] = GETPOST('elrowid'); // Keep $_GET here. Used by GETPOST('rowid') later
             $error++;
         }
 
@@ -770,7 +770,7 @@ 
             // update price_ht with discount
             // TODO Use object->updateline instead objectline->update
 
-            $price_ht =  price2num(GETPOST('elprice'), 'MU');
+            $price_ht = price2num(GETPOST('elprice'), 'MU');
             $remise_percent = price2num(GETPOST('elremise_percent'), '', 2);
             if ($remise_percent > 0) {
                 $remise = round(((float) $price_ht * (float) $remise_percent / 100), 2);
@@ -875,7 +875,7 @@ 
     } elseif ($action == 'confirm_activate' && $confirm == 'yes' && $user->hasRight('contrat', 'creer')) {
         $date_start = dol_mktime(12, 0, 0, GETPOST('d_startmonth'), GETPOST('d_startday'), GETPOST('d_startyear'));
         $date_end   = dol_mktime(12, 0, 0, GETPOST('d_endmonth'), GETPOST('d_endday'), GETPOST('d_endyear'));
-        $comment      = GETPOST('comment', 'alpha');
+        $comment = GETPOST('comment', 'alpha');
         $result = $object->activateAll($user, $date_start, 0, $comment, $date_end);
         if ($result < 0) {
             setEventMessages($object->error, $object->errors, 'errors');
@@ -1504,7 +1504,7 @@ 
         }
 
 
-        $arrayothercontracts = $object->getListOfContracts('others');   // array or -1 if technical error
+        $arrayothercontracts = $object->getListOfContracts('others'); // array or -1 if technical error
 
         /*
          * Lines of contracts

public/htdocs/contrat/ticket.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 
 dol_get_fiche_head($head, 'ticket', $langs->trans("Contract"), -1, 'contract');
 
-$linkback = '<a href="' . constant('BASE_URL') . '/contrat/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">';
+$linkback = '<a href="' . constant('BASE_URL') . '/contrat/list.php' . (!empty($socid) ? '?socid=' . $socid : '') . '">';
 $linkback .= $langs->trans("BackToList") . '</a>';
 
 $morehtmlref = '';
@@ -136,12 +136,12 @@ 
 // Thirdparty
 $morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 // Project
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->projet->enabled)) {
     require_once constant('DOL_DOCUMENT_ROOT') . '/projet/class/task.class.php';
 
     $langs->load("projects");
     $morehtmlref .= '<br>' . $langs->trans('Project') . ' : ';
-    if (! empty($object->fk_project)) {
+    if (!empty($object->fk_project)) {
         $proj = new Project($db);
         $proj->fetch($object->fk_project);
         $morehtmlref .= '<a href="' . constant('BASE_URL') . '/projet/card.php?id=';