Step 1 improvement issue 0000127:

  o Add field enabled_high of table #_user_infos
  o Add $conf['newuser_default_enabled_high']
  o Used field on picture.php



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

4 files changed, 69 insertions, 2 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index c9c0f80af..3631b0895 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -126,6 +126,9 @@ $conf['newcat_default_visible'] = 'true';
 // automatically create private.
 $conf['newcat_default_status'] = 'public';
 
+// newuser_default_enabled_high : at creation, must a user with enabled_high or not
+$conf['newuser_default_enabled_high'] = 'true';
+
 // level_separator : character string used for separating a category level
 // to the sub level. Suggestions : ' / ', ' » ', ' → ', ' - ',
 // ' >'
diff --git a/install/db/14-database.php b/install/db/14-database.php
new file mode 100644
index 000000000..e9f50174a
--- /dev/null
+++ b/install/db/14-database.php
@@ -0,0 +1,63 @@
+<?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: 2005-09-21 00:04:57 +0200 (mer, 21 sep 2005) $
+// | last modifier : $Author: plg $
+// | revision      : $Revision: 870 $
+// +-----------------------------------------------------------------------+
+// | 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 database to new pwg_high structure';
+
+include_once(PHPWG_ROOT_PATH.'include/constants.php');
+include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
+@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+
+// +-----------------------------------------------------------------------+
+// |                            Upgrade content                            |
+// +-----------------------------------------------------------------------+
+
+echo "Alter table ".USER_INFOS_TABLE. ' add field enabled_high';
+$query = "
+alter table ".USER_INFOS_TABLE."
+  add column `enabled_high` enum('true','false') NOT NULL default 'true'
+;";
+pwg_query($query);
+
+echo "Update ".USER_INFOS_TABLE.".enabled_high with default value";
+$query = "
+update ".USER_INFOS_TABLE." set enabled_high = '".$conf['newuser_default_enabled_high']."' 
+where enabled_high <> '".$conf['newuser_default_enabled_high']."'
+;";
+pwg_query($query);
+
+echo
+"\n"
+.'"'.$upgrade_description.'"'.' ended'
+."\n"
+;
+
+?>
diff --git a/install/phpwebgallery_structure.sql b/install/phpwebgallery_structure.sql
index e8f07334a..b4cf1d4b0 100644
--- a/install/phpwebgallery_structure.sql
+++ b/install/phpwebgallery_structure.sql
@@ -304,6 +304,7 @@ CREATE TABLE `phpwebgallery_user_infos` (
   `recent_period` tinyint(3) unsigned NOT NULL default '7',
   `template` varchar(255) NOT NULL default 'yoga/clear',
   `registration_date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `enabled_high` enum('true','false') NOT NULL default 'true',
   UNIQUE KEY `user_infos_ui1` (`user_id`)
 ) TYPE=MyISAM;
 
diff --git a/picture.php b/picture.php
index 75b0c16c4..6a6bab850 100644
--- a/picture.php
+++ b/picture.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | 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 |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $RCSfile$
@@ -336,7 +336,7 @@ while ($row = mysql_fetch_array($result))
     // high quality picture
     if ($i == 'current')
     {
-      if ($row['has_high']=='true')
+      if (($row['has_high'] == 'true') and ($user['enabled_high'] == 'true'))
       {
         $url_high=$cat_directory.'/pwg_high/'.$row['file'];
         $picture[$i]['high'] = $url_high;