@@ -95,7 +95,7 @@ |
||
95 | 95 | */ |
96 | 96 | |
97 | 97 | $parameters = array('id'=>$id); |
98 | -$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
98 | +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks |
|
99 | 99 | if ($reshook < 0) { |
100 | 100 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
101 | 101 | } |
@@ -39,7 +39,7 @@ |
||
39 | 39 | |
40 | 40 | // Get Parameters |
41 | 41 | $action = GETPOST('action', 'aZ09'); |
42 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
42 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
43 | 43 | |
44 | 44 | |
45 | 45 | /* |
@@ -22,8 +22,8 @@ |
||
22 | 22 | * \brief Page to import database |
23 | 23 | */ |
24 | 24 | |
25 | -if (! defined('CSRFCHECK_WITH_TOKEN')) { |
|
26 | - define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
25 | +if (!defined('CSRFCHECK_WITH_TOKEN')) { |
|
26 | + define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | // Load Dolibarr environment |
@@ -21,8 +21,8 @@ |
||
21 | 21 | * \brief Page to purge files (temporary or not) |
22 | 22 | */ |
23 | 23 | |
24 | -if (! defined('CSRFCHECK_WITH_TOKEN')) { |
|
25 | - define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
24 | +if (!defined('CSRFCHECK_WITH_TOKEN')) { |
|
25 | + define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | // Load Dolibarr environment |
@@ -22,8 +22,8 @@ |
||
22 | 22 | * \brief List of PHP sessions |
23 | 23 | */ |
24 | 24 | |
25 | -if (! defined('CSRFCHECK_WITH_TOKEN')) { |
|
26 | - define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
25 | +if (!defined('CSRFCHECK_WITH_TOKEN')) { |
|
26 | + define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | // Load Dolibarr environment |
@@ -78,19 +78,19 @@ discard block |
||
78 | 78 | |
79 | 79 | $listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir)))); |
80 | 80 | foreach ($listofdir as $key => $tmpdir) { |
81 | - $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
81 | + $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
82 | 82 | if (!$tmpdir) { |
83 | 83 | unset($listofdir[$key]); |
84 | 84 | continue; |
85 | 85 | } |
86 | - $tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
86 | + $tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
87 | 87 | if (!is_dir($tmpdir)) { |
88 | 88 | if (empty($nomessageinsetmoduleoptions)) { |
89 | 89 | setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings'); |
90 | 90 | } |
91 | 91 | } else { |
92 | 92 | $upload_dir = $tmpdir; |
93 | - break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
93 | + break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 | |
@@ -130,19 +130,19 @@ discard block |
||
130 | 130 | |
131 | 131 | foreach ($listofdir as $key => $tmpdir) { |
132 | 132 | $tmpdir = trim($tmpdir); |
133 | - $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
133 | + $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
134 | 134 | if (!$tmpdir) { |
135 | 135 | unset($listofdir[$key]); |
136 | 136 | continue; |
137 | 137 | } |
138 | - $tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
138 | + $tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
139 | 139 | if (!is_dir($tmpdir)) { |
140 | 140 | if (empty($nomessageinsetmoduleoptions)) { |
141 | 141 | setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings'); |
142 | 142 | } |
143 | 143 | } else { |
144 | 144 | $upload_dir = $tmpdir; |
145 | - break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
145 | + break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
146 | 146 | } |
147 | 147 | } |
148 | 148 |
@@ -23,7 +23,7 @@ |
||
23 | 23 | * \ingroup workstation |
24 | 24 | * \brief File of class to manage Workstation numbering rules standard |
25 | 25 | */ |
26 | -require_once DOL_DOCUMENT_ROOT . '/core/modules/workstation/modules_workstation.php'; |
|
26 | +require_once DOL_DOCUMENT_ROOT.'/core/modules/workstation/modules_workstation.php'; |
|
27 | 27 | |
28 | 28 | /** |
29 | 29 | * Class to manage the Standard numbering rule for Workstation |
@@ -135,8 +135,8 @@ |
||
135 | 135 | 'lastname' => $obj->name, // For thirdparties, lastname must be name |
136 | 136 | 'firstname' => '', // For thirdparties, firstname is '' |
137 | 137 | 'other' => |
138 | - ('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'. // date start real |
|
139 | - ('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'. // date end planned |
|
138 | + ('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.// date start real |
|
139 | + ('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.// date end planned |
|
140 | 140 | ('Contract='.$obj->fk_contrat).';'. |
141 | 141 | ('ContactLine='.$obj->cdid), |
142 | 142 | 'source_url' => $this->url($obj->id), |
@@ -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) { |