aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--install.php2
-rw-r--r--install/db/84-database.php75
-rw-r--r--install/php5_apache_configuration.php7
-rw-r--r--install/piwigo_structure-mysql.sql2
-rw-r--r--install/piwigo_structure-pdo-sqlite.sql2
-rw-r--r--install/piwigo_structure-pgsql.sql2
-rw-r--r--install/piwigo_structure-sqlite.sql2
7 files changed, 83 insertions, 9 deletions
diff --git a/install.php b/install.php
index f686e414e..46943814c 100644
--- a/install.php
+++ b/install.php
@@ -218,7 +218,7 @@ if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<'))
//----------------------------------------------------- template initialization
include( PHPWG_ROOT_PATH .'include/template.class.php');
-$template = new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma');
+$template = new Template(PHPWG_ROOT_PATH.'admin/themes', 'roma');
$template->set_filenames( array('install' => 'install.tpl') );
if (!isset($step))
{
diff --git a/install/db/84-database.php b/install/db/84-database.php
new file mode 100644
index 000000000..499a81400
--- /dev/null
+++ b/install/db/84-database.php
@@ -0,0 +1,75 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 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('Hacking attempt!');
+}
+
+$upgrade_description = 'Update default template to default theme.';
+
+$query = '
+ALTER TABLE '.USER_INFOS_TABLE.'
+ CHANGE COLUMN template theme varchar(255) NOT NULL default \'Sylvia\'
+;';
+
+pwg_query($query);
+
+$query = '
+SELECT user_id, theme
+ FROM '.USER_INFOS_TABLE.'
+;';
+
+$result = pwg_query($query);
+
+$users = array();
+while ($row = pwg_db_fetch_assoc($result))
+{
+ list($user_template, $user_theme) = explode('/', $row['theme']);
+
+ if ($user_template != 'yoga')
+ {
+ $user_theme = 'Sylvia'; // We can find better!
+ }
+ array_push($users, array(
+ 'user_id' => $row['user_id'],
+ 'theme' => $user_theme
+ )
+ );
+}
+
+mass_updates(
+ USER_INFOS_TABLE,
+ array(
+ 'primary' => array('user_id'),
+ 'update' => array('theme')
+ ),
+ $users
+ );
+
+echo
+"\n"
+. $upgrade_description
+."\n"
+;
+?> \ No newline at end of file
diff --git a/install/php5_apache_configuration.php b/install/php5_apache_configuration.php
index fce474082..6f9a4744a 100644
--- a/install/php5_apache_configuration.php
+++ b/install/php5_apache_configuration.php
@@ -75,10 +75,9 @@ function openPage()
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-script-type" content="text/javascript">
<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="shortcut icon" type="image/x-icon" href="template-common/favicon.ico">
-<link rel="stylesheet" type="text/css" href="admin/template/goto/layout.css">
-<link rel="stylesheet" type="text/css" href="admin/template/goto/default-colors.css">
-<link rel="stylesheet" type="text/css" href="admin/template/goto/theme/roma/theme.css">
+<link rel="shortcut icon" type="image/x-icon" href="themes/default/icon/favicon.ico">
+<link rel="stylesheet" type="text/css" href="admin/themes/roma/default-colors.css">
+<link rel="stylesheet" type="text/css" href="admin/themes/roma/theme.css">
<style type="text/css">
.content {
width: 800px;
diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql
index 559addfc4..13d46ab5c 100644
--- a/install/piwigo_structure-mysql.sql
+++ b/install/piwigo_structure-mysql.sql
@@ -388,7 +388,7 @@ CREATE TABLE `piwigo_user_infos` (
`show_nb_comments` enum('true','false') NOT NULL default 'false',
`show_nb_hits` enum('true','false') NOT NULL default 'false',
`recent_period` tinyint(3) unsigned NOT NULL default '7',
- `template` varchar(255) NOT NULL default 'yoga/Sylvia',
+ `theme` varchar(255) NOT NULL default 'Sylvia',
`registration_date` datetime NOT NULL default '0000-00-00 00:00:00',
`enabled_high` enum('true','false') NOT NULL default 'true',
`level` tinyint unsigned NOT NULL default '0',
diff --git a/install/piwigo_structure-pdo-sqlite.sql b/install/piwigo_structure-pdo-sqlite.sql
index 8528ef01b..56022d66a 100644
--- a/install/piwigo_structure-pdo-sqlite.sql
+++ b/install/piwigo_structure-pdo-sqlite.sql
@@ -449,7 +449,7 @@ CREATE TABLE piwigo_user_infos
"show_nb_comments" BOOLEAN default false,
"show_nb_hits" BOOLEAN default false,
"recent_period" INTEGER default 7 NOT NULL,
- "template" VARCHAR(255) default 'yoga/Sylvia' NOT NULL,
+ "theme" VARCHAR(255) default 'Sylvia' NOT NULL,
"registration_date" TIMESTAMP NOT NULL,
"enabled_high" BOOLEAN default true,
"level" INTEGER default 0 NOT NULL,
diff --git a/install/piwigo_structure-pgsql.sql b/install/piwigo_structure-pgsql.sql
index ec61ce0db..ae32d52d6 100644
--- a/install/piwigo_structure-pgsql.sql
+++ b/install/piwigo_structure-pgsql.sql
@@ -547,7 +547,7 @@ CREATE TABLE "piwigo_user_infos"
"show_nb_comments" BOOLEAN default false,
"show_nb_hits" BOOLEAN default false,
"recent_period" INTEGER default 7 NOT NULL,
- "template" VARCHAR(255) default 'yoga/Sylvia' NOT NULL,
+ "theme" VARCHAR(255) default 'Sylvia' NOT NULL,
"registration_date" TIMESTAMP NOT NULL,
"enabled_high" BOOLEAN default true,
"level" INTEGER default 0 NOT NULL,
diff --git a/install/piwigo_structure-sqlite.sql b/install/piwigo_structure-sqlite.sql
index 8528ef01b..56022d66a 100644
--- a/install/piwigo_structure-sqlite.sql
+++ b/install/piwigo_structure-sqlite.sql
@@ -449,7 +449,7 @@ CREATE TABLE piwigo_user_infos
"show_nb_comments" BOOLEAN default false,
"show_nb_hits" BOOLEAN default false,
"recent_period" INTEGER default 7 NOT NULL,
- "template" VARCHAR(255) default 'yoga/Sylvia' NOT NULL,
+ "theme" VARCHAR(255) default 'Sylvia' NOT NULL,
"registration_date" TIMESTAMP NOT NULL,
"enabled_high" BOOLEAN default true,
"level" INTEGER default 0 NOT NULL,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 23:31:02 +0000