aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--install.php46
-rw-r--r--install/db/65-database.php2
-rw-r--r--install/db/86-database.php36
-rw-r--r--install/upgrade_1.7.0.php9
-rw-r--r--install/upgrade_2.0.0.php118
5 files changed, 135 insertions, 76 deletions
diff --git a/install.php b/install.php
index f56c32236..d35b1c6af 100644
--- a/install.php
+++ b/install.php
@@ -262,34 +262,8 @@ include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php');
if ( isset( $_POST['install'] ))
{
- if ($pwg_db_link = install_db_connect($infos, $errors))
- {
- $required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION');
- if ( version_compare(pwg_get_db_version(), $required_version, '>=') )
- {
- $pwg_charset = 'utf-8';
- $pwg_db_charset = 'utf8';
- if ($dblayer=='mysql')
- {
- $install_charset_collate = "DEFAULT CHARACTER SET $pwg_db_charset";
- pwg_query('SET NAMES "'.$pwg_db_charset.'"');
- }
- else
- {
- $install_charset_collate = '';
- }
- }
- else
- {
- $pwg_charset = 'iso-8859-1';
- $pwg_db_charset = 'latin1';
- $install_charset_collate = '';
- if ( !array_key_exists($language, $languages->get_fs_languages($pwg_charset) ) )
- {
- $language='en_UK';
- }
- }
- }
+ install_db_connect($infos, $errors);
+ pwg_db_check_charset();
$webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
if ( empty($webmaster))
@@ -320,8 +294,8 @@ $conf[\'db_host\'] = \''.$dbhost.'\';
$prefixeTable = \''.$prefixeTable.'\';
define(\'PHPWG_INSTALLED\', true);
-define(\'PWG_CHARSET\', \''.$pwg_charset.'\');
-define(\'DB_CHARSET\', \''.$pwg_db_charset.'\');
+define(\'PWG_CHARSET\', \'utf-8\');
+define(\'DB_CHARSET\', \'utf8\');
define(\'DB_COLLATE\', \'\');
?'.'>';
@@ -350,13 +324,15 @@ define(\'DB_COLLATE\', \'\');
execute_sqlfile(
PHPWG_ROOT_PATH.'install/piwigo_structure-'.$dblayer.'.sql',
DEFAULT_PREFIX_TABLE,
- $prefixeTable
+ $prefixeTable,
+ $dblayer
);
// We fill the tables with basic informations
execute_sqlfile(
PHPWG_ROOT_PATH.'install/config.sql',
DEFAULT_PREFIX_TABLE,
- $prefixeTable
+ $prefixeTable,
+ $dblayer
);
$query = '
@@ -366,7 +342,7 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
pwg_query($query);
// fill languages table
- foreach ($languages->get_fs_languages($pwg_charset) as $language_code => $language_name)
+ foreach ($languages->get_fs_languages() as $language_code => $language_name)
{
$languages->perform_action('activate', $language_code);
}
@@ -378,9 +354,9 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
// themes class
if (!defined('PWG_CHARSET'))
{
- define('PWG_CHARSET', $pwg_charset);
+ define('PWG_CHARSET', 'utf-8');
}
- activate_all_themes();
+ activate_core_themes();
$insert = array(
'id' => 1,
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 '<pre>'; print_r($themes_to_activate); echo '</pre>'; 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 '<pre>';
-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 '</pre>';
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 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2010 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 >= 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 '<pre>';
+
+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 '</pre>';
+ob_end_clean();
+
+// now we upgrade from 2.1.0
+// include_once(PHPWG_ROOT_PATH.'install/upgrade_2.1.0.php');
+?>