Resolved Issue ID 0000575:

  o Missing Help on screen Groups List/Group Management

Resolved Issue ID 0000356:
  o Increase security on adviser mode (Screen Group List)


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

4 files changed, 54 insertions, 5 deletions

diff --git a/admin/group_list.php b/admin/group_list.php
index 69edcb02a..ec0a06191 100644
--- a/admin/group_list.php
+++ b/admin/group_list.php
@@ -41,7 +41,7 @@ check_status(ACCESS_ADMINISTRATOR);
 // |                             delete a group                            |
 // +-----------------------------------------------------------------------+
 
-if (isset($_GET['delete']) and is_numeric($_GET['delete']))
+if (isset($_GET['delete']) and is_numeric($_GET['delete']) and !is_adviser())
 {
   // destruction of the access linked to the group
   $query = '
@@ -84,7 +84,7 @@ DELETE
 // |                              add a group                              |
 // +-----------------------------------------------------------------------+
 
-if (isset($_POST['submit_add']))
+if (isset($_POST['submit_add']) and !is_adviser())
 {
   if (empty($_POST['groupname']))
   {
@@ -126,7 +126,7 @@ INSERT INTO '.GROUPS_TABLE.'
 // | toggle is default group property                                      |
 // +-----------------------------------------------------------------------+
 
-if (isset($_GET['toggle_is_default']) and is_numeric($_GET['toggle_is_default']))
+if (isset($_GET['toggle_is_default']) and is_numeric($_GET['toggle_is_default']) and !is_adviser())
 {
   $query = '
 SELECT name, is_default
@@ -157,7 +157,8 @@ $template->set_filenames(array('group_list' => 'admin/group_list.tpl'));
 
 $template->assign_vars(
   array(
-    'F_ADD_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=group_list'
+    'F_ADD_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=group_list',
+    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=group_list',
     )
   );
 
diff --git a/language/en_UK.iso-8859-1/help/group_list.html b/language/en_UK.iso-8859-1/help/group_list.html
new file mode 100644
index 000000000..e76094cae
--- /dev/null
+++ b/language/en_UK.iso-8859-1/help/group_list.html
@@ -0,0 +1,22 @@
+<h2>Groups list</h2>

+

+<p>This is the place where you can manage defined groups.</p>

+

+<h3>Add a group</h3>

+

+<p>Administrator can add groups.</p>

+

+<h3>Groupes list</h3>

+

+<p>The list allows for each element to:</p>

+

+

+<ul>

+  <li>go to members list</li>

+  <li>go to permissions</li>

+  <li>delete the group (require a confirmation checkbox)</li>

+  <li>toggle status "default" (require a confirmation checkbox)</li>

+</ul>

+

+<h3>Default groups</h3>

+<p>Default groups are groups associated automatically to new user.</p>
\ No newline at end of file
diff --git a/language/fr_FR.iso-8859-1/help/group_list.html b/language/fr_FR.iso-8859-1/help/group_list.html
new file mode 100644
index 000000000..321a87e3e
--- /dev/null
+++ b/language/fr_FR.iso-8859-1/help/group_list.html
@@ -0,0 +1,21 @@
+<h2>Liste des groupes</h2>

+

+<p>Manipulation des propriétés des groupes définis.</p>

+

+<h3>Ajouter un groupe</h3>

+

+<p>L'administrateur peut ajouter des groupes.</p>

+

+<h3>Liste des groupes</h3>

+

+<p>La liste permet pour chaque groupe:</p>

+

+<ul>

+  <li>d'accéder à la liste des membres</li>

+  <li>d'accéder aux permissions</li>

+  <li>de supprimer le groupe (nécessite une confirmation)</li>

+  <li>d'inverser le statut "par défaut" (nécessite une confirmation)</li>

+</ul>

+

+<h3>Groupes par défaut</h3>

+<p>Les groupes par défaut sont les groupes associés automatiquement à chaque nouvel utilisateur.</p>
\ No newline at end of file
diff --git a/template/yoga/admin/group_list.tpl b/template/yoga/admin/group_list.tpl
index 0424456e5..864efade7 100644
--- a/template/yoga/admin/group_list.tpl
+++ b/template/yoga/admin/group_list.tpl
@@ -1,5 +1,10 @@
 <!-- $Id$ -->
-<h2>{lang:title_groups}</h2>
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:title_groups}</h2>
+</div>
 
 <form method="post" name="add_user" action="{F_ADD_ACTION}" class="properties">
   <fieldset>