aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin/themes/default/template/upgrade.tpl1
-rw-r--r--install/upgrade_2.4.0.php2
-rw-r--r--install/upgrade_2.5.0.php125
-rw-r--r--upgrade.php11
4 files changed, 135 insertions, 4 deletions
diff --git a/admin/themes/default/template/upgrade.tpl b/admin/themes/default/template/upgrade.tpl
index 641f1b23e..f126d06a6 100644
--- a/admin/themes/default/template/upgrade.tpl
+++ b/admin/themes/default/template/upgrade.tpl
@@ -39,6 +39,7 @@ body {
#content {
min-height:0;
+ border:none;
}
#theHeader {
diff --git a/install/upgrade_2.4.0.php b/install/upgrade_2.4.0.php
index 20f5d9c29..96a56f410 100644
--- a/install/upgrade_2.4.0.php
+++ b/install/upgrade_2.4.0.php
@@ -121,5 +121,5 @@ echo '</pre>';
ob_end_clean();
// now we upgrade from 2.5.0
-// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.5.0.php');
+include_once(PHPWG_ROOT_PATH.'install/upgrade_2.5.0.php');
?>
diff --git a/install/upgrade_2.5.0.php b/install/upgrade_2.5.0.php
new file mode 100644
index 000000000..149f95269
--- /dev/null
+++ b/install/upgrade_2.5.0.php
@@ -0,0 +1,125 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+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 = array_from_query($query, '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 >= 135) // TODO change on each release
+ {
+ break;
+ }
+
+ array_push(
+ $inserts,
+ array(
+ 'id' => $upgrade_id,
+ 'applied' => CURRENT_DATE,
+ 'description' => '[migration from 2.5.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 = 135; $upgrade_id <= 139; $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.
+ 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.5.0 to '.PHPWG_VERSION.'] '.$upgrade_description.'\')
+;';
+ pwg_query($query);
+}
+
+echo '</pre>';
+ob_end_clean();
+
+// now we upgrade from 2.6.0
+// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.6.0.php');
+?>
diff --git a/upgrade.php b/upgrade.php
index 06014b3fc..36fbd7fbc 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -335,6 +335,10 @@ else if (!in_array('rotation', $columns_of[PREFIX_TABLE.'images']))
{
$current_release = '2.3.0';
}
+else if (!in_array('website_url', $columns_of[PREFIX_TABLE.'comments']))
+{
+ $current_release = '2.4.0';
+}
else
{
// retrieve already applied upgrades
@@ -344,15 +348,16 @@ SELECT id
;';
$applied_upgrades = array_from_query($query, 'id');
- if (!in_array(134, $applied_upgrades))
+ if (!in_array(139, $applied_upgrades))
{
- $current_release = '2.4.0';
+ $current_release = '2.5.0';
}
else
{
// confirm that the database is in the same version as source code files
conf_update_param('piwigo_db_version', get_branch_from_version(PHPWG_VERSION));
-
+
+ header('Content-Type: text/html; charset='.get_pwg_charset());
echo 'No upgrade required, the database structure is up to date';
echo '<br><a href="index.php">← back to gallery</a>';
exit();