small change

public/admin-standards.php

@@ -26,6 +26,7 @@ if (isset($formnameedit)) {
   $UpdateQuery->bindColumn("iddpicategory", "i", "" . ((isset($_POST["categorydpi"])) ? $_POST["categorydpi"] : "")  . "", "WA_DEFAULT");
   $UpdateQuery->bindColumn("virusset", "s", "" . ((isset($_POST["virusprotection"])) ? $_POST["virusprotection"] : "")  . "", "WA_DEFAULT");
   $UpdateQuery->bindColumn("chemicalsset", "s", "" . ((isset($_POST["chemicalagent"])) ? $_POST["chemicalagent"] : "")  . "", "WA_DEFAULT");
+  $UpdateQuery->bindColumn("active", "s", "" . ((isset($_POST["active"])) ? $_POST["active"] : "")  . "", "WA_DEFAULT");
   $UpdateQuery->addFilter("idstandards", "=", "i", "" . ($idstandards)  . "");
   $UpdateQuery->execute();
   $UpdateGoTo = "";
@@ -152,6 +153,7 @@ $standardlist->execute();
 
                       <th>Virus</th>
                       <th>Chemical</th>
+                      <th>Active</th>
 
                       <th><?php echo $action; ?></th>
                     </tr>
@@ -183,7 +185,7 @@ $standardlist->execute();
                             </div>
                           <?php } ?>
                         </td>
-
+                        <td><?php echo ($standardlist->getColumnVal("active")); ?></td>
                         <td>
                           <a href="edit-standard.php?idstandards=<?php echo ($standardlist->getColumnVal("idstandards")); ?>" class="mr-2"><i class="fas fa-edit text-info font-16"></i></a>
                           <a href="edit-protcategory.php?idstandards=<?php echo ($standardlist->getColumnVal("idstandards")); ?>">PC</a>

public/declaration.php

@@ -243,11 +243,15 @@ $chemicalagentlist->execute();
                             <div class="progress-bar" role="progressbar" style="width: 95%;" aria-valuenow="95" aria-valuemin="0" aria-valuemax="100">95%</div>
                         </div>
                         <!-- send to client to sign -->
-                        <?php if ((Auth::user()->hasRole('Admin')) || (Auth::user()->hasRole('CustomerService')) || (Auth::user()->hasRole('Superuser'))) : ?>
+
                         <div class="card">
                             <div class="card-body">
+                                <?php if ((Auth::user()->hasRole('Admin')) || (Auth::user()->hasRole('CustomerService')) || (Auth::user()->hasRole('Superuser'))) : ?>
                                     <h4 class="mt-0 header-title">Invia a Cliente per Firma</h4>
-
+                                <?php endif; ?>
+                                <?php if ((Auth::user()->hasRole('User'))) : ?>
+                                    <h4 class="mt-0 header-title"><?php echo $respsign; ?></h4>
+                                <?php endif; ?>
                                 <form action="previewtrf.php" method="post" name="myForm2" id="myForm2" class="form-parsley">
 
 
@@ -287,7 +291,7 @@ $chemicalagentlist->execute();
 
 
 
-                        <?php endif; ?>
+
 
                         <!-- card for optional TRF -->
                         <?php if ((Auth::user()->hasRole('Admin')) || (Auth::user()->hasRole('User')) || (Auth::user()->hasRole('Superuser'))) : ?>

public/edit-standard.php

@@ -1,4 +1,3 @@
-
 <?php
 include('include/headscript.php'); ?>
 
