@@ -33,8 +33,8 @@ discard block |
||
33 | 33 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
34 | 34 | require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; |
35 | 35 | require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; |
36 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php'; |
|
37 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; |
|
36 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php'; |
|
37 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php'; |
|
38 | 38 | |
39 | 39 | // Load translation files required by the page |
40 | 40 | $langs->loadLangs(array('hrm', 'companies', 'other', 'mails')); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
132 | 132 | |
133 | 133 | $morehtmlref = '<div class="refid">'; |
134 | - $morehtmlref.= $object->label; |
|
134 | + $morehtmlref .= $object->label; |
|
135 | 135 | $morehtmlref .= '</div>'; |
136 | 136 | |
137 | 137 | dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref); |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
33 | 33 | require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; |
34 | 34 | require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; |
35 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
36 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php'; |
|
35 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
36 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php'; |
|
37 | 37 | |
38 | 38 | // Load translation files required by the page |
39 | 39 | $langs->loadLangs(array('hrm', 'companies', 'other', 'mails')); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
132 | 132 | |
133 | 133 | $morehtmlref = '<div class="refid">'; |
134 | - $morehtmlref.= $object->label; |
|
134 | + $morehtmlref .= $object->label; |
|
135 | 135 | $morehtmlref .= '</div>'; |
136 | 136 | |
137 | 137 | dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref); |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | $h = 0; |
46 | 46 | $head = array(); |
47 | - $head[$h][0] = DOL_URL_ROOT . "/admin/hrm.php"; |
|
47 | + $head[$h][0] = DOL_URL_ROOT."/admin/hrm.php"; |
|
48 | 48 | $head[$h][1] = $langs->trans("Settings"); |
49 | 49 | $head[$h][2] = 'settings'; |
50 | 50 | $h++; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $head[$h][2] = 'establishments'; |
55 | 55 | $h++; |
56 | 56 | |
57 | - $head[$h][0] = DOL_URL_ROOT . '/hrm/admin/skill_extrafields.php'; |
|
57 | + $head[$h][0] = DOL_URL_ROOT.'/hrm/admin/skill_extrafields.php'; |
|
58 | 58 | $head[$h][1] = $langs->trans("SkillsExtraFields"); |
59 | 59 | $nbExtrafields = $extrafields->attributes['hrm_skill']['count']; |
60 | 60 | if ($nbExtrafields > 0) { |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $head[$h][2] = 'skillsAttributes'; |
64 | 64 | $h++; |
65 | 65 | |
66 | - $head[$h][0] = DOL_URL_ROOT . '/hrm/admin/job_extrafields.php'; |
|
66 | + $head[$h][0] = DOL_URL_ROOT.'/hrm/admin/job_extrafields.php'; |
|
67 | 67 | $head[$h][1] = $langs->trans("JobsExtraFields"); |
68 | 68 | $nbExtrafields = $extrafields->attributes['hrm_job']['count']; |
69 | 69 | if ($nbExtrafields > 0) { |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $head[$h][2] = 'jobsAttributes'; |
73 | 73 | $h++; |
74 | 74 | |
75 | - $head[$h][0] = DOL_URL_ROOT . '/hrm/admin/evaluation_extrafields.php'; |
|
75 | + $head[$h][0] = DOL_URL_ROOT.'/hrm/admin/evaluation_extrafields.php'; |
|
76 | 76 | $head[$h][1] = $langs->trans("EvaluationsExtraFields"); |
77 | 77 | $nbExtrafields = $extrafields->attributes['hrm_evaluation']['count']; |
78 | 78 | if ($nbExtrafields > 0) { |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | // Load Dolibarr environment |
39 | 39 | require '../../main.inc.php'; |
40 | -require DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php'; |
|
40 | +require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php'; |
|
41 | 41 | |
42 | 42 | // Security check |
43 | 43 | if (!isModEnabled('variants')) { |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | if (GETPOST('roworder', 'alpha', 3)) { |
62 | 62 | $roworder = GETPOST('roworder', 'alpha', 3); |
63 | 63 | |
64 | - dol_syslog("AjaxOrderAttribute roworder=" . $roworder, LOG_DEBUG); |
|
64 | + dol_syslog("AjaxOrderAttribute roworder=".$roworder, LOG_DEBUG); |
|
65 | 65 | |
66 | 66 | $rowordertab = explode(',', $roworder); |
67 | 67 | $newrowordertab = array(); |
@@ -73,7 +73,7 @@ |
||
73 | 73 | |
74 | 74 | $object = new Commande($db); |
75 | 75 | |
76 | -$usercancreate = $user->hasRight("commande", "creer"); |
|
76 | +$usercancreate = $user->hasRight("commande", "creer"); |
|
77 | 77 | $permissiontoadd = $usercancreate; |
78 | 78 | |
79 | 79 | // Security check |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $customerStatic->loadCacheOfProspStatus(); |
126 | 126 | if (!empty($customerStatic->cacheprospectstatus)) { |
127 | 127 | foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) { |
128 | - $this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label']; |
|
128 | + $this->type_statuscommprospect[$dataProspectSt['id']] = $dataProspectSt['label']; |
|
129 | 129 | } |
130 | 130 | } else { |
131 | 131 | $this->type_statuscommprospect = array( |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | } |
629 | 629 | } elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') { |
630 | 630 | if ($arrayquery['options_'.$key] > 0) { |
631 | - $sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key]).")"; |
|
631 | + $sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key]).")"; |
|
632 | 632 | } |
633 | 633 | } else { |
634 | 634 | if (is_array($arrayquery['options_'.$key])) { |
@@ -627,7 +627,7 @@ discard block |
||
627 | 627 | if (is_array($cpt)) { |
628 | 628 | $listofaccount = ''; |
629 | 629 | foreach ($cpt as $cptcursor) { |
630 | - if (! is_null($cptcursor)) { |
|
630 | + if (!is_null($cptcursor)) { |
|
631 | 631 | if ($listofaccount) { |
632 | 632 | $listofaccount .= ","; |
633 | 633 | } |
@@ -776,7 +776,7 @@ discard block |
||
776 | 776 | |
777 | 777 | $sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type, c.sens"; |
778 | 778 | $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c"; |
779 | - $sql .= " WHERE c.active = " . (int) $active; |
|
779 | + $sql .= " WHERE c.active = ".(int) $active; |
|
780 | 780 | $sql .= " AND c.entity = ".$conf->entity; |
781 | 781 | if ($categorytype >= 0) { |
782 | 782 | $sql .= " AND c.category_type = 1"; |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $maxfilesizearray = getMaxFileSizeArray(); |
180 | 180 | $maxmin = $maxfilesizearray['maxmin']; |
181 | 181 | if ($maxmin > 0) { |
182 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
182 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
183 | 183 | } |
184 | 184 | $texte .= ' <input type="file" name="uploadfile">'; |
185 | 185 | $texte .= '<input type="hidden" value="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | $newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile); |
274 | 274 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
275 | 275 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
276 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
276 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
277 | 277 | //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt'; |
278 | 278 | // Get extension (ods or odt) |
279 | 279 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -282,11 +282,11 @@ discard block |
||
282 | 282 | if ($format == '1') { |
283 | 283 | $format = '%Y%m%d%H%M%S'; |
284 | 284 | } |
285 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
285 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
286 | 286 | } else { |
287 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
287 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
288 | 288 | } |
289 | - $file = $dir . '/' . $filename; |
|
289 | + $file = $dir.'/'.$filename; |
|
290 | 290 | //print "newdir=".$dir; |
291 | 291 | //print "newfile=".$newfile; |
292 | 292 | //print "file=".$file; |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | dol_mkdir($conf->reception->dir_temp); |
296 | 296 | if (!is_writable($conf->reception->dir_temp)) { |
297 | 297 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->reception->dir_temp); |
298 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
298 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
299 | 299 | return -1; |
300 | 300 | } |
301 | 301 |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | $maxfilesizearray = getMaxFileSizeArray(); |
187 | 187 | $maxmin = $maxfilesizearray['maxmin']; |
188 | 188 | if ($maxmin > 0) { |
189 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
189 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
190 | 190 | } |
191 | 191 | $texte .= ' <input type="file" name="uploadfile">'; |
192 | 192 | $texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | $newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile); |
281 | 281 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
282 | 282 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
283 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
283 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
284 | 284 | //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt'; |
285 | 285 | // Get extension (ods or odt) |
286 | 286 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -289,11 +289,11 @@ discard block |
||
289 | 289 | if ($format == '1') { |
290 | 290 | $format = '%Y%m%d%H%M%S'; |
291 | 291 | } |
292 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
292 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
293 | 293 | } else { |
294 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
294 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
295 | 295 | } |
296 | - $file = $dir . '/' . $filename; |
|
296 | + $file = $dir.'/'.$filename; |
|
297 | 297 | //print "newdir=".$dir; |
298 | 298 | //print "newfile=".$newfile; |
299 | 299 | //print "file=".$file; |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | dol_mkdir($conf->expedition->dir_temp); |
303 | 303 | if (!is_writable($conf->expedition->dir_temp)) { |
304 | 304 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->expedition->dir_temp); |
305 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
305 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
306 | 306 | return -1; |
307 | 307 | } |
308 | 308 |