Evarisk#3864 [Audit] fix: code imprecision

evarisk-micka · Jun 20, 2024 · 857f956 · 857f956
1 parent 5344da1
commit 857f956
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...arr/digiriskdolibarrdocuments/auditreportdocument/doc_auditreportdocument_odt.modules.php b/...arr/digiriskdolibarrdocuments/auditreportdocument/doc_auditreportdocument_odt.modules.php
@@ -108,7 +108,7 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
         $riskSign        = new RiskSign($this->db);
         $evaluator       = new Evaluator($this->db);
         $accident        = new Accident($this->db);
-        $user            = new User($this->db);
+        $userTmp         = new User($this->db);
 
         $arraySoc                             = $this->get_substitutionarray_mysoc($mysoc, $outputLangs);
         $tmpArray['mycompany_photo_fullsize'] = $arraySoc['mycompany_logo'];
@@ -134,18 +134,18 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
             $moreParam['specificFilter']       = $specificFilter;
         }
 
-        if (!empty($moreParam['recipient']) && is_array($moreParam['recipient'])) {
+        if (is_array($moreParam['recipient']) && !empty($moreParam['recipient'])) {
             $userRecipient = $moreParam['recipient'];
 
             $tmpArray['destinataireDUER'] = '';
             $tmpArray['telephone']        = '';
             $tmpArray['portable']         = '';
             foreach ($userRecipient as $recipientId) {
-                $user->fetch($recipientId);
+                $userTmp->fetch($recipientId);
 
-                $tmpArray['destinataireDUER'] .= dol_strtoupper($user->lastname) . ' ' . ucfirst($user->firstname) . chr(0x0A);
-                $tmpArray['telephone']        .= (dol_strlen($user->office_phone) > 0 ? $user->office_phone : '-') . chr(0x0A);
-                $tmpArray['portable']         .= (dol_strlen($user->user_mobile) > 0 ? $user->user_mobile : '-') . chr(0x0A);
+                $tmpArray['destinataireDUER'] .= dol_strtoupper($userTmp->lastname) . ' ' . ucfirst($userTmp->firstname) . chr(0x0A);
+                $tmpArray['telephone']        .= (dol_strlen($userTmp->office_phone) > 0 ? $userTmp->office_phone : '-') . chr(0x0A);
+                $tmpArray['portable']         .= (dol_strlen($userTmp->user_mobile) > 0 ? $userTmp->user_mobile : '-') . chr(0x0A);
             }
         }
 

diff --git a/view/digiriskstandard/digiriskstandard_auditreportdocument.php b/view/digiriskstandard/digiriskstandard_auditreportdocument.php
@@ -139,8 +139,8 @@
 print '</td></tr>';
 
 // Destinataire
-$userRecipient = json_decode($conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT);
-print '<tr class="oddeven"><td>' . $langs->trans("Recipient") . '</td>';
+$userRecipient = json_decode(getDolGlobalString('DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_RECIPIENT'));
+print '<tr class="oddeven"><td>' . $langs->trans('Recipient') . '</td>';
 print '<td>' . $form->select_dolusers($userRecipient, 'recipient', 0, null, 0, '', '', 0, 0, 0, '', 0, '', 'minwidth400', 0, 0, true);
 print '</td></tr>';
 print '</table>';