diff options
| -rw-r--r-- | install/upgrade_2.6.0.php | 2 | ||||
| -rw-r--r-- | install/upgrade_2.7.0.php | 126 | ||||
| -rw-r--r-- | upgrade.php | 8 |
3 files changed, 133 insertions, 3 deletions
diff --git a/install/upgrade_2.6.0.php b/install/upgrade_2.6.0.php index 7c6451e66..28ed3f151 100644 --- a/install/upgrade_2.6.0.php +++ b/install/upgrade_2.6.0.php @@ -122,5 +122,5 @@ echo '</pre>'; ob_end_clean(); // now we upgrade from 2.7.0 -// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.7.0.php'); +include_once(PHPWG_ROOT_PATH.'install/upgrade_2.7.0.php'); ?> diff --git a/install/upgrade_2.7.0.php b/install/upgrade_2.7.0.php new file mode 100644 index 000000000..128accdb8 --- /dev/null +++ b/install/upgrade_2.7.0.php @@ -0,0 +1,126 @@ +<?php +// +-----------------------------------------------------------------------+ +// | Piwigo - a PHP based photo gallery | +// +-----------------------------------------------------------------------+ +// | Copyright(C) 2008-2016 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 >= 145) // TODO change on each release + { + break; + } + + array_push( + $inserts, + array( + 'id' => $upgrade_id, + 'applied' => CURRENT_DATE, + 'description' => '[migration from 2.7.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 = 145; $upgrade_id <= 148; $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.7.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 2.8.0 +// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.8.0.php'); +?> diff --git a/upgrade.php b/upgrade.php index e67d8fa0f..6c56d383f 100644 --- a/upgrade.php +++ b/upgrade.php @@ -342,6 +342,10 @@ else if (!in_array('nb_available_tags', $columns_of[PREFIX_TABLE.'user_cache'])) { $current_release = '2.5.0'; } +else if (!in_array('activation_key_expire', $columns_of[PREFIX_TABLE.'user_infos'])) +{ + $current_release = '2.6.0'; +} else { // retrieve already applied upgrades @@ -351,9 +355,9 @@ SELECT id ;'; $applied_upgrades = array_from_query($query, 'id'); - if (!in_array(144, $applied_upgrades)) + if (!in_array(148, $applied_upgrades)) { - $current_release = '2.6.0'; + $current_release = '2.7.0'; } else { |