Skip to content

Commit

Permalink
Resolved Issue ID 0000575:
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
rub committed Nov 2, 2006
1 parent bce8b9f commit ac7f71b
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 5 deletions.
9 changes: 5 additions & 4 deletions admin/group_list.php
Expand Up @@ -41,7 +41,7 @@
// | 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 = '
Expand Down Expand Up @@ -84,7 +84,7 @@
// | add a group |
// +-----------------------------------------------------------------------+

if (isset($_POST['submit_add']))
if (isset($_POST['submit_add']) and !is_adviser())
{
if (empty($_POST['groupname']))
{
Expand Down Expand Up @@ -126,7 +126,7 @@
// | 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
Expand Down Expand Up @@ -157,7 +157,8 @@

$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',
)
);

Expand Down
22 changes: 22 additions & 0 deletions 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>
21 changes: 21 additions & 0 deletions 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>
7 changes: 6 additions & 1 deletion 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>
Expand Down

0 comments on commit ac7f71b

Please sign in to comment.