@@ -76,7 +76,7 @@ |
||
76 | 76 | */ |
77 | 77 | function decodeHttpBasicAuth($value) |
78 | 78 | { |
79 | - $encoded_basic_auth = substr($value, 6); // Remove the "Basic " string |
|
79 | + $encoded_basic_auth = substr($value, 6); // Remove the "Basic " string |
|
80 | 80 | $decoded_basic_auth = base64_decode($encoded_basic_auth); |
81 | 81 | $credentials_basic_auth = explode(':', $decoded_basic_auth); |
82 | 82 |
@@ -125,8 +125,8 @@ discard block |
||
125 | 125 | |
126 | 126 | |
127 | 127 | $sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token"; |
128 | - $sql.= " SET service = '".$db->escape($oldprovider."-".$newlabel)."'"; |
|
129 | - $sql.= " WHERE service = '".$db->escape($oldprovider."-".$oldlabel)."'"; |
|
128 | + $sql .= " SET service = '".$db->escape($oldprovider."-".$newlabel)."'"; |
|
129 | + $sql .= " WHERE service = '".$db->escape($oldprovider."-".$oldlabel)."'"; |
|
130 | 130 | |
131 | 131 | |
132 | 132 | $resql = $db->query($sql); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | |
188 | 188 | $globalkey = empty($provider) ? $label : $label.'-'.$provider; |
189 | 189 | |
190 | - 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)) { |
|
190 | + 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)) { |
|
191 | 191 | setEventMessages($langs->trans("ErrorInEntryDeletion"), null, 'errors'); |
192 | 192 | $error++; |
193 | 193 | } else { |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | $provider.'_NAME', |
263 | 263 | $provider.'_ID', |
264 | 264 | $provider.'_SECRET', |
265 | - $provider.'_URLAUTHORIZE', // For custom oauth links |
|
265 | + $provider.'_URLAUTHORIZE', // For custom oauth links |
|
266 | 266 | $provider.'_SCOPE' // For custom oauth links |
267 | 267 | ); |
268 | 268 | } |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | // $list is defined into oauth.lib.php to the list of supporter OAuth providers. |
282 | 282 | foreach ($listinsetup as $key) { |
283 | 283 | $supported = 0; |
284 | - $keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME |
|
284 | + $keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME |
|
285 | 285 | $keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array); |
286 | 286 | $keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array); |
287 | 287 | if (preg_match('/^.*-/', $keyforsupportedoauth2array)) { |
@@ -1032,7 +1032,7 @@ discard block |
||
1032 | 1032 | $list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed; |
1033 | 1033 | $list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique; |
1034 | 1034 | $list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired; |
1035 | - $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1035 | + $list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? jsonOrUnserialize($tab->param) : ''); // This may be a string encoded with serialise() or json_encode() |
|
1036 | 1036 | $list[$tab->elementtype][$tab->name]['pos'] = $tab->pos; |
1037 | 1037 | $list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable; |
1038 | 1038 | $list[$tab->elementtype][$tab->name]['perms'] = $tab->perms; |
@@ -1671,7 +1671,7 @@ discard block |
||
1671 | 1671 | $num = $this->db->num_rows($result); |
1672 | 1672 | $min = min($num, ($limit <= 0 ? $num : $limit)); |
1673 | 1673 | for ($i = 0; $i < $min; $i++) { |
1674 | - $type =$this->db->fetch_object($result); |
|
1674 | + $type = $this->db->fetch_object($result); |
|
1675 | 1675 | $this->translateLabel($type, $lang, 'TicketTypeShort', array('ticket')); |
1676 | 1676 | $list[] = $type; |
1677 | 1677 | } |
@@ -1734,7 +1734,7 @@ discard block |
||
1734 | 1734 | $num = $this->db->num_rows($result); |
1735 | 1735 | $min = min($num, ($limit <= 0 ? $num : $limit)); |
1736 | 1736 | for ($i = 0; $i < $min; $i++) { |
1737 | - $type =$this->db->fetch_object($result); |
|
1737 | + $type = $this->db->fetch_object($result); |
|
1738 | 1738 | $list[] = $type; |
1739 | 1739 | } |
1740 | 1740 | } else { |
@@ -1961,13 +1961,13 @@ discard block |
||
1961 | 1961 | throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile); |
1962 | 1962 | } |
1963 | 1963 | } else { |
1964 | - $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. |
|
1964 | + $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. |
|
1965 | 1965 | |
1966 | 1966 | // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...) |
1967 | 1967 | if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') { |
1968 | 1968 | $xmlfile = $xmlarray['content']; |
1969 | 1969 | //print "xmlfilestart".$xmlfile."endxmlfile"; |
1970 | - $xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET); |
|
1970 | + $xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET); |
|
1971 | 1971 | } else { |
1972 | 1972 | $errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg']; |
1973 | 1973 | throw new RestException(500, $errormsg); |
@@ -446,7 +446,7 @@ |
||
446 | 446 | print '<td class="liste_titre right" width="5"> </td>'; |
447 | 447 | print "</tr>\n"; |
448 | 448 | |
449 | - $object->fetch($object->id, '', true); // true to force load of all users, member of the group |
|
449 | + $object->fetch($object->id, '', true); // true to force load of all users, member of the group |
|
450 | 450 | |
451 | 451 | if (!empty($object->members)) { |
452 | 452 | foreach ($object->members as $useringroup) { |
@@ -623,15 +623,15 @@ |
||
623 | 623 | */ |
624 | 624 | |
625 | 625 | /** |
626 | - * Close a shipment (Classify it as "Delivered") |
|
627 | - * |
|
628 | - * @param int $id Expedition ID |
|
629 | - * @param int $notrigger Disabled triggers |
|
630 | - * |
|
631 | - * @url POST {id}/close |
|
632 | - * |
|
633 | - * @return object |
|
634 | - */ |
|
626 | + * Close a shipment (Classify it as "Delivered") |
|
627 | + * |
|
628 | + * @param int $id Expedition ID |
|
629 | + * @param int $notrigger Disabled triggers |
|
630 | + * |
|
631 | + * @url POST {id}/close |
|
632 | + * |
|
633 | + * @return object |
|
634 | + */ |
|
635 | 635 | public function close($id, $notrigger = 0) |
636 | 636 | { |
637 | 637 | if (!DolibarrApiAccess::$user->rights->expedition->creer) { |
@@ -201,7 +201,7 @@ |
||
201 | 201 | $i++; |
202 | 202 | |
203 | 203 | if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS') { |
204 | - $keyforprovider = ''; // @BUG This must be set |
|
204 | + $keyforprovider = ''; // @BUG This must be set |
|
205 | 205 | |
206 | 206 | // Token |
207 | 207 | print '<tr class="oddeven">'; |
@@ -147,18 +147,18 @@ discard block |
||
147 | 147 | $provider.'_NAME', |
148 | 148 | $provider.'_ID', |
149 | 149 | $provider.'_SECRET', |
150 | - $provider.'_URLAUTHORIZE', // For custom oauth links |
|
150 | + $provider.'_URLAUTHORIZE', // For custom oauth links |
|
151 | 151 | $provider.'_SCOPE' // For custom oauth links |
152 | 152 | ); |
153 | 153 | } |
154 | 154 | } |
155 | 155 | |
156 | - $oauthstateanticsrf = bin2hex(random_bytes(128/8)); |
|
156 | + $oauthstateanticsrf = bin2hex(random_bytes(128 / 8)); |
|
157 | 157 | |
158 | 158 | // $list is defined into oauth.lib.php to the list of supporter OAuth providers. |
159 | 159 | foreach ($listinsetup as $key) { |
160 | 160 | $supported = 0; |
161 | - $keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME |
|
161 | + $keyforsupportedoauth2array = $key[0]; // May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME |
|
162 | 162 | $keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array); |
163 | 163 | $keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array); |
164 | 164 | if (preg_match('/^.*-/', $keyforsupportedoauth2array)) { |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | if (getDolGlobalString($key[4])) { |
179 | 179 | $shortscope = getDolGlobalString($key[4]); |
180 | 180 | } |
181 | - $state = $shortscope; // TODO USe a better state |
|
181 | + $state = $shortscope; // TODO USe a better state |
|
182 | 182 | |
183 | 183 | // Define $urltorenew, $urltodelete, $urltocheckperms |
184 | 184 | if ($keyforsupportedoauth2array == 'OAUTH_GITHUB_NAME') { |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $sql .= " AND k.fk_soc= ".((int) $user->socid); |
119 | 119 | } |
120 | 120 | |
121 | - $sql.= " AND k.status > 0"; |
|
121 | + $sql .= " AND k.status > 0"; |
|
122 | 122 | |
123 | 123 | $sql .= " ORDER BY k.tms DESC, k.rowid DESC "; |
124 | 124 | $sql .= $this->db->plimit($max, 0); |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $labellang = ($objp->lang ? $langs->trans('Language_'.$objp->lang) : ''); |
164 | 164 | $this->info_box_contents[$i][$r] = array( |
165 | 165 | 'td' => 'class="tdoverflowmax100"', |
166 | - 'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"') . $labellang, |
|
166 | + 'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"').$labellang, |
|
167 | 167 | 'asis' => 1, |
168 | 168 | ); |
169 | 169 | $r++; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $sql .= " AND k.fk_soc= ".((int) $user->socid); |
119 | 119 | } |
120 | 120 | |
121 | - $sql.= " AND k.status > 0"; |
|
121 | + $sql .= " AND k.status > 0"; |
|
122 | 122 | |
123 | 123 | $sql .= " ORDER BY k.date_creation DESC, k.rowid DESC "; |
124 | 124 | $sql .= $this->db->plimit($max, 0); |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $labellang = ($objp->lang ? $langs->trans('Language_'.$objp->lang) : ''); |
164 | 164 | $this->info_box_contents[$i][$r] = array( |
165 | 165 | 'td' => 'class="tdoverflowmax100"', |
166 | - 'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"') . $labellang, |
|
166 | + 'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"').$labellang, |
|
167 | 167 | 'asis' => 1, |
168 | 168 | ); |
169 | 169 | $r++; |