From 73db66afa58cb14c6ced4163c10f4603a3399428 Mon Sep 17 00:00:00 2001 From: plegall Date: Wed, 28 Apr 2010 14:28:05 +0000 Subject: feature 1630: upgrade to Piwigo 2.1 :-) bug 1604: only activate core themes not all themes. git-svn-id: http://piwigo.org/svn/trunk@5982 68402e56-0260-453c-a942-63ccdbb3a9ee --- install/db/65-database.php | 2 +- install/db/86-database.php | 36 ++------------ install/upgrade_1.7.0.php | 9 +--- install/upgrade_2.0.0.php | 118 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 41 deletions(-) create mode 100644 install/upgrade_2.0.0.php (limited to 'install') diff --git a/install/db/65-database.php b/install/db/65-database.php index e934d14fc..ceb99756f 100644 --- a/install/db/65-database.php +++ b/install/db/65-database.php @@ -165,7 +165,7 @@ SELECT language FROM '.USER_INFOS_TABLE.' $all_tables = array(); $query = 'SHOW TABLES LIKE "'.$prefixeTable.'%"'; $result = pwg_query($query); - while ( $row=pwg_db_fetch_assoc($result) ) + while ( $row=pwg_db_fetch_row($result) ) { array_push($all_tables, $row[0]); } diff --git a/install/db/86-database.php b/install/db/86-database.php index 3a736e3e2..a13465f8e 100644 --- a/install/db/86-database.php +++ b/install/db/86-database.php @@ -26,40 +26,10 @@ if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); } -$upgrade_description = 'Automatically activate core themes and used themes.'; +$upgrade_description = 'Automatically activate core themes.'; -$themes_core = array('Sylvia', 'dark', 'clear'); - -$query = ' -SELECT - DISTINCT(theme) - FROM '.PREFIX_TABLE.'user_infos -;'; -$themes_used = array_from_query($query, 'theme'); - -$query = ' -SELECT - id - FROM '.PREFIX_TABLE.'themes -;'; -$themes_active = array_from_query($query, 'id'); - - -$themes_to_activate = array_diff( - array_unique(array_merge($themes_used, $themes_core)), - $themes_active - ); - -// echo '
'; print_r($themes_to_activate); echo '
'; exit(); - -foreach ($themes_to_activate as $theme) -{ - $query = ' -INSERT INTO '.PREFIX_TABLE.'themes - (id) VALUES(\''.$theme.'\' -;'; - pwg_query($query); -} +include_once(PHPWG_ROOT_PATH . 'admin/include/functions_install.inc.php'); +activate_core_themes(); echo "\n" diff --git a/install/upgrade_1.7.0.php b/install/upgrade_1.7.0.php index 6d5c2da6f..5a9398814 100644 --- a/install/upgrade_1.7.0.php +++ b/install/upgrade_1.7.0.php @@ -33,11 +33,6 @@ else } } -define('UPGRADES_PATH', PHPWG_ROOT_PATH.'install/db'); - -list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();')); -define('CURRENT_DATE', $dbnow); - // +-----------------------------------------------------------------------+ // | Fill upgrade table without applying upgrade | // +-----------------------------------------------------------------------+ @@ -88,7 +83,7 @@ if (!empty($inserts)) ob_start(); echo '
';
 
-for ($upgrade_id = 61; ; $upgrade_id++)
+for ($upgrade_id = 61; $upgrade_id <= 79; $upgrade_id++)
 {
   if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
   {
@@ -119,5 +114,5 @@ echo '
'; ob_end_clean(); // now we upgrade from 2.0.0 -// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.0.0.php'); +include_once(PHPWG_ROOT_PATH.'install/upgrade_2.0.0.php'); ?> diff --git a/install/upgrade_2.0.0.php b/install/upgrade_2.0.0.php new file mode 100644 index 000000000..f88c09c71 --- /dev/null +++ b/install/upgrade_2.0.0.php @@ -0,0 +1,118 @@ += 81) + { + break; + } + + array_push( + $inserts, + array( + 'id' => $upgrade_id, + 'applied' => CURRENT_DATE, + 'description' => '[migration from 2.0.0 to '.PHPWG_VERSION.'] not applied', + ) + ); +} + +if (!empty($inserts)) +{ + mass_inserts( + '`'.UPGRADE_TABLE.'`', + array_keys($inserts[0]), + $inserts + ); +} + +// +-----------------------------------------------------------------------+ +// | Perform upgrades | +// +-----------------------------------------------------------------------+ + +ob_start(); +echo '
';
+
+for ($upgrade_id = 81; $upgrade_id <= 90; $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 2.0.0 to '.PHPWG_VERSION.'] '.$upgrade_description.'\')
+;';
+  pwg_query($query);
+}
+
+echo '
'; +ob_end_clean(); + +// now we upgrade from 2.1.0 +// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.1.0.php'); +?> -- cgit v1.2.3