@@ -38,7 +38,7 @@ |
||
38 | 38 | // Parameters |
39 | 39 | $action = GETPOST('action', 'aZ09'); |
40 | 40 | $backtopage = GETPOST('backtopage', 'alpha'); |
41 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
41 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
42 | 42 | |
43 | 43 | $value = GETPOST('value', 'alpha'); |
44 | 44 |
@@ -1105,7 +1105,7 @@ discard block |
||
1105 | 1105 | print '<tr class="oddeven nohover' . (in_array($tmpfieldlist, array('topic', 'joinfiles')) ? ' nobottom' : '') . '" id="tr-' . $tmpfieldlist . '-' . $rowid . '">'; |
1106 | 1106 | print '<td colspan="10">'; |
1107 | 1107 | |
1108 | - $fieldsforcontent = array('topic', 'email_from','joinfiles', 'content'); |
|
1108 | + $fieldsforcontent = array('topic', 'email_from', 'joinfiles', 'content'); |
|
1109 | 1109 | if (getDolGlobalString('MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES')) { |
1110 | 1110 | $fieldsforcontent[] = 'content_lines'; |
1111 | 1111 | } |
@@ -1178,7 +1178,7 @@ discard block |
||
1178 | 1178 | continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled) |
1179 | 1179 | } |
1180 | 1180 | // Test on 'enabled' |
1181 | - if (! (int) dol_eval($obj->enabled, 1, 1, '1')) { |
|
1181 | + if (!(int) dol_eval($obj->enabled, 1, 1, '1')) { |
|
1182 | 1182 | $i++; |
1183 | 1183 | continue; // Email template not qualified |
1184 | 1184 | } |
@@ -40,7 +40,7 @@ |
||
40 | 40 | |
41 | 41 | $action = GETPOST('action', 'aZ09'); |
42 | 42 | $value = GETPOST('value', 'alpha'); |
43 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
43 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
44 | 44 | |
45 | 45 | $label = GETPOST('label', 'alpha'); |
46 | 46 | $scandir = GETPOST('scandir', 'alpha'); |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | $provider . '_NAME', |
153 | 153 | $provider . '_ID', |
154 | 154 | $provider . '_SECRET', |
155 | - $provider . '_URLAUTHORIZE', // For custom oauth links |
|
155 | + $provider . '_URLAUTHORIZE', // For custom oauth links |
|
156 | 156 | $provider . '_SCOPE' // For custom oauth links |
157 | 157 | ); |
158 | 158 | } |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | // $list is defined into oauth.lib.php to the list of supporter OAuth providers. |
164 | 164 | foreach ($listinsetup as $key) { |
165 | 165 | $supported = 0; |
166 | - $keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME |
|
166 | + $keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME |
|
167 | 167 | $keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array); |
168 | 168 | $keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array); |
169 | 169 | if (preg_match('/^.*-/', $keyforsupportedoauth2array)) { |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | if (getDolGlobalString($key[4])) { |
184 | 184 | $shortscope = getDolGlobalString($key[4]); |
185 | 185 | } |
186 | - $state = $shortscope; // TODO USe a better state |
|
186 | + $state = $shortscope; // TODO USe a better state |
|
187 | 187 | |
188 | 188 | // Define $urltorenew, $urltodelete, $urltocheckperms |
189 | 189 | if ($keyforsupportedoauth2array == 'OAUTH_GITHUB_NAME') { |
@@ -40,7 +40,7 @@ |
||
40 | 40 | |
41 | 41 | // Get Parameters |
42 | 42 | $action = GETPOST('action', 'aZ09'); |
43 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
43 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
44 | 44 | |
45 | 45 | |
46 | 46 | /* |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | |
195 | 195 | $globalkey = empty($provider) ? $label : $label . '-' . $provider; |
196 | 196 | |
197 | - if (!dolibarr_del_const($db, $globalkey . '_NAME', $conf->entity) || !dolibarr_del_const($db, $globalkey . '_ID', $conf->entity) || !dolibarr_del_const($db, $globalkey . '_SECRET', $conf->entity) || !dolibarr_del_const($db, $globalkey . '_URLAUTHORIZE', $conf->entity) || !dolibarr_del_const($db, $globalkey . '_SCOPE', $conf->entity)) { |
|
197 | + if (!dolibarr_del_const($db, $globalkey . '_NAME', $conf->entity) || !dolibarr_del_const($db, $globalkey . '_ID', $conf->entity) || !dolibarr_del_const($db, $globalkey . '_SECRET', $conf->entity) || !dolibarr_del_const($db, $globalkey . '_URLAUTHORIZE', $conf->entity) || !dolibarr_del_const($db, $globalkey . '_SCOPE', $conf->entity)) { |
|
198 | 198 | setEventMessages($langs->trans("ErrorInEntryDeletion"), null, 'errors'); |
199 | 199 | $error++; |
200 | 200 | } else { |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | $provider . '_NAME', |
271 | 271 | $provider . '_ID', |
272 | 272 | $provider . '_SECRET', |
273 | - $provider . '_URLAUTHORIZE', // For custom oauth links |
|
273 | + $provider . '_URLAUTHORIZE', // For custom oauth links |
|
274 | 274 | $provider . '_SCOPE' // For custom oauth links |
275 | 275 | ); |
276 | 276 | } |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | // $list is defined into oauth.lib.php to the list of supporter OAuth providers. |
290 | 290 | foreach ($listinsetup as $key) { |
291 | 291 | $supported = 0; |
292 | - $keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME |
|
292 | + $keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME |
|
293 | 293 | $keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array); |
294 | 294 | $keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array); |
295 | 295 | if (preg_match('/^.*-/', $keyforsupportedoauth2array)) { |
@@ -43,7 +43,7 @@ |
||
43 | 43 | |
44 | 44 | $action = GETPOST('action', 'aZ09'); |
45 | 45 | $value = GETPOST('value', 'alpha'); |
46 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
46 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
47 | 47 | |
48 | 48 | |
49 | 49 | /* |
@@ -44,7 +44,7 @@ |
||
44 | 44 | |
45 | 45 | $type = GETPOST('type', 'alpha'); |
46 | 46 | $value = GETPOST('value', 'alpha'); |
47 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
47 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
48 | 48 | |
49 | 49 | $label = GETPOST('label', 'alpha'); |
50 | 50 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -23,8 +23,8 @@ |
||
23 | 23 | * \brief Page to import database |
24 | 24 | */ |
25 | 25 | |
26 | -if (! defined('CSRFCHECK_WITH_TOKEN')) { |
|
27 | - define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
26 | +if (!defined('CSRFCHECK_WITH_TOKEN')) { |
|
27 | + define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | // Load Dolibarr environment |