@@ -183,11 +182,15 @@ function formSubmit() {
                     <label class="col-sm-2 col-form-label text-right">Tipologia Articolo</label>
                     <div class="col-sm-10">
                       <select class="form-control" name="idarticletype" id="idarticletype">
-                                                      <option value="" <?php if (!(strcmp("", ($articletypesel->getColumnVal("idarticletype"))))) {echo "selected=\"selected\"";} ?>>Seleziona</option>
+                        <option value="" <?php if (!(strcmp("", ($articletypesel->getColumnVal("idarticletype"))))) {
+                                            echo "selected=\"selected\"";
+                                          } ?>>Seleziona</option>
                         <?php
                         while (!$articletypelist->atEnd()) { //dyn select
                         ?>
-                                                      <option value="<?php echo($articletypelist->getColumnVal("idarticletype")); ?>"<?php if (!(strcmp($articletypelist->getColumnVal("idarticletype"), ($articletypesel->getColumnVal("idarticletype"))))) {echo "selected=\"selected\"";} ?>><?php echo($articletypelist->getColumnVal("name_articletype")); ?></option>
+                          <option value="<?php echo ($articletypelist->getColumnVal("idarticletype")); ?>" <?php if (!(strcmp($articletypelist->getColumnVal("idarticletype"), ($articletypesel->getColumnVal("idarticletype"))))) {
+                                                                                                            echo "selected=\"selected\"";
+                                                                                                          } ?>><?php echo ($articletypelist->getColumnVal("name_articletype")); ?></option>
                         <?php
                           $articletypelist->moveNext();
                         } //dyn select
@@ -201,11 +204,15 @@ $articletypelist->moveFirst();
                     <label class="col-sm-2 col-form-label text-right">Caratteristiche Articolo</label>
                     <div class="col-sm-10">
                       <select class="form-control" id="articlecharact" name="articlecharact">
-                                                      <option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("idarticlecharacteristic"))))) {echo "selected=\"selected\"";} ?>>Seleziona</option>
+                        <option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("idarticlecharacteristic"))))) {
+                                            echo "selected=\"selected\"";
+                                          } ?>>Seleziona</option>
                         <?php
                         while (!$articlecharacteristiclist->atEnd()) { //dyn select
                         ?>
-                                                      <option value="<?php echo($articlecharacteristiclist->getColumnVal("idarticlecharacteristic")); ?>"<?php if (!(strcmp($articlecharacteristiclist->getColumnVal("idarticlecharacteristic"), ($standarddetail->getColumnVal("idarticlecharacteristic"))))) {echo "selected=\"selected\"";} ?>><?php echo($articlecharacteristiclist->getColumnVal("name_articlecharacteristic")); ?></option>
+                          <option value="<?php echo ($articlecharacteristiclist->getColumnVal("idarticlecharacteristic")); ?>" <?php if (!(strcmp($articlecharacteristiclist->getColumnVal("idarticlecharacteristic"), ($standarddetail->getColumnVal("idarticlecharacteristic"))))) {
+                                                                                                                                echo "selected=\"selected\"";
+                                                                                                                              } ?>><?php echo ($articlecharacteristiclist->getColumnVal("name_articlecharacteristic")); ?></option>
                         <?php
                           $articlecharacteristiclist->moveNext();
                         } //dyn select
@@ -219,11 +226,15 @@ $articlecharacteristiclist->moveFirst();
                     <label class="col-sm-2 col-form-label text-right">Categoria DPI</label>
                     <div class="col-sm-10">
                       <select class="form-control" id="categorydpi" name="categorydpi">
-                                                      <option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("iddpicategory"))))) {echo "selected=\"selected\"";} ?>>Seleziona</option>
+                        <option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("iddpicategory"))))) {
+                                            echo "selected=\"selected\"";
+                                          } ?>>Seleziona</option>
                         <?php
                         while (!$categorydpilist->atEnd()) { //dyn select
                         ?>
-                                                      <option value="<?php echo($categorydpilist->getColumnVal("iddpicategory")); ?>"<?php if (!(strcmp($categorydpilist->getColumnVal("iddpicategory"), ($standarddetail->getColumnVal("iddpicategory"))))) {echo "selected=\"selected\"";} ?>><?php echo($categorydpilist->getColumnVal("value_dpicategory")); ?></option>
+                          <option value="<?php echo ($categorydpilist->getColumnVal("iddpicategory")); ?>" <?php if (!(strcmp($categorydpilist->getColumnVal("iddpicategory"), ($standarddetail->getColumnVal("iddpicategory"))))) {
+                                                                                                            echo "selected=\"selected\"";
+                                                                                                          } ?>><?php echo ($categorydpilist->getColumnVal("value_dpicategory")); ?></option>
                         <?php
                           $categorydpilist->moveNext();
                         } //dyn select
@@ -233,13 +244,35 @@ $categorydpilist->moveFirst();
                     </div>
                   </div>
 
+                  <div class="form-group row">
+                    <label class="col-sm-2 col-form-label text-right">Active</label>
+                    <div class="col-sm-10">
+                      <select class="form-control" id="active" name="active">
+                        <option value="" <?php if (!(strcmp("", ($standarddetail->getColumnVal("active"))))) {
+                                            echo "selected=\"selected\"";
+                                          } ?>>Seleziona</option>
+                        <option value="Y" <?php if (!(strcmp("Y", ($standarddetail->getColumnVal("active"))))) {
+                                            echo "selected=\"selected\"";
+                                          } ?>>Y</option>
+                        <option value="N" <?php if (!(strcmp("N", ($standarddetail->getColumnVal("active"))))) {
+                                            echo "selected=\"selected\"";
+                                          } ?>>N</option>
+                      </select>
+                    </div>
+                  </div>
+
+
                   <div class="custom-control custom-checkbox">
