@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | $pdf->MultiCell(0, 3, ''); // Set interline to 3 |
350 | 350 | $pdf->SetTextColor(0, 0, 0); |
351 | 351 | |
352 | - $tab_top = 90; // position of top tab |
|
352 | + $tab_top = 90; // position of top tab |
|
353 | 353 | $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10); |
354 | 354 | |
355 | 355 | $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext; |
@@ -1227,7 +1227,7 @@ discard block |
||
1227 | 1227 | // Show recipient |
1228 | 1228 | $widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 100; |
1229 | 1229 | if ($this->page_largeur < 210) { |
1230 | - $widthrecbox = 84; // To work with US executive format |
|
1230 | + $widthrecbox = 84; // To work with US executive format |
|
1231 | 1231 | } |
1232 | 1232 | $posy = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42; |
1233 | 1233 | $posx = $this->page_largeur - $this->marge_droite - $widthrecbox; |
@@ -173,7 +173,7 @@ |
||
173 | 173 | $maxfilesizearray = getMaxFileSizeArray(); |
174 | 174 | $maxmin = $maxfilesizearray['maxmin']; |
175 | 175 | if ($maxmin > 0) { |
176 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
176 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
177 | 177 | } |
178 | 178 | $texte .= ' <input type="file" name="uploadfile">'; |
179 | 179 | $texte .= '<input type="hidden" value="STOCK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $content = preg_replace('/<a href="([^"]+)" target="([^"]+)">([^<]+)<\/a>/', '[\3](\1)', $content); |
40 | 40 | |
41 | 41 | // Replace HTML comments |
42 | - $content = preg_replace('/<!--.*-->/Ums', '', $content); // We remove HTML comment that are not MD comment because they will be escaped and output when setSafeMode is set to true. |
|
42 | + $content = preg_replace('/<!--.*-->/Ums', '', $content); // We remove HTML comment that are not MD comment because they will be escaped and output when setSafeMode is set to true. |
|
43 | 43 | |
44 | 44 | if (is_array($replaceimagepath)) { |
45 | 45 | foreach ($replaceimagepath as $key => $val) { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | if ($parser == 'parsedown') { |
52 | 52 | include_once DOL_DOCUMENT_ROOT . '/includes/parsedown/Parsedown.php'; |
53 | 53 | $parsedown = new Parsedown(); |
54 | - $parsedown->setSafeMode(true); // This will escape HTML link <a href=""> into html entities but markdown links are ok |
|
54 | + $parsedown->setSafeMode(true); // This will escape HTML link <a href=""> into html entities but markdown links are ok |
|
55 | 55 | |
56 | 56 | // Because HTML will be HTML entity encoded, we replace tag we want to keep |
57 | 57 | $content = preg_replace('/<span style="([^"]+)">/', '<!-- SPAN_STYLE_\1 -->', $content); |
@@ -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'; |