@@ -283,7 +283,7 @@ |
||
| 283 | 283 | // Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth) |
| 284 | 284 | $supportedoauth2array = array( |
| 285 | 285 | 'OAUTH_GOOGLE_NAME' => array( |
| 286 | - 'callbackfile' => 'google', // used to generate the filename: google_oauthcallback.php |
|
| 286 | + 'callbackfile' => 'google', // used to generate the filename: google_oauthcallback.php |
|
| 287 | 287 | 'picto' => 'google', |
| 288 | 288 | 'urlforapp' => 'OAUTH_GOOGLE_DESC', |
| 289 | 289 | 'name' => 'Google', |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | // Load translation files required by the page |
| 201 | 201 | $langs->loadLangs(array('payment', 'stripe')); |
| 202 | 202 | |
| 203 | - $servicename = ''; // Link is a generic link for all payments services (paypal, stripe, ...) |
|
| 203 | + $servicename = ''; // Link is a generic link for all payments services (paypal, stripe, ...) |
|
| 204 | 204 | |
| 205 | 205 | $out = img_picto('', 'globe') . ' <span class="opacitymedium">' . $langs->trans("ToOfferALinkForOnlinePayment", $servicename) . '</span><br>'; |
| 206 | 206 | $url = getOnlinePaymentUrl(0, $type, $ref, $amount); |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | $urlwithroot = $urlwithouturlroot . DOL_URL_ROOT; // This is to use external domain name found into config file |
| 251 | 251 | //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current |
| 252 | 252 | |
| 253 | - $urltouse = DOL_MAIN_URL_ROOT; // Should be "https://www.mydomain.com/mydolibarr" for example |
|
| 253 | + $urltouse = DOL_MAIN_URL_ROOT; // Should be "https://www.mydomain.com/mydolibarr" for example |
|
| 254 | 254 | //dol_syslog("getOnlinePaymentUrl DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT); |
| 255 | 255 | |
| 256 | 256 | if ($localorexternal) { |
@@ -76,10 +76,10 @@ |
||
| 76 | 76 | //global $dolibarr_main_url_root; |
| 77 | 77 | //$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); |
| 78 | 78 | //$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file |
| 79 | - $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current |
|
| 79 | + $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current |
|
| 80 | 80 | |
| 81 | 81 | //$shortscope = 'userinfo_email,userinfo_profile'; |
| 82 | - $shortscope = 'openid,email,profile'; // For openid connect |
|
| 82 | + $shortscope = 'openid,email,profile'; // For openid connect |
|
| 83 | 83 | |
| 84 | 84 | $oauthstateanticsrf = bin2hex(random_bytes(128 / 8)); |
| 85 | 85 | $_SESSION['oauthstateanticsrf'] = $shortscope . '-' . $oauthstateanticsrf; |
@@ -81,19 +81,19 @@ discard block |
||
| 81 | 81 | $listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir)))); |
| 82 | 82 | |
| 83 | 83 | foreach ($listofdir as $key => $tmpdir) { |
| 84 | - $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
| 84 | + $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
| 85 | 85 | if (!$tmpdir) { |
| 86 | 86 | unset($listofdir[$key]); |
| 87 | 87 | continue; |
| 88 | 88 | } |
| 89 | - $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
| 89 | + $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
| 90 | 90 | if (!is_dir($tmpdir)) { |
| 91 | 91 | if (empty($nomessageinsetmoduleoptions)) { |
| 92 | 92 | setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings'); |
| 93 | 93 | } |
| 94 | 94 | } else { |
| 95 | 95 | $upload_dir = $tmpdir; |
| 96 | - break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
| 96 | + break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | |
@@ -133,19 +133,19 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | foreach ($listofdir as $key => $tmpdir) { |
| 135 | 135 | $tmpdir = trim($tmpdir); |
| 136 | - $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
| 136 | + $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
| 137 | 137 | if (!$tmpdir) { |
| 138 | 138 | unset($listofdir[$key]); |
| 139 | 139 | continue; |
| 140 | 140 | } |
| 141 | - $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
| 141 | + $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
| 142 | 142 | if (!is_dir($tmpdir)) { |
| 143 | 143 | if (empty($nomessageinsetmoduleoptions)) { |
| 144 | 144 | setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings'); |
| 145 | 145 | } |
| 146 | 146 | } else { |
| 147 | 147 | $upload_dir = $tmpdir; |
| 148 | - break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
| 148 | + break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | |
| 26 | 26 | ob_start(); |
| 27 | 27 | |
| 28 | -require 'config.inc.php'; // This include the main.inc.php |
|
| 28 | +require 'config.inc.php'; // This include the main.inc.php |
|
| 29 | 29 | require 'connector.lib.php'; |
| 30 | 30 | |
| 31 | 31 | if (!$Config['Enabled']) { |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | if (empty($endyear)) { |
| 128 | 128 | $endyear = $nowarray['year']; |
| 129 | 129 | } |
| 130 | - $startyear = $endyear - getDolGlobalInt('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH', 3) + 1; // Default is 3 years |
|
| 130 | + $startyear = $endyear - getDolGlobalInt('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH', 3) + 1; // Default is 3 years |
|
| 131 | 131 | |
| 132 | 132 | $mode = 'customer'; |
| 133 | 133 | $WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320'; |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | $userid = 0; // No filter on user creation |
| 142 | 142 | |
| 143 | 143 | $WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320'; |
| 144 | - $HEIGHT = '150'; // Height require to have 5+1 entries into legend visible. |
|
| 144 | + $HEIGHT = '150'; // Height require to have 5+1 entries into legend visible. |
|
| 145 | 145 | |
| 146 | 146 | if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) { |
| 147 | 147 | // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...) |
@@ -322,7 +322,7 @@ |
||
| 322 | 322 | |
| 323 | 323 | // Add font-awesome (if $val2['level'] == 0, we are on level2 |
| 324 | 324 | if ($val2['level'] == 0 && !empty($val2['prefix'])) { |
| 325 | - print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright" |
|
| 325 | + print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright" |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | print $val2['titre']; |
@@ -176,7 +176,7 @@ |
||
| 176 | 176 | // $this->menu->liste is top menu |
| 177 | 177 | //var_dump($this->menu->liste);exit; |
| 178 | 178 | $lastlevel = array(); |
| 179 | - $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
| 179 | + $showmenu = true; // Is current menu shown - define here to keep static code checker happy |
|
| 180 | 180 | print '<!-- Generate menu list from menu handler ' . $this->name . ' -->' . "\n"; |
| 181 | 181 | foreach ($this->menu->liste as $key => $val) { // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' |
| 182 | 182 | print '<ul class="ulmenu" data-inset="true">'; |