feature 1514: bug fixed, core themes and already used themes are automatically

activated.

git-svn-id: http://piwigo.org/svn/trunk@5157 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 73 insertions, 0 deletions

diff --git a/install/config.sql b/install/config.sql
index 107accdd2..c8d83a908 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -32,3 +32,7 @@ INSERT INTO piwigo_config (param,value,comment) VALUES ('upload_link_everytime',
 INSERT INTO piwigo_config (param,value,comment) VALUES ('upload_user_access',2 /*ACCESS_CLASSIC*/,'User access level to upload');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('extents_for_templates','a:0:{}','Actived template-extension(s)');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('blk_menubar','','Menubar options');
+
+INSERT INTO piwigo_themes (id) VALUES ('Sylvia');
+INSERT INTO piwigo_themes (id) VALUES ('clear');
+INSERT INTO piwigo_themes (id) VALUES ('dark');
diff --git a/install/db/86-database.php b/install/db/86-database.php
new file mode 100644
index 000000000..b063a8d7b
--- /dev/null
+++ b/install/db/86-database.php
@@ -0,0 +1,69 @@
+<?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 = 'Automatically activate core themes and used 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
+  SET id = "'.$theme.'"
+;';
+  pwg_query($query);
+}
+
+echo
+"\n"
+. $upgrade_description
+."\n"
+;
+?>
\ No newline at end of file