-                                  <input <?php if (!(strcmp(($standarddetail->getColumnVal("virusset")),"Y"))) {echo "checked=\"checked\"";} ?> type="checkbox" class="custom-control-input" id="virusprotection" name="virusprotection" value="Y" data-parsley-multiple="groups" data-parsley-mincheck="2">
+                    <input <?php if (!(strcmp(($standarddetail->getColumnVal("virusset")), "Y"))) {
+                              echo "checked=\"checked\"";
+                            } ?> type="checkbox" class="custom-control-input" id="virusprotection" name="virusprotection" value="Y" data-parsley-multiple="groups" data-parsley-mincheck="2">
                     <label class="custom-control-label" for="virusprotection">Protezione Virus</label>
                   </div>
                   <br>
                   <div class="custom-control custom-checkbox">
-                <input <?php if (!(strcmp(($standarddetail->getColumnVal("chemicalsset")),"Y"))) {echo "checked=\"checked\"";} ?> type="checkbox" class="custom-control-input" id="chemicalagent" name="chemicalagent" value="Y" data-parsley-multiple="groups" data-parsley-mincheck="2">
+                    <input <?php if (!(strcmp(($standarddetail->getColumnVal("chemicalsset")), "Y"))) {
+                              echo "checked=\"checked\"";
+                            } ?> type="checkbox" class="custom-control-input" id="chemicalagent" name="chemicalagent" value="Y" data-parsley-multiple="groups" data-parsley-mincheck="2">
                     <label class="custom-control-label" for="chemicalagent">Agenti Chimici</label>
                   </div>
                   <br>

public/include/topbar.php

@@ -68,7 +68,7 @@
           <a class="dropdown-item" href="profile"><i class="ti-user text-muted mr-2"></i> <?php echo $profile; ?></a>
           <a class="dropdown-item" href="companyprofile.php"><i class="ti-wallet text-muted mr-2"></i> <?php echo $mycompany; ?></a>
           <a class="dropdown-item" href="signaturetok.php"><i class="ti-wallet text-muted mr-2"></i> <?php echo $signaturetokentitle; ?></a>
-          <a class="dropdown-item" href="newusercolleague2.php"><i class="ti-wallet text-muted mr-2"></i> Aggiungi Utente</a>
+          <a class="dropdown-item" href="newusercolleague2.php"><i class="ti-wallet text-muted mr-2"></i> <?php echo $adduserundersamecompany; ?></a>
           <a class="dropdown-item" href="#"><i class="ti-settings text-muted mr-2"></i> <?php echo $settings; ?></a>
           <div class="dropdown-divider mb-0"></div>
           <a class="dropdown-item" href="logout"><i class="ti-power-off text-muted mr-2"></i> <?php echo $logoutst; ?></a>

public/languages/en/general.php

@@ -346,3 +346,5 @@ $uploadCompanyLogoTitle = "Upload Company Logo";
 $selectImageToUploadTitle = "Select the image to upload (only JPG, JPEG, PNG):";
 $uploadButtonTitle = "Upload";
 $companyLogoAltTitle = "Company Logo";
+$respsign = "Send to Sign to another colleagues of the same company";
+$adduserundersamecompany = "Add User";

public/languages/it/general.php

@@ -350,3 +350,5 @@ $uploadCompanyLogoTitle = "Carica Logo Aziendale";
 $selectImageToUploadTitle = "Seleziona l'immagine da caricare (solo JPG, JPEG, PNG):";
 $uploadButtonTitle = "Carica";
 $companyLogoAltTitle = "Logo Aziendale";
+$respsign = "Invia a collega della stessa azienda per Firma";
+$adduserundersamecompany = "Aggiungi utente";

public/pdfcreation/headercertificatetable.php

@@ -30,7 +30,10 @@ $pdf->Cell(40, 6, $addresspdf, 1, 0, 'L');
 
 
 $contactsaddress = html_entity_decode($contactsinfoData['address']);
-$contactsaddress = iconv('UTF-8', 'windows-1252', $contactsaddress);
+$contactsaddress = mb_convert_encoding($contactsaddress, 'ISO-8859-1', 'UTF-8'); // Conversione diretta
+$contactsaddress = iconv('ISO-8859-1', 'windows-1252//TRANSLIT', $contactsaddress);
+
+
 $pdf->Cell(150, 6, $contactsaddress, 1, 0, 'L', TRUE);
 $pdf->Ln();
 $pdf->Cell(40, 6, $citytitleb, 1, 0, 'L');

public/pdfcreation/invoicecontacttable.php

