Changeset 15680

Timestamp:

Jun 14, 2012, 11:46:47 PM (12 years ago)

Author:

plg

Message:

feature 2632: add a test on upgrade.php, if a remote site is detected downgrade to 2.3.4

Location:

trunk

Files:

• admin/include/updates.class.php (modified) (3 diffs)
• upgrade.php (modified) (1 diff)

trunk/admin/include/updates.class.php

@@ -360 +360 @@
   }
 
-  function upgrade_to($upgrade_to, &$step)
+  function upgrade_to($upgrade_to, &$step, $check_current_version=true)
   {
     global $page, $conf, $template;
 
-    if (!version_compare($_POST['upgrade_to'], PHPWG_VERSION, '>'))
+    if ($check_current_version and !version_compare($upgrade_to, PHPWG_VERSION, '>'))
     {
       redirect(get_root_url().'admin.php?page=plugin-'.basename(dirname(__FILE__)));
@@ -372 +372 @@
     {
       preg_match('/(\d+\.\d+)\.(\d+)/', PHPWG_VERSION, $matches);
-      $code =  $matches[1].'.x_to_'.$_POST['upgrade_to'];
+      $code =  $matches[1].'.x_to_'.$upgrade_to;
       $dl_code = str_replace(array('.', '_'), '', $code);
       $remove_path = $code;
@@ -379 +379 @@
     else
     {
-      $code = $_POST['upgrade_to'];
+      $code = $upgrade_to;
       $dl_code = $code;
       $remove_path = version_compare($code, '2.0.8', '>=') ? 'piwigo' : 'piwigo-'.$code;

trunk/upgrade.php

@@ -229 +229 @@
   )
 );
+
+// +-----------------------------------------------------------------------+
+// | Remote sites are not compatible with Piwigo 2.4+                      |
+// +-----------------------------------------------------------------------+
+
+$has_remote_site = false;
+
+$query = 'SELECT galleries_url FROM '.SITES_TABLE.';';
+$result = pwg_query($query);
+while ($row = pwg_db_fetch_assoc($result))
+{
+  if (url_is_remote($row['galleries_url']))
+  {
+    $has_remote_site = true;
+  }
+}
+
+if ($has_remote_site)
+{
+  include_once(PHPWG_ROOT_PATH.'admin/include/updates.class.php');
+  include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
+
+  $page['errors'] = array();
+  $step = 3;
+  updates::upgrade_to('2.3.4', $step, false);
+
+  if (!empty($page['errors']))
+  {
+    echo '<ul>';
+    foreach ($page['errors'] as $error)
+    {
+      echo '<li>'.$error.'</li>';
+    }
+    echo '</ul>';
+  }
+
+  exit();
+}
 
 // +-----------------------------------------------------------------------+