mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-07-21 09:03:38 +02:00
partial merge -r1173:1174 from branch-1_6 to trunk: new configuration
parameter die_on_sql_error (upgrade.php and install/upgrade_*.php not concerned on BSF) partial merge -r1208:1209 from branch-1_6 to trunk (only bug fix on incorrect insertion of complex upgrade identifiers) deletions: upgrade.php and all install/upgrade_*.php because these script are never up to date on BSF. Anyway, they are only required on a stable branch. git-svn-id: http://piwigo.org/svn/trunk@1221 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
@@ -1,302 +0,0 @@
|
||||
<?php
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | PhpWebGallery - a PHP based picture gallery |
|
||||
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
|
||||
// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | branch : BSF (Best So Far)
|
||||
// | file : $RCSfile$
|
||||
// | last update : $Date$
|
||||
// | last modifier : $Author$
|
||||
// | revision : $Revision$
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | 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!');
|
||||
}
|
||||
}
|
||||
|
||||
$last_time = get_moment();
|
||||
|
||||
// will the user have to edit include/config_local.inc.php for
|
||||
// prefix_thumbnail configuration parameter
|
||||
$query = '
|
||||
SELECT value
|
||||
FROM '.CONFIG_TABLE.'
|
||||
WHERE param = \'prefix_thumbnail\'
|
||||
;';
|
||||
list($prefix_thumbnail) = mysql_fetch_array(pwg_query($query));
|
||||
|
||||
// delete obsolete configuration
|
||||
$query = '
|
||||
DELETE
|
||||
FROM '.PREFIX_TABLE.'config
|
||||
WHERE param IN (
|
||||
\'prefix_thumbnail\',
|
||||
\'mail_webmaster\',
|
||||
\'upload_maxfilesize\',
|
||||
\'upload_maxwidth\',
|
||||
\'upload_maxheight\',
|
||||
\'upload_maxwidth_thumbnail\',
|
||||
\'upload_maxheight_thumbnail\',
|
||||
\'mail_notification\',
|
||||
\'use_iptc\',
|
||||
\'use_exif\',
|
||||
\'show_iptc\',
|
||||
\'show_exif\',
|
||||
\'authorize_remembering\'
|
||||
)
|
||||
;';
|
||||
mysql_query($query);
|
||||
|
||||
$queries = array(
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_categories
|
||||
CHANGE COLUMN date_last date_last datetime default NULL
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_comments
|
||||
ADD COLUMN validation_date datetime default NULL
|
||||
;",
|
||||
|
||||
"
|
||||
UPDATE phpwebgallery_comments
|
||||
SET validation_date = date
|
||||
",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_comments
|
||||
ADD INDEX comments_i1 (image_id)
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_comments
|
||||
ADD INDEX comments_i2 (validation_date)
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_favorites
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_images
|
||||
CHANGE COLUMN date_available
|
||||
date_available datetime NOT NULL default '0000-00-00 00:00:00'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_rate
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_sessions
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_user_access
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
DROP TABLE phpwebgallery_user_forbidden
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_user_group
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_users
|
||||
CHANGE COLUMN id id smallint(5) NOT NULL auto_increment
|
||||
;",
|
||||
|
||||
"
|
||||
CREATE TABLE phpwebgallery_caddie (
|
||||
user_id smallint(5) NOT NULL default '0',
|
||||
element_id mediumint(8) NOT NULL default '0',
|
||||
PRIMARY KEY (user_id,element_id)
|
||||
) TYPE=MyISAM
|
||||
;",
|
||||
|
||||
"
|
||||
CREATE TABLE phpwebgallery_user_cache (
|
||||
user_id smallint(5) NOT NULL default '0',
|
||||
need_update enum('true','false') NOT NULL default 'true',
|
||||
forbidden_categories text,
|
||||
PRIMARY KEY (user_id)
|
||||
) TYPE=MyISAM
|
||||
;",
|
||||
|
||||
"
|
||||
CREATE TABLE phpwebgallery_user_feed (
|
||||
id varchar(50) binary NOT NULL default '',
|
||||
user_id smallint(5) NOT NULL default '0',
|
||||
last_check datetime default NULL,
|
||||
PRIMARY KEY (id)
|
||||
) TYPE=MyISAM
|
||||
;",
|
||||
|
||||
"
|
||||
CREATE TABLE phpwebgallery_user_infos (
|
||||
user_id smallint(5) NOT NULL default '0',
|
||||
nb_image_line tinyint(1) unsigned NOT NULL default '5',
|
||||
nb_line_page tinyint(3) unsigned NOT NULL default '3',
|
||||
status enum('admin','guest') NOT NULL default 'guest',
|
||||
language varchar(50) NOT NULL default 'english',
|
||||
maxwidth smallint(6) default NULL,
|
||||
maxheight smallint(6) default NULL,
|
||||
expand enum('true','false') NOT NULL default 'false',
|
||||
show_nb_comments enum('true','false') NOT NULL default 'false',
|
||||
recent_period tinyint(3) unsigned NOT NULL default '7',
|
||||
template varchar(255) NOT NULL default 'yoga',
|
||||
registration_date datetime NOT NULL default '0000-00-00 00:00:00',
|
||||
UNIQUE KEY user_infos_ui1 (user_id)
|
||||
) TYPE=MyISAM
|
||||
;"
|
||||
);
|
||||
|
||||
foreach ($queries as $query)
|
||||
{
|
||||
$query = str_replace('phpwebgallery_', PREFIX_TABLE, $query);
|
||||
pwg_query($query);
|
||||
}
|
||||
|
||||
$new_time = get_moment();
|
||||
echo '<pre>['.get_elapsed_time($last_time, $new_time).']';
|
||||
echo ' Basic database structure upgrade done</pre>';
|
||||
flush();
|
||||
$last_time = $new_time;
|
||||
|
||||
// user datas migration from phpwebgallery_users to phpwebgallery_user_infos
|
||||
$query = '
|
||||
SELECT *
|
||||
FROM '.USERS_TABLE.'
|
||||
;';
|
||||
|
||||
$datas = array();
|
||||
list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
|
||||
|
||||
$result = pwg_query($query);
|
||||
while ($row = mysql_fetch_array($result))
|
||||
{
|
||||
$row['user_id'] = $row['id'];
|
||||
$row['registration_date'] = $dbnow;
|
||||
array_push($datas, $row);
|
||||
}
|
||||
|
||||
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
|
||||
mass_inserts(
|
||||
USER_INFOS_TABLE,
|
||||
array(
|
||||
'user_id',
|
||||
'nb_image_line',
|
||||
'nb_line_page',
|
||||
'status',
|
||||
'language',
|
||||
'maxwidth',
|
||||
'maxheight',
|
||||
'expand',
|
||||
'show_nb_comments',
|
||||
'recent_period',
|
||||
'template',
|
||||
'registration_date'
|
||||
),
|
||||
$datas
|
||||
);
|
||||
|
||||
$queries = array(
|
||||
|
||||
"
|
||||
UPDATE ".USER_INFOS_TABLE."
|
||||
SET template = 'yoga'
|
||||
;",
|
||||
|
||||
"
|
||||
UPDATE ".USER_INFOS_TABLE."
|
||||
SET language = 'en_UK.iso-8859-1'
|
||||
WHERE language NOT IN ('en_UK.iso-8859-1', 'fr_FR.iso-8859-1')
|
||||
;",
|
||||
|
||||
"
|
||||
UPDATE ".CONFIG_TABLE."
|
||||
SET value = 'en_UK.iso-8859-1'
|
||||
WHERE param = 'default_language'
|
||||
AND value NOT IN ('en_UK.iso-8859-1', 'fr_FR.iso-8859-1')
|
||||
;",
|
||||
|
||||
"
|
||||
UPDATE ".CONFIG_TABLE."
|
||||
SET value = 'yoga'
|
||||
WHERE param = 'default_template'
|
||||
;",
|
||||
|
||||
"
|
||||
INSERT INTO ".CONFIG_TABLE."
|
||||
(param,value,comment)
|
||||
VALUES
|
||||
(
|
||||
'gallery_title',
|
||||
'PhpWebGallery demonstration site',
|
||||
'Title at top of each page and for RSS feed'
|
||||
)
|
||||
;",
|
||||
|
||||
"
|
||||
INSERT INTO ".CONFIG_TABLE."
|
||||
(param,value,comment)
|
||||
VALUES
|
||||
(
|
||||
'gallery_description',
|
||||
'My photos web site',
|
||||
'Short description displayed with gallery title'
|
||||
)
|
||||
;"
|
||||
|
||||
);
|
||||
|
||||
foreach ($queries as $query)
|
||||
{
|
||||
$query = str_replace('phpwebgallery_', PREFIX_TABLE, $query);
|
||||
pwg_query($query);
|
||||
}
|
||||
|
||||
$infos = array();
|
||||
|
||||
if ($prefix_thumbnail != 'TN-')
|
||||
{
|
||||
array_push(
|
||||
$infos,
|
||||
'the thumbnail prefix configuration parameter was moved to configuration
|
||||
file, copy config_local.inc.php from "tools" directory to "include" directory
|
||||
and edit $conf[\'prefix_thumbnail\'] = '.$prefix_thumbnail
|
||||
);
|
||||
}
|
||||
|
||||
?>
|
||||
@@ -1,302 +0,0 @@
|
||||
<?php
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | PhpWebGallery - a PHP based picture gallery |
|
||||
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
|
||||
// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | branch : BSF (Best So Far)
|
||||
// | file : $RCSfile$
|
||||
// | last update : $Date$
|
||||
// | last modifier : $Author$
|
||||
// | revision : $Revision$
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | 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!');
|
||||
}
|
||||
}
|
||||
|
||||
$last_time = get_moment();
|
||||
|
||||
// will the user have to edit include/config_local.inc.php for
|
||||
// prefix_thumbnail configuration parameter
|
||||
$query = '
|
||||
SELECT value
|
||||
FROM '.CONFIG_TABLE.'
|
||||
WHERE param = \'prefix_thumbnail\'
|
||||
;';
|
||||
list($prefix_thumbnail) = mysql_fetch_array(pwg_query($query));
|
||||
|
||||
// delete obsolete configuration
|
||||
$query = '
|
||||
DELETE
|
||||
FROM '.PREFIX_TABLE.'config
|
||||
WHERE param IN (
|
||||
\'prefix_thumbnail\',
|
||||
\'mail_webmaster\',
|
||||
\'upload_maxfilesize\',
|
||||
\'upload_maxwidth\',
|
||||
\'upload_maxheight\',
|
||||
\'upload_maxwidth_thumbnail\',
|
||||
\'upload_maxheight_thumbnail\',
|
||||
\'mail_notification\',
|
||||
\'use_iptc\',
|
||||
\'use_exif\',
|
||||
\'show_iptc\',
|
||||
\'show_exif\',
|
||||
\'authorize_remembering\'
|
||||
)
|
||||
;';
|
||||
mysql_query($query);
|
||||
|
||||
$queries = array(
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_categories
|
||||
CHANGE COLUMN date_last date_last datetime default NULL
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_comments
|
||||
ADD COLUMN validation_date datetime default NULL
|
||||
;",
|
||||
|
||||
"
|
||||
UPDATE phpwebgallery_comments
|
||||
SET validation_date = date
|
||||
",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_comments
|
||||
ADD INDEX comments_i1 (image_id)
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_comments
|
||||
ADD INDEX comments_i2 (validation_date)
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_favorites
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_images
|
||||
CHANGE COLUMN date_available
|
||||
date_available datetime NOT NULL default '0000-00-00 00:00:00'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_rate
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_sessions
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_user_access
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
DROP TABLE phpwebgallery_user_forbidden
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_user_group
|
||||
CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
|
||||
;",
|
||||
|
||||
"
|
||||
ALTER TABLE phpwebgallery_users
|
||||
CHANGE COLUMN id id smallint(5) NOT NULL auto_increment
|
||||
;",
|
||||
|
||||
"
|
||||
CREATE TABLE phpwebgallery_caddie (
|
||||
user_id smallint(5) NOT NULL default '0',
|
||||
element_id mediumint(8) NOT NULL default '0',
|
||||
PRIMARY KEY (user_id,element_id)
|
||||
) TYPE=MyISAM
|
||||
;",
|
||||
|
||||
"
|
||||
CREATE TABLE phpwebgallery_user_cache (
|
||||
user_id smallint(5) NOT NULL default '0',
|
||||
need_update enum('true','false') NOT NULL default 'true',
|
||||
forbidden_categories text,
|
||||
PRIMARY KEY (user_id)
|
||||
) TYPE=MyISAM
|
||||
;",
|
||||
|
||||
"
|
||||
CREATE TABLE phpwebgallery_user_feed (
|
||||
id varchar(50) binary NOT NULL default '',
|
||||
user_id smallint(5) NOT NULL default '0',
|
||||
last_check datetime default NULL,
|
||||
PRIMARY KEY (id)
|
||||
) TYPE=MyISAM
|
||||
;",
|
||||
|
||||
"
|
||||
CREATE TABLE phpwebgallery_user_infos (
|
||||
user_id smallint(5) NOT NULL default '0',
|
||||
nb_image_line tinyint(1) unsigned NOT NULL default '5',
|
||||
nb_line_page tinyint(3) unsigned NOT NULL default '3',
|
||||
status enum('admin','guest') NOT NULL default 'guest',
|
||||
language varchar(50) NOT NULL default 'english',
|
||||
maxwidth smallint(6) default NULL,
|
||||
maxheight smallint(6) default NULL,
|
||||
expand enum('true','false') NOT NULL default 'false',
|
||||
show_nb_comments enum('true','false') NOT NULL default 'false',
|
||||
recent_period tinyint(3) unsigned NOT NULL default '7',
|
||||
template varchar(255) NOT NULL default 'yoga',
|
||||
registration_date datetime NOT NULL default '0000-00-00 00:00:00',
|
||||
UNIQUE KEY user_infos_ui1 (user_id)
|
||||
) TYPE=MyISAM
|
||||
;"
|
||||
);
|
||||
|
||||
foreach ($queries as $query)
|
||||
{
|
||||
$query = str_replace('phpwebgallery_', PREFIX_TABLE, $query);
|
||||
pwg_query($query);
|
||||
}
|
||||
|
||||
$new_time = get_moment();
|
||||
echo '<pre>['.get_elapsed_time($last_time, $new_time).']';
|
||||
echo ' Basic database structure upgrade done</pre>';
|
||||
flush();
|
||||
$last_time = $new_time;
|
||||
|
||||
// user datas migration from phpwebgallery_users to phpwebgallery_user_infos
|
||||
$query = '
|
||||
SELECT *
|
||||
FROM '.USERS_TABLE.'
|
||||
;';
|
||||
|
||||
$datas = array();
|
||||
list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
|
||||
|
||||
$result = pwg_query($query);
|
||||
while ($row = mysql_fetch_array($result))
|
||||
{
|
||||
$row['user_id'] = $row['id'];
|
||||
$row['registration_date'] = $dbnow;
|
||||
array_push($datas, $row);
|
||||
}
|
||||
|
||||
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
|
||||
mass_inserts(
|
||||
USER_INFOS_TABLE,
|
||||
array(
|
||||
'user_id',
|
||||
'nb_image_line',
|
||||
'nb_line_page',
|
||||
'status',
|
||||
'language',
|
||||
'maxwidth',
|
||||
'maxheight',
|
||||
'expand',
|
||||
'show_nb_comments',
|
||||
'recent_period',
|
||||
'template',
|
||||
'registration_date'
|
||||
),
|
||||
$datas
|
||||
);
|
||||
|
||||
$queries = array(
|
||||
|
||||
"
|
||||
UPDATE ".USER_INFOS_TABLE."
|
||||
SET template = 'yoga'
|
||||
;",
|
||||
|
||||
"
|
||||
UPDATE ".USER_INFOS_TABLE."
|
||||
SET language = 'en_UK.iso-8859-1'
|
||||
WHERE language NOT IN ('en_UK.iso-8859-1', 'fr_FR.iso-8859-1')
|
||||
;",
|
||||
|
||||
"
|
||||
UPDATE ".CONFIG_TABLE."
|
||||
SET value = 'en_UK.iso-8859-1'
|
||||
WHERE param = 'default_language'
|
||||
AND value NOT IN ('en_UK.iso-8859-1', 'fr_FR.iso-8859-1')
|
||||
;",
|
||||
|
||||
"
|
||||
UPDATE ".CONFIG_TABLE."
|
||||
SET value = 'yoga'
|
||||
WHERE param = 'default_template'
|
||||
;",
|
||||
|
||||
"
|
||||
INSERT INTO ".CONFIG_TABLE."
|
||||
(param,value,comment)
|
||||
VALUES
|
||||
(
|
||||
'gallery_title',
|
||||
'PhpWebGallery demonstration site',
|
||||
'Title at top of each page and for RSS feed'
|
||||
)
|
||||
;",
|
||||
|
||||
"
|
||||
INSERT INTO ".CONFIG_TABLE."
|
||||
(param,value,comment)
|
||||
VALUES
|
||||
(
|
||||
'gallery_description',
|
||||
'My photos web site',
|
||||
'Short description displayed with gallery title'
|
||||
)
|
||||
;"
|
||||
|
||||
);
|
||||
|
||||
foreach ($queries as $query)
|
||||
{
|
||||
$query = str_replace('phpwebgallery_', PREFIX_TABLE, $query);
|
||||
pwg_query($query);
|
||||
}
|
||||
|
||||
$infos = array();
|
||||
|
||||
if ($prefix_thumbnail != 'TN-')
|
||||
{
|
||||
array_push(
|
||||
$infos,
|
||||
'the thumbnail prefix configuration parameter was moved to configuration
|
||||
file, copy config_local.inc.php from "tools" directory to "include" directory
|
||||
and edit $conf[\'prefix_thumbnail\'] = '.$prefix_thumbnail
|
||||
);
|
||||
}
|
||||
|
||||
?>
|
||||
Reference in New Issue
Block a user