Changeset 487 for trunk

Timestamp:

Sep 10, 2025, 11:41:26 AM (3 months ago)

Author:

roby

Message:

• ADMIN

-- Correzione della funzione dei controlli di congruità
-- Correzione della funzione di gestione dei documenti per la trasparenza

Location:

trunk

Files:

• admin/modules/Elezioni/ele_candidato.php (modified) (2 diffs)
• admin/modules/Elezioni/ele_controlli.php (modified) (1 diff)
• admin/versione.php (modified) (1 diff)
• client/versione.php (modified) (1 diff)

trunk/admin/modules/Elezioni/ele_candidato.php

@@ -306 +306 @@
                 $nocar=array("'",'"'," ");
                 $tmpdocname="_".str_replace($nocar,"",$cognome2)."_".str_replace($nocar,"",$nome2).".pdf";
-                if(isset($_FILES['cv']['tmp_name']) and $_FILES['cv']['tmp_name'] or ( isset($pro['cv']) and $pro['cv'] and $cvcheck!='cvdel'))
+                if((isset($_FILES['cv']['tmp_name']) and $_FILES['cv']['tmp_name']) or ( isset($pro['cv']) and $pro['cv'] and $cvcheck!='cvdel')) {
                         $docnamecv=$id_cand.$tmpdocname;
-                else $docnamecv='';
-                if(isset($_FILES['cg']['tmp_name']) and $_FILES['cg']['tmp_name'] or ( isset($pro['cg']) and $pro['cg'] and $cgcheck!='cgdel'))
+                }else $docnamecv='';
+                if((isset($_FILES['cg']['tmp_name']) and $_FILES['cg']['tmp_name']) or ( isset($pro['cg']) and $pro['cg'] and $cgcheck!='cgdel'))
                         $docnamecg=$id_cand.$tmpdocname;
                 else $docnamecg='';
@@ -376 +376 @@
                                 $sth = $dbi->prepare("$sql");
                                 $sth->execute();
-                                $sql="select id_cand from ".$prefix."_ele_candidati where cognome='$cognome' and nome='$nome' and id_lista='$id_lista'";
-                                $sth = $dbi->prepare("$sql");
-                                $sth->execute();
-                                list($id_cand)=$sth->fetch(PDO::FETCH_NUM);
-                                $sql="update  ".$prefix."_ele_candidati set cv='".$id_cand.$tmpdocname."', cg='".$id_cand.$tmpdocname."' where id_cand='$id_cand' ";
-                                $sth = $dbi->prepare("$sql");
-                                $sth->execute();
-                                if(isset($_FILES['cv']['tmp_name']) and $_FILES['cv']['tmp_name'])
-                                        move_uploaded_file($_FILES['cv']['tmp_name'], $cvfolder.$id_cand.$tmpdocname);
-                                if(isset($_FILES['cg']['tmp_name']) and $_FILES['cg']['tmp_name'])
-                                        move_uploaded_file($_FILES['cg']['tmp_name'], $cgfolder.$id_cand.$tmpdocname);
+                                if((isset($_FILES['cv']['tmp_name']) and $_FILES['cv']['tmp_name']) or (isset($_FILES['cg']['tmp_name']) and $_FILES['cg']['tmp_name'])) {
+                                        $sql="select id_cand from ".$prefix."_ele_candidati where cognome='$cognome' and nome='$nome' and id_lista='$id_lista'";
+                                        $sth = $dbi->prepare("$sql");
+                                        $sth->execute();
+                                        list($id_cand)=$sth->fetch(PDO::FETCH_NUM);
+                                        if(isset($_FILES['cv']['tmp_name']) and $_FILES['cv']['tmp_name']){
+                                                $docnamecv=$id_cand.$tmpdocname;
+                                                move_uploaded_file($_FILES['cv']['tmp_name'], $cvfolder.$id_cand.$tmpdocname);
+                                        }
+                                        if(isset($_FILES['cg']['tmp_name']) and $_FILES['cg']['tmp_name']){
+                                                $docnamecg=$id_cand.$tmpdocname;
+                                                move_uploaded_file($_FILES['cg']['tmp_name'], $cgfolder.$id_cand.$tmpdocname);
+                                        }
+                                        $sql="update  ".$prefix."_ele_candidati set cv='".$docnamecv."', cg='".$docnamecg."' where id_cand='$id_cand' ";
+                                        $sth = $dbi->prepare("$sql");
+                                        $sth->execute();
+                                }
                                 $sql="insert into ".$prefix."_ele_log values ('$id_cons','$id_sez','$username','$data','$tempo','','ADD:id_lista:$id_lista,num_lista:$num_lista,cognome:$cognome,nome:$nome','".$prefix."_ele_candidati')";                             
                                 $sth = $dbi->prepare("$sql");

trunk/admin/modules/Elezioni/ele_controlli.php

@@ -284 +284 @@
         if(($votic)>($votil*$prefs) || $mvc>$votil) 
         {$err=1;} 
-if($err) die("QUI: if(($votic)>($votil*$prefs) || $mvc>$votil) --- $err");
         return $err;
 }

trunk/admin/versione.php

@@ -1 +1 @@
 <?php
 
-$versione = "3.0 rev 486";
+$versione = "3.0 rev 487";
 $version_number = $versione;
-$datarel = "07 Settembre 2025";
+$datarel = "10 Settembre 2025";
 $version = "Eleonline $version_number (<i>Data Release: $datarel</i>)";
 ?> 

trunk/client/versione.php

@@ -1 +1 @@
 <?php
-$versione = "3.0 rev 486";
+$versione = "3.0 rev 487";
 $version_number = $versione;
-$datarel = "07 Settembre 2025";
+$datarel = "10 Settembre 2025";
 $version = "Eleonline $version_number (<i>Data Release: $datarel</i>)";
 ?>