From 62b589964a5bd86b1ba74514cd9990d3078bf197 Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Fri, 17 Mar 2006 17:59:59 +0000
Subject: [PATCH] Step 8 improvement issue 0000301:   o Add
 $conf['allow_adviser']

git-svn-id: http://piwigo.org/svn/trunk@1087 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/user_list.php                           |  8 +++++++-
 include/config_default.inc.php                |  3 +++
 language/en_UK.iso-8859-1/help/user_list.html | 15 +++++++++++----
 language/fr_FR.iso-8859-1/help/user_list.html | 14 +++++++++++---
 template/yoga/admin/user_list.tpl             |  4 +++-
 5 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/admin/user_list.php b/admin/user_list.php
index ed2fc77d2..532d64783 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -486,6 +486,12 @@ if (isset($_GET['id']))
   $template->assign_block_vars('session', array('ID' => $_GET['id']));
 }
 
+// Hide radio-button if not allow to assign adviser
+if ($conf['allow_adviser'])
+{
+  $template->assign_block_vars('adviser', array());
+}
+
 foreach ($page['order_by_items'] as $item => $label)
 {
   $selected = (isset($_GET['order_by']) and $_GET['order_by'] == $item) ?
@@ -801,7 +807,7 @@ foreach ($page['filtered_users'] as $num => $local_user)
   {
     $checked = '';
   }
-    
+
   $template->assign_block_vars(
     'user',
     array(
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index da9a9de75..cbb74ad83 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -378,6 +378,9 @@ $conf['guest_id'] = 2;
 // webmaster_id : webmaster'id.
 $conf['webmaster_id'] = 1;
 
+// allow to use adviser mode
+$conf['allow_adviser'] = false;
+
 // +-----------------------------------------------------------------------+
 // |                                upload                                 |
 // +-----------------------------------------------------------------------+
diff --git a/language/en_UK.iso-8859-1/help/user_list.html b/language/en_UK.iso-8859-1/help/user_list.html
index d9312b084..b09110537 100644
--- a/language/en_UK.iso-8859-1/help/user_list.html
+++ b/language/en_UK.iso-8859-1/help/user_list.html
@@ -21,16 +21,23 @@ or descending order.</p>
   <li>delete users (require a confirmation checkbox)</li>
 
   <li>change status</li>
-  
-  <li>set user like an adviser</li>
-  
+
   <li>associate or dissociate from groups</li>
 
   <li>modify display properties</li>
-  
+
   <li>modify additional properties</li>
 
 </ul>
 
 <p>The target is the set users selected (by default) or all users is
 asked.</p>
+<h3>Adviser</h3>
+<p>Definition of adviser user:</p>
+<ul>
+  <li>allow access of all screens permitted by this status</li>
+  <li>read-only or simulate-only access</li>
+</ul>
+
+<p>It's possible to assign adviser mode with variable $conf['allow_adviser'].</p>
+<p>If this variable is 'true', it's possible to define user like an adviser</p>
diff --git a/language/fr_FR.iso-8859-1/help/user_list.html b/language/fr_FR.iso-8859-1/help/user_list.html
index 17321cda6..98039e837 100644
--- a/language/fr_FR.iso-8859-1/help/user_list.html
+++ b/language/fr_FR.iso-8859-1/help/user_list.html
@@ -23,8 +23,6 @@ simultan
 
   <li>changer le status</li>
 
-  <li>définir l'utilisateur comme un conseiller</li>
-
   <li>associer ou dissocier des groupes</li>
 
   <li>modifier les propriétés d'affichage</li>
@@ -34,4 +32,14 @@ simultan
 </ul>
 
 <p>La cible est la liste des utilisateurs sélectionnés (par défaut) ou bien
-touts les utilisateurs de la liste filtrée.</p>
+tout les utilisateurs de la liste filtrée.</p>
+
+<h3>Conseiller</h3>
+<p>Définition d'un utilisateur conseiller:</p>
+<ul>
+  <li>permet d'accéder à tous les écrans permis par son status</li>
+  <li>accés uniquement en consultation ou en simulation</li>
+</ul>
+
+<p>Il est possible de permettre l'assignation du mode conseiller avec la variable $conf['allow_adviser'].</p>
+<p>Si cette variable est à 'true', il sera possible de définir l'utilisateur comme un conseiller</p>
diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index 81365b63b..1483e80f4 100644
--- a/template/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
@@ -124,6 +124,7 @@
       </td>
     </tr>
 
+    <!-- BEGIN adviser -->
     <tr>
       <td>{lang:adviser}</td>
       <td>
@@ -133,8 +134,9 @@
         <label><input type="radio" name="adviser" value="false" {ADVISER_NO}  />{L_NO}</label>
       </td>
     </tr>
-  </table>
+    <!-- END adviser -->
 
+  </table>
 </fieldset>
 
 <!-- form to set properties for many users at once -->