From 684347691b5743a853c28a62b765688793207609 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 22 Dec 2020 16:35:54 +0100
Subject: [PATCH] fixes #1276 upgrade script from 2.10 to 11

---
 install/upgrade_2.10.0.php | 111 +++++++++++++++++++++++++++++++++++++
 install/upgrade_2.9.0.php  |   2 +-
 upgrade.php                |   8 ++-
 3 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 install/upgrade_2.10.0.php

diff --git a/install/upgrade_2.10.0.php b/install/upgrade_2.10.0.php
new file mode 100644
index 000000000..1fe1d0b84
--- /dev/null
+++ b/install/upgrade_2.10.0.php
@@ -0,0 +1,111 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | This file is part of Piwigo.                                          |
+// |                                                                       |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die ('This page cannot be loaded directly, load upgrade.php');
+}
+else
+{
+  if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE)
+  {
+    die ('Hacking attempt!');
+  }
+}
+
+// +-----------------------------------------------------------------------+
+// |             Fill upgrade table without applying upgrade               |
+// +-----------------------------------------------------------------------+
+
+// retrieve already applied upgrades
+$query = '
+SELECT id
+  FROM '.PREFIX_TABLE.'upgrade
+;';
+$applied = query2array($query, null, 'id');
+
+// retrieve existing upgrades
+$existing = get_available_upgrade_ids();
+
+// which upgrades need to be applied?
+$to_apply = array_diff($existing, $applied);
+$inserts = array();
+foreach ($to_apply as $upgrade_id)
+{
+  if ($upgrade_id >= 157) // TODO change on each release (first task to run)
+  {
+    break;
+  }
+  
+  array_push(
+    $inserts,
+    array(
+      'id' => $upgrade_id,
+      'applied' => CURRENT_DATE,
+      'description' => '[migration from 2.10.0 to '.PHPWG_VERSION.'] not applied', // TODO change on each release
+      )
+    );
+}
+
+if (!empty($inserts))
+{
+  mass_inserts(
+    '`'.UPGRADE_TABLE.'`',
+    array_keys($inserts[0]),
+    $inserts
+    );
+}
+
+// +-----------------------------------------------------------------------+
+// |                          Perform upgrades                             |
+// +-----------------------------------------------------------------------+
+
+ob_start();
+echo '<pre>';
+
+for ($upgrade_id = 157; $upgrade_id <= 159; $upgrade_id++) // TODO change on each release
+{
+  if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
+  {
+    continue;
+  }
+
+  // maybe the upgrade task has already been applied in a previous and
+  // incomplete upgrade
+  if (in_array($upgrade_id, $applied))
+  {
+    continue;
+  }
+  
+  unset($upgrade_description);
+
+  echo "\n\n";
+  echo '=== upgrade '.$upgrade_id."\n";
+
+  // include & execute upgrade script. Each upgrade script must contain
+  // $upgrade_description variable which describe briefly what the upgrade
+  // script does.
+  $up_start = get_moment();
+  include(UPGRADES_PATH.'/'.$upgrade_id.'-database.php');
+
+  // notify upgrade (TODO change on each release)
+  $query = '
+INSERT INTO `'.PREFIX_TABLE.'upgrade`
+  (id, applied, description)
+  VALUES
+  (\''.$upgrade_id.'\', NOW(), \'[migration from 2.10.0 to '.PHPWG_VERSION.', '.get_elapsed_time($up_start, get_moment()).'] '.$upgrade_description.'\')
+;';
+  pwg_query($query);
+}
+
+echo '</pre>';
+ob_end_clean();
+
+// now we upgrade from 11.0.0
+// include_once(PHPWG_ROOT_PATH.'install/upgrade_11.0.0.php');
+?>
diff --git a/install/upgrade_2.9.0.php b/install/upgrade_2.9.0.php
index f37905788..dadab91df 100644
--- a/install/upgrade_2.9.0.php
+++ b/install/upgrade_2.9.0.php
@@ -107,5 +107,5 @@ echo '</pre>';
 ob_end_clean();
 
 // now we upgrade from 2.10.0
-// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.10.0.php');
+include_once(PHPWG_ROOT_PATH.'install/upgrade_2.10.0.php');
 ?>
diff --git a/upgrade.php b/upgrade.php
index ecf84cdf5..5da742ca8 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -336,6 +336,10 @@ else if (!in_array('history_id_to', $columns_of[PREFIX_TABLE.'history_summary'])
 {
   $current_release = '2.8.0';
 }
+else if (!in_array(PREFIX_TABLE.'activity', $tables))
+{
+  $current_release = '2.9.0';
+}
 else
 {
   // retrieve already applied upgrades
@@ -345,9 +349,9 @@ SELECT id
 ;';
   $applied_upgrades = array_from_query($query, 'id');
 
-  if (!in_array(156, $applied_upgrades))
+  if (!in_array(159, $applied_upgrades))
   {
-    $current_release = '2.9.0';
+    $current_release = '2.10.0';
   }
   else
   {