@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | // Default sort order (if not yet defined by previous GETPOST) |
86 | 86 | if (!$sortfield) { |
87 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
87 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
88 | 88 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
89 | 89 | } |
90 | 90 | if (!$sortorder) { |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | $sql .= $object->getFieldList('t'); |
228 | 228 | $sql .= ','; |
229 | 229 | $sql .= $userstatic->getFieldList('u', array('rowid')); |
230 | -$sql .= ', u.email, u.statut, u.photo, u.login'; // Add more field not yet into the user->fields |
|
230 | +$sql .= ', u.email, u.statut, u.photo, u.login'; // Add more field not yet into the user->fields |
|
231 | 231 | $sql .= ', j.rowid as job_id, j.label as job_label'; |
232 | 232 | // Add fields from extrafields |
233 | 233 | if (!empty($extrafields->attributes[$object->table_element]['label'])) { |
@@ -571,7 +571,7 @@ discard block |
||
571 | 571 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
572 | 572 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
573 | 573 | } |
574 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
574 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
575 | 575 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
576 | 576 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : '')) . "\n"; |
577 | 577 | $totalarray['nbfield']++; |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | 'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 21, 'notnull' => 0, 'visible' => 1,), |
111 | 111 | 'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => 2,), |
112 | 112 | 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => 2,), |
113 | - 'deplacement' => array('type' => 'select', 'required' => 1,'label' => 'NeedBusinessTravels', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array(0 => "No", 1 => "Yes"), 'default' => '0'), |
|
113 | + 'deplacement' => array('type' => 'select', 'required' => 1, 'label' => 'NeedBusinessTravels', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array(0 => "No", 1 => "Yes"), 'default' => '0'), |
|
114 | 114 | 'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 0,), |
115 | 115 | 'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 71, 'notnull' => 0, 'visible' => 0,), |
116 | 116 | 'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',), |
@@ -844,7 +844,7 @@ discard block |
||
844 | 844 | public function LibStatut($status, $mode = 0) |
845 | 845 | { |
846 | 846 | // phpcs:enable |
847 | - return ''; // There is no status on job profile for the moment |
|
847 | + return ''; // There is no status on job profile for the moment |
|
848 | 848 | |
849 | 849 | /* |
850 | 850 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | */ |
228 | 228 | public function create(User $user, $notrigger = 0) |
229 | 229 | { |
230 | - global $langs,$conf; |
|
230 | + global $langs, $conf; |
|
231 | 231 | |
232 | 232 | $resultcreate = $this->createCommon($user, $notrigger); |
233 | 233 | |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $skilldet->rankorder = $i; |
267 | 267 | $skilldet->fk_skill = $this->id; |
268 | 268 | |
269 | - $result = $skilldet->create($user); |
|
269 | + $result = $skilldet->create($user); |
|
270 | 270 | if ($result <= 0) { |
271 | 271 | $error++; |
272 | 272 | } |
@@ -383,13 +383,13 @@ |
||
383 | 383 | global $user; |
384 | 384 | |
385 | 385 | $this->fk_skill = $currentSkill->fk_skill; |
386 | - $this->rankorder = $currentSkill->rankorder; |
|
386 | + $this->rankorder = $currentSkill->rankorder; |
|
387 | 387 | $this->fk_object = $fk_user; |
388 | 388 | $this->date_creation = dol_now(); |
389 | 389 | $this->fk_user_creat = $user->id; |
390 | 390 | $this->fk_user_modif = $user->id; |
391 | 391 | $this->objecttype = self::SKILLRANK_TYPE_USER; |
392 | - $result = $this->create($user); |
|
392 | + $result = $this->create($user); |
|
393 | 393 | |
394 | 394 | return $result; |
395 | 395 | } |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | //} |
321 | 321 | // Add where from hooks |
322 | 322 | $parameters = array(); |
323 | -$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook |
|
323 | +$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook |
|
324 | 324 | $sql .= $hookmanager->resPrint; |
325 | 325 | $sql = preg_replace("/,\s*$/", "", $sql); |
326 | 326 | |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
613 | 613 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
614 | 614 | } |
615 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
615 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
616 | 616 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
617 | 617 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
618 | 618 | $totalarray['nbfield']++; |
@@ -286,7 +286,7 @@ |
||
286 | 286 | if ($action != 'editline') { |
287 | 287 | print '<div class="tabsAction">' . "\n"; |
288 | 288 | $parameters = array(); |
289 | - $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
289 | + $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
290 | 290 | if ($reshook < 0) { |
291 | 291 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
292 | 292 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | /** |
26 | 26 | * @return Luracast\Restler\AutoLoader |
27 | 27 | */ |
28 | - static function () { |
|
28 | + static function() { |
|
29 | 29 | $loader = Luracast\Restler\AutoLoader::instance(); |
30 | 30 | spl_autoload_register($loader); |
31 | 31 | return $loader; |
@@ -1170,7 +1170,7 @@ discard block |
||
1170 | 1170 | $list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed; |
1171 | 1171 | $list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique; |
1172 | 1172 | $list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired; |
1173 | - $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1173 | + $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1174 | 1174 | $list[$tab->elementtype][$tab->name]['pos'] = $tab->pos; |
1175 | 1175 | $list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable; |
1176 | 1176 | $list[$tab->elementtype][$tab->name]['perms'] = $tab->perms; |
@@ -2109,7 +2109,7 @@ discard block |
||
2109 | 2109 | throw new RestException(500, $langs->trans('XmlNotFound') . ': /install/' . $xmlshortfile); |
2110 | 2110 | } |
2111 | 2111 | } else { |
2112 | - $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into filecheck.php. |
|
2112 | + $xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into filecheck.php. |
|
2113 | 2113 | |
2114 | 2114 | // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...) |
2115 | 2115 | if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') { |
@@ -158,11 +158,11 @@ |
||
158 | 158 | unset($object->barcode_type_code); |
159 | 159 | unset($object->barcode_type_label); |
160 | 160 | |
161 | - unset($object->mode_reglement); // We use mode_reglement_id now |
|
162 | - unset($object->cond_reglement); // We use cond_reglement_id now |
|
163 | - unset($object->note); // We use note_public or note_private now |
|
164 | - unset($object->contact); // We use contact_id now |
|
165 | - unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
161 | + unset($object->mode_reglement); // We use mode_reglement_id now |
|
162 | + unset($object->cond_reglement); // We use cond_reglement_id now |
|
163 | + unset($object->note); // We use note_public or note_private now |
|
164 | + unset($object->contact); // We use contact_id now |
|
165 | + unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now |
|
166 | 166 | |
167 | 167 | unset($object->projet); // Should be fk_project |
168 | 168 | unset($object->project); // Should be fk_project |