diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index a1871dd23c8..aa9bb7328e9 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2396,7 +2396,7 @@ RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions WarningDisabled=Warning disabled LimitsAndMitigation=Access limits and mitigation -RecommendMitigationOnURL=It is recommanded to activate mitigation on critical URL. This is list of fail2ban rules you can use for the main important URLs. +RecommendMitigationOnURL=It is recommended to activate mitigation on critical URL. This is list of fail2ban rules you can use for the main important URLs. DesktopsOnly=Desktops only DesktopsAndSmartphones=Desktops et smartphones AllowOnlineSign=Allow online signing @@ -2437,4 +2437,4 @@ ExtraFieldsSupplierInvoicesLinesRec=Complementary attributes (template invoice l ParametersForTestEnvironment=Parameters for test environment TryToKeepOnly=Try to keep only %s RecommendedForProduction=Recommended for Production -RecommendedForDebug=Recommended for Debug \ No newline at end of file +RecommendedForDebug=Recommended for Debug diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 1f167bab403..3a19d530054 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -668,7 +668,7 @@ if ($id > 0) { $total_interest = 0; $total_capital = 0; - print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table + print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table print ''; print ''; print ''; diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index 4830cca6d2e..099db8e418c 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -475,7 +475,7 @@ class Loan extends CommonObject * Return label of loan status (unpaid, paid) * * @param int $mode 0=label, 1=short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label - * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount paid if you have it, 1 otherwise) + * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise) * @return string Label */ public function getLibStatut($mode = 0, $alreadypaid = -1) @@ -489,7 +489,7 @@ class Loan extends CommonObject * * @param int $status Id status * @param int $mode 0=Label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label, 5=Short label + Picto - * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount paid if you have it, 1 otherwise) + * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise) * @return string Label */ public function LibStatut($status, $mode = 0, $alreadypaid = -1) diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php index 7ade6bb92af..d7487780413 100644 --- a/htdocs/loan/list.php +++ b/htdocs/loan/list.php @@ -323,7 +323,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); -print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table print '
'.$langs->trans("RefPayment").'
'."\n"; // Fields title search diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index 2310dfb89a6..da6159fb493 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -39,7 +39,7 @@ $confirm = GETPOST('confirm'); if ($user->socid) { $socid = $user->socid; } -// TODO ajouter regle pour restreindre acces paiement +// TODO ajouter regle pour restreindre access paiement //$result = restrictedArea($user, 'facture', $id,''); $payment = new PaymentLoan($db); diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index 1285b09c9cc..26287927517 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -70,7 +70,7 @@ if ($res > 0) { } } -// Set current line with last unpaid line (only if shedule is used) +// Set current line with last unpaid line (only if schedule is used) if (!empty($line_id)) { $line = new LoanSchedule($db); $res = $line->fetch($line_id); diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php index fda8d22c792..e4a9424c21c 100644 --- a/htdocs/loan/schedule.php +++ b/htdocs/loan/schedule.php @@ -198,7 +198,7 @@ $(document).ready(function() { var idcap=echeance-1; idcap = '#hi_capital'+idcap; var capital=price2numjs($(idcap).val()); - console.log("Change montly amount echeance="+echeance+" idcap="+idcap+" capital="+capital); + console.log("Change monthly amount echeance="+echeance+" idcap="+idcap+" capital="+capital); $.ajax({ method: "GET", dataType: 'json', diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php index 8fe6da4726f..b7ef7d99eb9 100644 --- a/htdocs/mailmanspip/class/mailmanspip.class.php +++ b/htdocs/mailmanspip/class/mailmanspip.class.php @@ -238,7 +238,7 @@ class MailmanSpip // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Fonction qui dit si cet utilisateur est un redacteur existant dans spip + * Indicate if the user is an existing editor in spip * * @param object $object Object with data (->login) * @return int 1=exists, 0=does not exists, -1=error @@ -257,11 +257,11 @@ class MailmanSpip if ($result) { if ($mydb->num_rows($result)) { - // nous avons au moins une reponse + // At least one result for the login query $mydb->close(); return 1; } else { - // nous n'avons pas de reponse => n'existe pas + // No result for the login query $mydb->close(); return 0; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 7fc2ca7777d..c483e371fcd 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -80,7 +80,7 @@ function realCharForNumericEntities($matches) /** * Security: WAF layer for SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF). * Warning: Such a protection can't be enough. It is not reliable as it will always be possible to bypass this. Good protection can - * only be guaranted by escaping data during output. + * only be guaranteed by escaping data during output. * * @param string $val Brute value found into $_GET, $_POST or PHP_SELF * @param string $type 0=POST, 1=GET, 2=PHP_SELF, 3=GET without sql reserved keywords (the less tolerant test) @@ -176,6 +176,7 @@ function testSqlAndScriptInject($val, $type) $inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeked|seeking|show|stalled|start|submit|suspend)[a-z]*\s*=/i', $val); $inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)[a-z]*\s*=/i', $val); // More not into the previous list + $inj += preg_match('/on(repeat|begin|finish|beforeinput)[a-z]*\s*=/i', $val); // We refuse html into html because some hacks try to obfuscate evil strings by inserting HTML into HTML. Example: error=alert(1) to bypass test on onerror @@ -746,7 +747,7 @@ if (!defined('NOLOGIN')) { // Check code if (!$ok) { - dol_syslog('Bad value for code, connexion refused', LOG_NOTICE); + dol_syslog('Bad value for code, connection refused', LOG_NOTICE); // Load translation files required by page $langs->loadLangs(array('main', 'errors')); @@ -854,7 +855,7 @@ if (!defined('NOLOGIN')) { } if (!$login) { - dol_syslog('Bad password, connexion refused (see a previous notice message for more info)', LOG_NOTICE); + dol_syslog('Bad password, connection refused (see a previous notice message for more info)', LOG_NOTICE); // Load translation files required by page $langs->loadLangs(array('main', 'errors')); @@ -888,12 +889,12 @@ if (!defined('NOLOGIN')) { } // End test login / passwords - if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success. + if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connection is a success. // No data to test login, so we show the login page. dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit", LOG_NOTICE); if (defined('NOREDIRECTBYMAINTOLOGIN')) { // When used with NOREDIRECTBYMAINTOLOGIN set, the http header must already be set when including the main. - // See example with selectsearchbox.php. This case is reserverd for the selectesearchbox.php so we can + // See example with selectsearchbox.php. This case is reserved for the selectesearchbox.php so we can // report a message to ask to login when search ajax component is used after a timeout. //top_httphead(); return 'ERROR_NOT_LOGGED'; @@ -908,7 +909,7 @@ if (!defined('NOLOGIN')) { $resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // value for $login was retrieved previously when checking password. if ($resultFetchUser <= 0 || $user->isNotIntoValidityDateRange()) { - dol_syslog('User not found or not valid, connexion refused'); + dol_syslog('User not found or not valid, connection refused'); session_destroy(); session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie session_name($sessionname); @@ -994,7 +995,7 @@ if (!defined('NOLOGIN')) { dol_syslog("The user login is disabled"); } else { // User validity dates are no more valid - dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now()); + dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], current date is ".dol_now()); } session_destroy(); session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie @@ -1109,7 +1110,7 @@ if (!defined('NOLOGIN')) { } // Is it a new session that has started ? - // If we are here, this means authentication was successfull. + // If we are here, this means authentication was successful. if (!isset($_SESSION["dol_login"])) { // New session for this login has started. $error = 0; @@ -1165,7 +1166,7 @@ if (!defined('NOLOGIN')) { } // End call triggers - // Hooks on successfull login + // Hooks on successful login $action = ''; $hookmanager->initHooks(array('login')); $parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo); @@ -1296,7 +1297,7 @@ if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') { $conf->dol_no_mouse_hover = 1; } -// If on smartphone or optmized for small screen +// If on smartphone or optimized for small screen if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone') || (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400) || (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400 @@ -1440,7 +1441,7 @@ if (!function_exists("llxHeader")) { /** * Show HTML header HTML + BODY + Top menu + left menu + DIV * - * @param string $head Optionnal head lines + * @param string $head Optional head lines * @param string $title HTML title * @param string $help_url Url links to help page * Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage|DE:GermanPage @@ -1651,10 +1652,10 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0) } /** - * Ouput html header of a page. It calls also top_httphead() + * Output html header of a page. It calls also top_httphead() * This code is also duplicated into security2.lib.php::dol_loginfunction * - * @param string $head Optionnal head lines + * @param string $head Optional head lines * @param string $title HTML title * @param int $disablejs Disable js output * @param int $disablehead Disable head output @@ -1763,7 +1764,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr print "\n"; if (GETPOST('version', 'int')) { - $ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js + $ext = 'version='.GETPOST('version', 'int'); // useful to force no cache on css/js } // Refresh value of MAIN_IHM_PARAMS_REV before forging the parameter line. if (GETPOST('dol_resetcache')) { @@ -2556,12 +2557,12 @@ function top_menu_user($hideloginname = 0, $urllogout = '') }); jQuery("#topmenulogincompanyinfo-btn").on("click", function() { - console.log("Clik on #topmenulogincompanyinfo-btn"); + console.log("Click on #topmenulogincompanyinfo-btn"); jQuery("#topmenulogincompanyinfo").slideToggle(); }); jQuery("#topmenuloginmoreinfo-btn").on("click", function() { - console.log("Clik on #topmenuloginmoreinfo-btn"); + console.log("Click on #topmenuloginmoreinfo-btn"); jQuery("#topmenuloginmoreinfo").slideToggle(); });'; } @@ -2983,7 +2984,7 @@ function top_menu_search()