@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $title = $langs->trans("Search"); |
71 | 71 | |
72 | 72 | // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests |
73 | -$head = '<!-- Quick access -->'."\n"; // This is used by DoliDroid to know page is a search page |
|
73 | +$head = '<!-- Quick access -->'."\n"; // This is used by DoliDroid to know page is a search page |
|
74 | 74 | $arrayofjs = array(); |
75 | 75 | $arrayofcss = array(); |
76 | 76 | top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | |
111 | 111 | $accesskey = ''; |
112 | 112 | if (empty($accesskeyalreadyassigned[$val['label'][0]])) { |
113 | - $accesskey = $val['label'][0]; // First char of string |
|
113 | + $accesskey = $val['label'][0]; // First char of string |
|
114 | 114 | $accesskeyalreadyassigned[$accesskey] = $accesskey; |
115 | 115 | } |
116 | 116 |
@@ -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)) { |
@@ -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) { |
@@ -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">'; |
@@ -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++; |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | print $langs->trans("Text"); |
289 | 289 | print '</td><td>'; |
290 | 290 | require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
291 | - $extendededitor = 0; // We force no WYSIWYG editor |
|
291 | + $extendededitor = 0; // We force no WYSIWYG editor |
|
292 | 292 | $doleditor = new DolEditor('USER_PUBLIC_MORE', getDolUserString('USER_PUBLIC_MORE', '', $object), '', 160, 'dolibarr_notes', '', false, false, $extendededitor, ROWS_5, '90%'); |
293 | 293 | $doleditor->Create(); |
294 | 294 | print "</td></tr>\n"; |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | |
303 | 303 | print '<br>'; |
304 | 304 | |
305 | - print '</div>'; // End hide/show |
|
305 | + print '</div>'; // End hide/show |
|
306 | 306 | |
307 | 307 | print '<br>'; |
308 | 308 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | |
37 | 37 | $langs->load("bookmarks"); |
38 | 38 | |
39 | - $authorized_var=array('limit','optioncss','contextpage'); |
|
39 | + $authorized_var = array('limit', 'optioncss', 'contextpage'); |
|
40 | 40 | $url = $_SERVER["PHP_SELF"]; |
41 | 41 | $url_param = array(); |
42 | 42 | if (!empty($_SERVER["QUERY_STRING"])) { |