From 480fb5c2d954193c509b54a6b7148a662a7622ba Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Tue, 14 Dec 2010 13:49:56 +0000
Subject: feature 2060: Add 91-database.php (set admin or webmaster advisers as
 normal user). Remove $conf['allow_adviser'] form config_default.inc.php.

git-svn-id: http://piwigo.org/svn/trunk@8127 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/config_default.inc.php |  3 ---
 install/db/91-database.php     | 54 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 install/db/91-database.php

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 7a334a5f4..a17456c7d 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -555,9 +555,6 @@ $conf['browser_language'] = true;
 // webmaster_id : webmaster'id.
 $conf['webmaster_id'] = 1;
 
-// allow to use adviser mode
-$conf['allow_adviser'] = false;
-
 // does the guest have access ?
 // (not a security feature, set your categories "private" too)
 // If false it'll be redirected from index.php to identification.php
diff --git a/install/db/91-database.php b/install/db/91-database.php
new file mode 100644
index 000000000..871db559e
--- /dev/null
+++ b/install/db/91-database.php
@@ -0,0 +1,54 @@
+<?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('Hacking attempt!');
+}
+
+$upgrade_description = 'Remove adviser status.';
+
+// Existing adviser become normal user
+$query = "
+UPDATE ".USER_INFOS_TABLE."
+SET status = 'normal'
+WHERE (status = 'webmaster' OR status = 'admin')
+  AND adviser = 'true'
+;";
+
+pwg_query($query);
+
+// Remove adviser column
+$query = '
+ALTER TABLE '.USER_INFOS_TABLE.'
+DROP COLUMN adviser
+;';
+
+pwg_query($query);
+
+echo
+"\n"
+. $upgrade_description
+."\n"
+;
+?>
\ No newline at end of file
-- 
cgit v1.2.3