@@ -60,7 +60,7 @@ |
||
60 | 60 | $showempty = 0; |
61 | 61 | } |
62 | 62 | |
63 | - $return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1); |
|
63 | + $return['value'] = $formProject->selectInvoiceAndLine($invoice_id, 0, 'invoiceid', 'invoicelineid', 'maxwidth500', array(), 1); |
|
64 | 64 | //$return['num'] = $form->num; |
65 | 65 | //$return['error'] = $form->error; |
66 | 66 |
@@ -57,7 +57,7 @@ |
||
57 | 57 | //print $object->id.' - '.$object->module.' - '.$object->element.' - '.$object->table_element.' - '.$usesublevelpermission."\n"; |
58 | 58 | |
59 | 59 | // Security check |
60 | -$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1); // Call with mode return |
|
60 | +$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1); // Call with mode return |
|
61 | 61 | if (!$result) { |
62 | 62 | httponly_accessforbidden('Not allowed by restrictArea'); |
63 | 63 | } |
@@ -40,7 +40,7 @@ |
||
40 | 40 | |
41 | 41 | |
42 | 42 | $id = GETPOST('id', 'aZ09'); |
43 | -$objecttype = GETPOST('objecttype', 'aZ09arobase'); // 'module' or 'myobject@mymodule', 'mymodule_myobject' |
|
43 | +$objecttype = GETPOST('objecttype', 'aZ09arobase'); // 'module' or 'myobject@mymodule', 'mymodule_myobject' |
|
44 | 44 | |
45 | 45 | $params = array('fromajaxtooltip' => 1); |
46 | 46 | if (GETPOSTISSET('infologin')) { |
@@ -93,7 +93,7 @@ |
||
93 | 93 | $sql .= " WHERE u.entity IN (".getEntity('adherent').")"; |
94 | 94 | $sql .= " AND u.statut = ".Adherent::STATUS_VALIDATED; |
95 | 95 | $sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0); |
96 | - $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
96 | + $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
97 | 97 | $sql .= $this->db->plimit($max, 0); |
98 | 98 | |
99 | 99 | dol_syslog(get_class($this)."::loadBox", LOG_DEBUG); |
@@ -150,7 +150,7 @@ |
||
150 | 150 | $userid = 0; // No filter on user creation |
151 | 151 | |
152 | 152 | $WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320'; |
153 | - $HEIGHT = '150'; // Height require to have 5+1 entries into legend visible. |
|
153 | + $HEIGHT = '150'; // Height require to have 5+1 entries into legend visible. |
|
154 | 154 | |
155 | 155 | if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) { |
156 | 156 | // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...) |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * \brief Widget of scheduled jobs |
25 | 25 | */ |
26 | 26 | |
27 | -include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php'; |
|
27 | +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; |
|
28 | 28 | |
29 | 29 | |
30 | 30 | /** |
@@ -80,14 +80,14 @@ discard block |
||
80 | 80 | $this->info_box_head = array('text' => $langs->trans("BoxScheduledJobs", $max)); |
81 | 81 | |
82 | 82 | if ($user->hasRight('cron', 'read')) { |
83 | - include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php'; |
|
83 | + include_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php'; |
|
84 | 84 | $cronstatic = new Cronjob($this->db); |
85 | 85 | $resultarray = array(); |
86 | 86 | |
87 | 87 | $result = 0; |
88 | 88 | $sql = "SELECT t.rowid, t.datelastrun, t.datenextrun, t.datestart,"; |
89 | 89 | $sql .= " t.label, t.status, t.test, t.lastresult, t.processing"; |
90 | - $sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t"; |
|
90 | + $sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t"; |
|
91 | 91 | $sql .= " WHERE status <> ".$cronstatic::STATUS_DISABLED; |
92 | 92 | $sql .= " AND entity IN (0, ".$conf->entity.")"; |
93 | 93 | $sql .= $this->db->order("t.datelastrun", "DESC"); |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $this->info_box_contents[0][0] = array( |
193 | 193 | 'td' => '', |
194 | 194 | 'maxlength' => 500, |
195 | - 'text' => ($this->db->lasterror() . ' sql=' . $sql) |
|
195 | + 'text' => ($this->db->lasterror().' sql='.$sql) |
|
196 | 196 | ); |
197 | 197 | } |
198 | 198 | } else { |
@@ -102,7 +102,7 @@ |
||
102 | 102 | $sql .= " AND u.statut = ".User::STATUS_ENABLED; |
103 | 103 | $sql .= dolSqlDateFilter('u.dateemployment', 0, $tmparray['mon'], 0); |
104 | 104 | $sql .= " AND u.dateemployment < '".$this->db->idate(dol_get_first_day($tmparray['year']))."'"; |
105 | - $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
105 | + $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
106 | 106 | $sql .= $this->db->plimit($max, 0); |
107 | 107 | |
108 | 108 | dol_syslog(get_class($this)."::loadBox", LOG_DEBUG); |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | } |
161 | 161 | } else { |
162 | 162 | dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '".$usertotest."'", LOG_NOTICE); |
163 | - sleep(1); // Anti brut force protection. Must be same delay when password is not valid |
|
163 | + sleep(1); // Anti brut force protection. Must be same delay when password is not valid |
|
164 | 164 | |
165 | 165 | // Load translation files required by the page |
166 | 166 | $langs->loadLangs(array('main', 'errors')); |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | } |
175 | 175 | } else { |
176 | 176 | dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO Too many attempts", LOG_NOTICE); |
177 | - sleep(1); // Anti brut force protection. Must be same delay when password is not valid |
|
177 | + sleep(1); // Anti brut force protection. Must be same delay when password is not valid |
|
178 | 178 | // Load translation files required by the page |
179 | 179 | $langs->loadLangs(array('main', 'errors')); |
180 | 180 | $_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorTooManyAttempts"); |
@@ -75,12 +75,12 @@ |
||
75 | 75 | //global $dolibarr_main_url_root; |
76 | 76 | //$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); |
77 | 77 | //$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file |
78 | - $urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current |
|
78 | + $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current |
|
79 | 79 | |
80 | 80 | //$shortscope = 'userinfo_email,userinfo_profile'; |
81 | - $shortscope = 'openid,email,profile'; // For openid connect |
|
81 | + $shortscope = 'openid,email,profile'; // For openid connect |
|
82 | 82 | |
83 | - $oauthstateanticsrf = bin2hex(random_bytes(128/8)); |
|
83 | + $oauthstateanticsrf = bin2hex(random_bytes(128 / 8)); |
|
84 | 84 | $_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf; |
85 | 85 | |
86 | 86 | $url = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.urlencode($shortscope).'&state='.urlencode('forlogin-'.$shortscope.'-'.$oauthstateanticsrf).'&username='.urlencode($usertotest); |