diff --git a/htdocs/.gitignore b/htdocs/.gitignore index d0fe62f2e73..82c0ea2accb 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -21,7 +21,6 @@ /cabinetmed* /webmail* /conf/conf.php -/subtotal* /abricot* /nomenclature* /of/ diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 18993a2e57d..b8104639c7f 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -2788,8 +2788,9 @@ class ActionComm extends CommonObject // Content $sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray); - //Topic - $sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->transnoentities('EventReminder')); + // Topic + $sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : $langs->transnoentitiesnoconv('EventReminder'); + $sendTopic = make_substitutions($sendTopic, $substitutionarray); // Recipient $recipient = new User($this->db); diff --git a/htdocs/core/modules/security/captcha/modCaptchaStandard.class.php b/htdocs/core/modules/security/captcha/modCaptchaStandard.class.php index f64714385f7..cee48489969 100644 --- a/htdocs/core/modules/security/captcha/modCaptchaStandard.class.php +++ b/htdocs/core/modules/security/captcha/modCaptchaStandard.class.php @@ -82,6 +82,7 @@ class modCaptchaStandard extends ModeleCaptcha global $db, $conf, $langs, $user; $generator = new modGeneratePassStandard($db, $conf, $langs, $user); + $generator->length = '5'; $example = $generator->getExample(); if (function_exists("imagecreate") && function_exists("imagepng")) { @@ -89,7 +90,7 @@ class modCaptchaStandard extends ModeleCaptcha if (!$img) { return "Problem with GD creation"; } - //$background_color = imagecolorallocate($img, 250, 250, 250); + $background_color = imagecolorallocate($img, 250, 250, 250); // do not comment this line $ecriture_color = imagecolorallocate($img, 0, 0, 0); imagestring($img, 4, 15, 8, $example, $ecriture_color); diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 3f253fc5084..807979721e6 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -1626,7 +1626,7 @@ $totalarray['val'] = array(); $totalarray['val']['f.total_ht'] = 0; $totalarray['val']['f.total_vat'] = 0; $totalarray['val']['f.total_localtax1'] = 0; -$totalarray['val']['f.total_localtax1'] = 0; +$totalarray['val']['f.total_localtax2'] = 0; $totalarray['val']['f.total_ttc'] = 0; $totalarray['val']['totalam'] = 0; $totalarray['val']['rtp'] = 0; @@ -2049,9 +2049,6 @@ while ($i < $imaxinloop) { $totalarray['nbfield']++; $totalarray['pos'][$totalarray['nbfield']] = 'totalam'; } - if (empty($totalarray['val']['totalam'])) { - $totalarray['val']['totalam'] = 0; // avoid PHP Warning: Undefined array key "totalam" on line 1891 - } $totalarray['val']['totalam'] += $totalpay; }