@@ -19,7 +19,8 @@ $pdf->SetFillColor(232, 242, 255);
 $pdf->Cell(150, 6, $companyname, 1, 0, 'L', TRUE);
 $pdf->Ln();
 $pdf->Cell(40, 6, $addresspdf, 1, 0, 'L');
-$pdf->Cell(150, 6, $contactsinfoData['address'], 1, 0, 'L', TRUE);
+$pdf->Cell(150, 6, iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $contactsinfoData['address']), 1, 0, 'L', TRUE);
+
 $pdf->Ln();
 $pdf->Cell(40, 6, $citytitleb, 1, 0, 'L');
 $pdf->Cell(55, 6, $contactsinfoData['city'], 1, 0, 'L', TRUE);

public/pdfcreation/signdatatable.php

@@ -4,9 +4,15 @@ if (Auth::user()->hasRole('User')) :
     $nameuser = $_SESSION["nameuser"];
     //$pdf->Cell(120,6,'Intendo sottoporre questo modello a sorveglianza (presso CIMAC)',1,0,'C');
     //$pdf->Cell(70,6,$trfData['surveillanceselectoption'],1,0,'C',TRUE);
+    if (!mb_check_encoding($statement, 'UTF-8')) {
+        $statement = utf8_encode($statement); // Forza la codifica in UTF-8
+    }
+
     $statement = html_entity_decode($statement);
-    $statement = iconv('UTF-8', 'windows-1252', $statement);
+    $statement = mb_convert_encoding($statement, 'windows-1252', 'UTF-8');
+
     //$statement = iconv('UTF-8', 'iso-8859-1', $statement);
+
     $addstatement = html_entity_decode($addstatement);
     $addstatement = iconv('UTF-8', 'windows-1252', $addstatement);
     //$addstatement = iconv('UTF-8', 'iso-8859-1', $addstatement);

public/phpinfo.php

@@ -0,0 +1,2 @@
+<?php
+phpinfo();

public/sendtrf.php

@@ -259,6 +259,7 @@ if ($tokenid != $tokensignatureon) {
                         require 'phpmailer/src/PHPMailer.php';
                         require 'phpmailer/src/SMTP.php';
                         //mail to client
+
                         $mail = new PHPMailer(true);
                         try {
                             $mail->isSMTP();                                      // Set mailer to use SMTP
@@ -283,14 +284,17 @@ if ($tokenid != $tokensignatureon) {
                             $mail->Subject = $appformn . 'r' . $revnumb;
                             $mail->Body    = $htmlContent;
                             $mail->AltBody = 'This is the body in plain text for non-HTML mail clients';
+                            error_log("Attempting to send email to: $emailuser with idtrf: $idtrf");
                             if ($adminconfirm == 'N') {
                                 $mail->send();
+                                error_log("Email sent successfully to: $emailuser with idtrf: $idtrf");
                             }
                             // echo 'Message has been sent';
                         } catch (Exception $e) {
                             echo "Message could not be sent CL. Mailer Error: {$mail->ErrorInfo}";
                         }
                         // mail to CS
+
                         $mail = new PHPMailer(true);
                         try {
                             $mail->isSMTP();                                      // Set mailer to use SMTP

public/trfdetails.php

@@ -552,21 +552,7 @@ include('include/trfqueryscript.php');  ?>
                                                 if (!empty($rows)) {
 
                                                     foreach ($rows as $row) {
-                                                        // Controllo se l'idarticletype è uguale a 4
+
-                                                        if ($row['idarticletype'] == 4) {
-                                                            // Mostra l'opzione solo se l'utente è admin o superuser
-                                                            if (Auth::user()->hasRole('Admin') || Auth::user()->hasRole('Superuser')) {
-                                                ?>
-                                                                <option value="<?php echo $row['idarticletype']; ?>" <?php if (!(strcmp($row['idarticletype'], ($trfnumberfinal->getColumnVal("idarticletype"))))) {
-                                                                                                                            echo "selected=\"selected\"";
-                                                                                                                        } ?>>
-                                                                    <?php
-                                                                    echo ($_SESSION['langselect'] == 'it') ? $row['name_articletype'] : $row['name_articletypeeng'];
-                                                                    ?>
-                                                                </option>
-                                                            <?php
-                                                            }
-                                                        } else {
                                                         // Mostra normalmente gli altri articletype
                                                 ?>
                                                         <option value="<?php echo $row['idarticletype']; ?>" <?php if (!(strcmp($row['idarticletype'], ($trfnumberfinal->getColumnVal("idarticletype"))))) {
@@ -577,7 +563,7 @@ include('include/trfqueryscript.php');  ?>
                                                             ?>
                                                         </option>
                                                 <?php
-                                                        }
+
                                                     }
                                                 }
                                                 ?>