Changeset 426 for trunk/admin/modules/Elezioni

Timestamp:

Oct 4, 2024, 12:14:01 PM (6 weeks ago)

Author:

roby

Message:

• ADMIN

-- Inserito nuovo file ele_restorebackup.php
-- Modificata la funzione di verifica presenza aggiornamenti, evitato il rallentamento in accesso per il superutente e velocizzato il controllo da menu

• CLIENT

-- Corrette alcune visualizzazioni per il tema Futura2 per mobile

Location:

trunk/admin/modules/Elezioni

Files:

• aggiornamento.php (modified) (5 diffs)
• ele.php (modified) (3 diffs)
• ele_restorebackup.php (added)

trunk/admin/modules/Elezioni/aggiornamento.php

@@ -150 +150 @@
                 echo "<form name=\"conferma\" action=\"admin.php\"><input type=\"hidden\" name=\"errmex\" value=\"1\"><input type=\"hidden\" name=\"op\" value=\"aggiorna\">";
                 echo "<input type=\"hidden\" name=\"id_cons_gen\" value=\"$id_cons_gen\"><input type=\"hidden\" name=\"procedi\" value=\"1\">";
-                echo "<br><table align=\"center\"><tr><td><h3>Procedo con verifica e aggiornamento del solo db (all'ultima versione scaricata)?</h3></td><td><input type=\"submit\" name=\"vai\" value=\""._OK."\"></td></tr></table></form>";          
+                echo "<br><table align=\"center\"><tr><td><h3>Procedo con verifica e aggiornamento del solo db (all'ultima versione scaricata)?<br><i>E' consigliato procedere solo dopo aver prodotto una copia di backup</i></h3></td><td><input type=\"submit\" name=\"vai\" value=\""._OK."\"></td></tr></table></form>";           
         }else{
                 aggiornadb();
@@ -160 +160 @@
 if(phpversion()<5.6) $host="http://80.211.143.127";
 else $host="https://trac.eleonline.it";
-
-$headers=get_headers("$host/ele3/changeset/");
-
-$testurl=strlen($headers[0])>0?true:false;
-if($testurl){   
-        $file = file("$host/ele3/changeset/");
-        $cntFile = count($file);
-        $fine=0;
-        $currentLine=0;
-        foreach ($file as $line_num => $line) {
-                if(strpos($line,'<title>') ) {$fine=1; continue;}
-                if ($fine){
-                        $newrev=(int) filter_var($line, FILTER_SANITIZE_NUMBER_INT);
-                        $_SESSION['remoterev']=$newrev;
-                        break;
-                }
-        }
-        unset($file);
+######################
+$rev=0;
+if ($stream = fopen('http://mail.eleonline.it/version/risposta.php', 'r')) {
+        $rev= stream_get_contents($stream, 4);
+        fclose($stream);
+                                
+        $newrev=(int) filter_var($rev, FILTER_SANITIZE_NUMBER_INT);
+        $_SESSION['remoterev']=$newrev;         
 }else{
         $errmex=2;
@@ -183 +173 @@
 }
 #$newrev=$_SESSION['remoterev'];
-$myrev=$_SESSION['localrev'];
+#$myrev=$_SESSION['localrev'];
+include('versione.php');
+$myrev=intval(substr($versione,-4,4));
+$_SESSION['localrev']=$myrev;
+
 if (isset($_SESSION['forzadb'])) $myrev=378;
 if($newrev<=$myrev) {
@@ -213 +207 @@
         {
          echo '<p class="title"><a href="'. $item->link .'">' . $item->title . "</a></p>";
-        #$str=preg_replace("--", "<br>--", $item->description );
         $str=preg_replace('/\s\--/','<br>--',$item->description);
-        #$str=preg_replace("[^A-Za-z0-9\-]", "<br>", $item->description );
-        # $str=preg_replace('/\s\`echo "\040"`/','<br>--',$item->description);
-        # $str=htmlentities($item->description);
-         echo "<p class='desc'>" . $str . "</p>";
+        echo "<p class='desc'>" . $str . "</p>";
         } 
         echo "</div>";
@@ -228 +218 @@
         echo "<input type=\"hidden\" name=\"id_cons_gen\" value=\"$id_cons_gen\"><input type=\"hidden\" name=\"procedi\" value=\"1\">";
         echo "<br><table align=\"center\"><tr><td><h3>Procedo con l'aggiornamento?</h3></td><td><input type=\"submit\" name=\"vai\" value=\""._OK."\"></td></tr></table></form>";
-/*      echo "<br><textarea name=\"log\" rows=\"15\" cols=\"150\">";
-        foreach ($file as $line_num => $line) echo "$line";
-
-        echo "</textarea>";
-        ############Ã  */
         $filename = "$host/ele3/changeset?format=zip&new=$newrev&new_path=%2F&old=$myrev&old_path=%2F";
 

trunk/admin/modules/Elezioni/ele.php

@@ -66 +66 @@
 function ele() {
 
-        global $espandi, $aid, $bgcolor1, $bgcolor2,$bgcolor5, $prefix, $dbi, $offset, $min,$descr_cons, $id_cons_gen,$tipo_cons,$genere,$op,$id_comune,$perms,$id_cons,$votog,$votol,$votoc,$votocirc,$tema,$fascia,$limite,$BACKUP;
+        global $espandi, $aid, $bgcolor1, $bgcolor2,$bgcolor5, $prefix, $dbi, $offset, $min,$descr_cons, $id_cons_gen,$tipo_cons,$genere,$op,$id_comune,$perms,$id_cons,$votog,$votol,$votoc,$votocirc,$tema,$fascia,$limite,$BACKUP,$versione;
 
         include ("header.php");
@@ -177 +177 @@
                                 echo "<hr>";
                         }
-                        $newrev=$_SESSION['remoterev'];
+                        if(isset($_SESSION['remoterev'])) {
+                                $newrev=$_SESSION['remoterev'];
+                        } else {
+                                $rev=0;
+                                if ($stream = fopen('http://mail.eleonline.it/version/risposta.php', 'r')) {
+                                        $rev= stream_get_contents($stream, 4);
+                                        fclose($stream);
+                                }
+                                $newrev=(int) filter_var($rev, FILTER_SANITIZE_NUMBER_INT);
+                                $_SESSION['remoterev']=$newrev;         
+                                $myrev=intval(substr($versione,-4,4));
+                                $_SESSION['localrev']=$myrev;
+
+
+                        }       
                         $myrev=$_SESSION['localrev'];
                         if($newrev==$myrev or $newrev==0) echo "<a href=\"admin.php?op=aggiorna&amp;id_cons_gen=$id_cons_gen\">$bullet"._AGGIORNA."</a><br>";
@@ -314 +328 @@
         }
 
-
 ?>