diff options
| -rw-r--r-- | install/upgrade_1.6.2.php | 2 | ||||
| -rw-r--r-- | install/upgrade_1.7.0.php | 118 | ||||
| -rw-r--r-- | upgrade.php | 42 |
3 files changed, 125 insertions, 37 deletions
diff --git a/install/upgrade_1.6.2.php b/install/upgrade_1.6.2.php index 9f4a72d5d..3117762ee 100644 --- a/install/upgrade_1.6.2.php +++ b/install/upgrade_1.6.2.php @@ -343,5 +343,5 @@ WHERE pwg_query($query); // now we upgrade from 1.7.0 -// include_once(PHPWG_ROOT_PATH.'install/upgrade_1.7.0.php'); +include_once(PHPWG_ROOT_PATH.'install/upgrade_1.7.0.php'); ?> diff --git a/install/upgrade_1.7.0.php b/install/upgrade_1.7.0.php new file mode 100644 index 000000000..85533dcfa --- /dev/null +++ b/install/upgrade_1.7.0.php @@ -0,0 +1,118 @@ +<?php +// +-----------------------------------------------------------------------+ +// | Piwigo - a PHP based picture gallery | +// +-----------------------------------------------------------------------+ +// | Copyright(C) 2008 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!'); + } +} + +define('PREFIX_TABLE', $prefixeTable); +define('UPGRADES_PATH', PHPWG_ROOT_PATH.'install/db'); + +list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();')); +define('CURRENT_DATE', $dbnow); + +// +-----------------------------------------------------------------------+ +// | 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 > 60) + { + break; + } + + array_push( + $inserts, + array( + 'id' => $upgrade_id, + 'applied' => CURRENT_DATE, + 'description' => '[migration from 1.7.0 to '.RELEASE.'] not applied', + ) + ); +} +mass_inserts( + '`'.UPGRADE_TABLE.'`', + array_keys($inserts[0]), + $inserts + ); + +// +-----------------------------------------------------------------------+ +// | Perform upgrades | +// +-----------------------------------------------------------------------+ + +echo '<pre>'; + +for ($upgrade_id = 61; ; $upgrade_id++) +{ + if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php')) + { + break; + } + + 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 + $query = ' +INSERT INTO `'.PREFIX_TABLE.'upgrade` + (id, applied, description) + VALUES + (\''.$upgrade_id.'\', NOW(), \'[migration from 1.7.0 to '.RELEASE.'] '.$upgrade_description.'\') +;'; + pwg_query($query); +} + +echo '</pre>'; + +// now we upgrade from 2.0.0 +// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.0.0.php'); +?> diff --git a/upgrade.php b/upgrade.php index 0c324d10a..67640635f 100644 --- a/upgrade.php +++ b/upgrade.php @@ -196,6 +196,10 @@ if (!isset($_GET['version'])) $current_release = '1.6.2'; } } + else if (!in_array('md5sum', $columns_of[PREFIX_TABLE.'images'])) + { + $current_release = '1.7.0'; + } else { die('No upgrade required, the database structure is up to date'); @@ -217,7 +221,7 @@ if (!isset($_GET['version'])) else { - if (in_array(PREFIX_TABLE.'history_summary', $tables)) + if (in_array('md5sum', $columns_of[PREFIX_TABLE.'images'])) { die('No database upgrade required, do not refresh the page'); } @@ -230,29 +234,6 @@ else $conf['die_on_sql_error'] = false; include($upgrade_file); - // Available upgrades must be ignored after a fresh installation. To - // make PWG avoid upgrading, we must tell it upgrades have already been - // made. - list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();')); - define('CURRENT_DATE', $dbnow); - $datas = array(); - foreach (get_available_upgrade_ids() as $upgrade_id) - { - array_push( - $datas, - array( - 'id' => $upgrade_id, - 'applied' => CURRENT_DATE, - 'description' => 'upgrade included in migration', - ) - ); - } - mass_inserts( - UPGRADE_TABLE, - array_keys($datas[0]), - $datas - ); - // Create empty local files to avoid log errors create_empty_local_files(); @@ -298,18 +279,7 @@ if you encounter any problem.' $template->assign('infos', $page['infos']); - $query = ' -UPDATE '.USER_CACHE_TABLE.' - SET need_update = \'true\' -;'; - - pwg_query($query); - $query = ' -REPLACE INTO '.PLUGINS_TABLE.' - (id, state) - VALUES (\'c13y_upgrade\', \'active\') -;'; - pwg_query($query); + invalidate_user_cache(); } else { |