Changeset 21100 for extensions/Prune_History/include/functions.inc.php

Timestamp:

Mar 2, 2013, 6:28:58 PM (11 years ago)

Author:

Eric

Message:

Next version will be 1.1.0 :

• Compliance with Piwigo 2.5
• Code refactory : Change config variables to assoc array and $_POST vars control before writing conf in database - Thx to flop25 for his advices ;-)
• Bug fixed : Unable to restore an history backup file

File:

• extensions/Prune_History/include/functions.inc.php (modified) (4 diffs)

extensions/Prune_History/include/functions.inc.php

@@ -99 +99 @@
   $result = pwg_query($query);
   $conf_PH = pwg_db_fetch_assoc($result);
-    
+
   $Newconf_PH = unserialize($conf_PH['value']);
-  
-  $Newconf_PH[0] = $version;
+
+  $Newconf_PH['PHVersion'] = $version;
 
   $update_conf = serialize($Newconf_PH);
@@ -228 +228 @@
 
   // Definition of the range to keep
-  if (isset($conf_PH[1]) and $conf_PH[1] == 'true' and isset($conf_PH[2]) and $conf_PH[2] <> '0' and isset($conf_PH[3]) and $conf_PH[3] <> '0')
-  {
-    if ($conf_PH[3] == '1') // Ranged for days
-    {
-      $limit = mktime(0, 0, 0, date("m") , date("d")-$conf_PH[2], date("Y"));
+  if (isset($conf_PH['AUTOPRUNE']) and $conf_PH['AUTOPRUNE'] == 'true' and isset($conf_PH['RANGEVALUE']) and $conf_PH['RANGEVALUE'] <> '0' and isset($conf_PH['RANGE']) and $conf_PH['RANGE'] <> '0')
+  {
+    if ($conf_PH['RANGE'] == '1') // Ranged for days
+    {
+      $limit = mktime(0, 0, 0, date("m") , date("d")-$conf_PH['RANGEVALUE'], date("Y"));
       $limit = date('Y-m-d', $limit);
     }
-    else if ($conf_PH[3] == '2') // Ranged for months
-    {
-      $limit = mktime(0, 0, 0, date("m")-$conf_PH[2] , date("d"), date("Y"));
+    else if ($conf_PH['RANGE'] == '2') // Ranged for months
+    {
+      $limit = mktime(0, 0, 0, date("m")-$conf_PH['RANGEVALUE'] , date("d"), date("Y"));
       $limit = date('Y-m-d', $limit);
     }
-    else if  ($conf_PH[3] == '3') // Ranged for years
-    {
-      $limit = mktime(0, 0, 0, date("m") , date("d"), date("Y")-$conf_PH[2]);
+    else if  ($conf_PH['RANGE'] == '3') // Ranged for years
+    {
+      $limit = mktime(0, 0, 0, date("m") , date("d"), date("Y")-$conf_PH['RANGEVALUE']);
       $limit = date('Y-m-d', $limit);
     }
@@ -307 +307 @@
       $insertions .= "DROP TABLE IF EXISTS ".$ListTables[$j].";\n\n";
 
-      $array = mysql_fetch_array($res);
+      $array = pwg_db_fetch_row($res);
       $array[1] .= ";\n\n";
       $insertions .= $array[1];
 
-      $req_table = pwg_query('SELECT * FROM '.$ListTables[$j]) or die(mysql_error());
-      $nb_fields = mysql_num_fields($req_table);
-      while ($line = mysql_fetch_array($req_table))
+      $req_table = pwg_query('DESCRIBE '.$ListTables[$j].';') or die(my_error());
+      $nb_fields = pwg_db_num_rows($req_table);
+      $req_table2 = pwg_query('SELECT * FROM '.$ListTables[$j]) or die(my_error());
+
+      while ($line = pwg_db_fetch_row($req_table2))
       {
         $insertions .= 'INSERT INTO '.$ListTables[$j].' VALUES (';
@@ -375 +377 @@
   // Restore sql backup file - DROP TABLE queries are executed
   // ---------------------------------------------------------
-  UAM_execute_sqlfile(
+  PH_execute_sqlfile(
     $Backup_File,
     DEFAULT_PREFIX_TABLE,