Changeset 3898 for extensions

Timestamp:

Sep 22, 2009, 4:26:37 PM (15 years ago)

Author:

patdenice

Message:

Avoid timeout errors during file download.

File:

• extensions/autoupdate/autoupdate.php (modified) (4 diffs)

extensions/autoupdate/autoupdate.php

@@ -13 +13 @@
         if (is_dir($pathfile))
         {
-          deltree($pathfile);
+          autoupdate_deltree($pathfile);
         }
         else
@@ -23 +23 @@
     closedir($fh);
     return @rmdir($path);
+  }
+}
+
+function check_version_for_autoupdate($version=PHPWG_VERSION)
+{
+  global $conf, $header_notes;
+
+  if (preg_match('/(\d+\.\d+)\.(\d+)/', $version, $matches) and @fetchRemote(PHPWG_URL.'/download/latest_version', $result))
+  {
+    $lines = @explode("\r\n", $result);
+    $new_version = trim($lines[1]);
+    $new_branch = preg_replace('/(\d+\.\d+)\.\d+/', '$1', $new_version);
+    $actual_branch = $matches[1];
+    $update_to =  $actual_branch . '.' . ($matches[2]+1);
+
+    if (version_compare($version, $new_version) < 0
+      and $actual_branch == $new_branch)
+    {
+      $path = $conf['local_data_dir'].'/autoupdate/';
+      $code = $version.'_to_'.$update_to;
+      $filename = $path.$version.'_to_'.$update_to.'.zip';
+      mkgetdir($path);
+
+      if (!file_exists($filename) or !filesize($filename))
+      {
+        $zip = @fopen($filename, 'w+');
+        @fetchRemote(PHPWG_URL.'/download/dlcounter.php?code='.str_replace(array('.', '_'), '', $code), $zip);
+        @fclose($zip);
+      }
+
+      if (file_exists($filename) and filesize($filename))
+      {
+        if (isset($_GET['autoupdate']) and preg_match('/\d+\.\d+\.\d+_to_'.preg_quote($version).'/', $_GET['autoupdate']))
+        {
+          redirect('admin.php?autoupdate='.$code);
+        }
+        else
+        {
+          array_push($header_notes,
+            '<p>'.l10n('A new version of Piwigo is available.').'<br>',
+            '<a href="admin.php?autoupdate='.$code.'" onClick="return confirm(\''.l10n('autoupdate_alert').'\');">'.l10n('Click here to upgrade automatically').'</a></p>'
+          );
+        }
+      }
+    }
   }
 }
@@ -58 +103 @@
         }
       }
+      if (preg_match('/\d+\.\d+\.\d+_to_(\d+\.\d+\.\d+)/', $_GET['autoupdate'], $matches))
+      {
+        check_version_for_autoupdate($matches[1]);
+      }
       autoupdate_deltree($conf['local_data_dir'].'/autoupdate');
       invalidate_user_cache(true);
@@ -74 +123 @@
   }
 }
-elseif (preg_match('/\d+\.\d+\.\d+/', PHPWG_VERSION) and fetchRemote(PHPWG_URL.'/download/latest_version', $result))
+else
 {
-  $lines = @explode("\r\n", $result);
-  $new_version = trim($lines[1]);
-  $new_branch = substr($new_version, 0, 3);
-  $actual_branch = substr(PHPWG_VERSION, 0, 3);
-  $actual_version = $actual_branch . '.x';
+  check_version_for_autoupdate();
+}
 
-  if (version_compare(PHPWG_VERSION, $new_version) < 0
-    and $actual_branch == $new_branch)
-  {
-    $path = $conf['local_data_dir'].'/autoupdate/';
-    $filename = $path.$actual_version.'_to_'.$new_version.'.zip';
-    mkgetdir($path);
-
-    if (!file_exists($filename) or !filesize($filename))
-    {
-      $zip = @fopen($filename, 'w+');
-      @fetchRemote(PHPWG_URL.'/download/dlcounter.php?code='.str_replace('.', '', $actual_version).'to'.str_replace('.', '', $new_version), $zip);
-      @fclose($zip);
-    }
-
-    if (file_exists($filename) and filesize($filename))
-    {
-      array_push($header_notes,
-        l10n('A new version of Piwigo is available.').'<br>',
-        '<a href="admin.php?autoupdate='.$actual_version.'_to_'.$new_version.'" onClick="return confirm(\''.l10n('autoupdate_alert').'\');">'.l10n('Click here to upgrade automatically').'</a>'
-      );
-    }
-  }
-}
 ?>