Changeset 815


Ignore:
Timestamp:
Aug 16, 2005, 5:19:40 PM (19 years ago)
Author:
plg
Message:
  • modification : admin/group_list screen completely rewrite to present the list of existing groups and a form to add a new group. Here you can delete a group, go to permissions management for a group, go to member list of a group (on admin/user_list with a filter on group).
  • modification : admin/user_perm and admin/group_perm are not directly reachable by the admin menu anymore. Only the user/group list lets you reach user/group permissions management screen.
Location:
trunk
Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin.php

    r814 r815  
    7777   $title = $lang['title_groups'];        $page_valide = true; break;
    7878 case 'group_perm' :
    79    /*if ( !is_numeric( $_GET['group_id'] ) ) $_GET['group_id'] = -1;
    80    $query = 'SELECT name FROM '.GROUPS_TABLE;
    81    $query.= ' WHERE id = '.$_GET['group_id'];
    82    $query.= ';';
    83    $result = pwg_query( $query );
    84    if ( mysql_num_rows( $result ) > 0 )
    85    {
    86      $row = mysql_fetch_array( $result );*/
    87      $title = $lang['title_group_perm'];//.' "'.$row['name'].'"';
     79   if (!is_numeric($_GET['group_id']))
     80   {
     81     $_GET['group_id'] = -1;
     82   }
     83   $query = '
     84SELECT name
     85  FROM '.GROUPS_TABLE.'
     86  WHERE id = '.$_GET['group_id'].'
     87;';
     88   $result = pwg_query($query);
     89   if (mysql_num_rows($result) > 0 )
     90   {
     91     $row = mysql_fetch_array($result);
     92     $title = $lang['title_group_perm'].' "'.$row['name'].'"';
    8893     $page_valide = true;
    89    /*}
     94   }
    9095   else
    9196   {
    9297     $page_valide = false;
    93    }*/
     98   }
    9499   break;
    95100 case 'stats':
    … …  
    253258  'L_USERS'=>$lang['users'],
    254259  'L_GROUPS'=>$lang['groups'],
    255   'L_AUTH'=>$lang['permissions'],
    256260  'L_UPDATE'=>$lang['update'],
    257261  'L_CAT_UPLOAD'=>$lang['upload'],
    … …  
    283287  'U_USERS'=>add_session_id($link_start.'user_list' ),
    284288  'U_GROUPS'=>add_session_id($link_start.'group_list' ),
    285   'U_USERS_AUTH'=>add_session_id($link_start.'user_perm' ),
    286   'U_GROUPS_AUTH'=>add_session_id($link_start.'group_perm'),
    287   'U_CAT_AUTH'=>add_session_id($link_start.'cat_perm' ),
    288289  'U_RETURN'=>add_session_id(PHPWG_ROOT_PATH.'category.php')
    289290  ));

  • trunk/admin/group_list.php

    r792 r815  
    2525// | USA.                                                                  |
    2626// +-----------------------------------------------------------------------+
     27
    2728if( !defined("PHPWG_ROOT_PATH") )
    2829{
    29         die ("Hacking attempt!");
     30  die ("Hacking attempt!");
    3031}
    3132include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
    3233
    33 //-------------------------------------------------------------- delete a group
    34 if ( isset( $_POST['delete'] ) && isset( $_POST['confirm_delete'] )  )
     34// +-----------------------------------------------------------------------+
     35// |                             delete a group                            |
     36// +-----------------------------------------------------------------------+
     37
     38if (isset($_GET['delete']) and is_numeric($_GET['delete']))
    3539{
    3640  // destruction of the access linked to the group
    37   $query = 'DELETE FROM '.GROUP_ACCESS_TABLE;
    38   $query.= ' WHERE group_id = '.$_POST['group_id'];
    39   $query.= ';';
    40   pwg_query( $query );
    41        
    42         // destruction of the users links for this group
    43   $query = 'DELETE FROM ' . USER_GROUP_TABLE;
    44   $query.= ' WHERE group_id = '.$_POST['group_id'];
    45         pwg_query( $query );
    46        
    47         // destruction of the group
    48         $query = 'DELETE FROM ' . GROUPS_TABLE;
    49   $query.= ' WHERE id = '.$_POST['group_id'];
    50         $query.= ';';
    51         pwg_query( $query );
     41  $query = '
     42DELETE
     43  FROM '.GROUP_ACCESS_TABLE.'
     44  WHERE group_id = '.$_GET['delete'].'
     45;';
     46  pwg_query($query);
     47 
     48  // destruction of the users links for this group
     49  $query = '
     50DELETE
     51  FROM '.USER_GROUP_TABLE.'
     52  WHERE group_id = '.$_GET['delete'].'
     53;';
     54  pwg_query($query);
     55
     56  $query = '
     57SELECT name
     58  FROM '.GROUPS_TABLE.'
     59  WHERE id = '.$_GET['delete'].'
     60;';
     61  list($groupname) = mysql_fetch_row(pwg_query($query));
     62 
     63  // destruction of the group
     64  $query = '
     65DELETE
     66  FROM '.GROUPS_TABLE.'
     67  WHERE id = '.$_GET['delete'].'
     68;';
     69  pwg_query($query);
     70
     71  array_push(
     72    $page['infos'],
     73    sprintf(l10n('group "%s" deleted'), $groupname)
     74    );
    5275}
    53 //----------------------------------------------------------------- add a group
    54 elseif ( isset( $_POST['new'] ) )
     76
     77// +-----------------------------------------------------------------------+
     78// |                              add a group                              |
     79// +-----------------------------------------------------------------------+
     80
     81if (isset($_POST['submit_add']))
    5582{
    56   if ( empty($_POST['newgroup']) || preg_match( "/'/", $_POST['newgroup'] )
    57        or preg_match( '/"/', $_POST['newgroup'] ) )
     83  if (empty($_POST['groupname']))
    5884  {
    59     array_push( $page['errors'], $lang['group_add_error1'] );
     85    array_push($page['errors'], $lang['group_add_error1']);
    6086  }
    61   if ( count( $page['errors'] ) == 0 )
     87  if (count($page['errors']) == 0)
    6288  {
    6389    // is the group not already existing ?
    64     $query = 'SELECT id FROM '.GROUPS_TABLE;
    65     $query.= " WHERE name = '".$_POST['newgroup']."'";
    66     $query.= ';';
    67     $result = pwg_query( $query );
    68     if ( mysql_num_rows( $result ) > 0 )
     90    $query = '
     91SELECT COUNT(*)
     92  FROM '.GROUPS_TABLE.'
     93  WHERE name = \''.$_POST['groupname'].'\'
     94;';
     95    list($count) = mysql_fetch_row(pwg_query($query));
     96    if ($count != 0)
    6997    {
    70       array_push( $page['errors'], $lang['group_add_error2'] );
     98      array_push($page['errors'], $lang['group_add_error2']);
    7199    }
    72100  }
    73   if ( count( $page['errors'] ) == 0 )
     101  if (count($page['errors']) == 0)
    74102  {
    75103    // creating the group
    76     $query = ' INSERT INTO '.GROUPS_TABLE;
    77     $query.= " (name) VALUES ('".$_POST['newgroup']."')";
    78     $query.= ';';
    79     pwg_query( $query );
    80   }
    81 }
    82 //------------------------------------------------------------- user management
    83 elseif ( isset( $_POST['add'] ) )
    84 {
    85   $userdata = getuserdata($_POST['username']);
    86   if (!$userdata)
    87   {
    88     array_push($page['errors'], $lang['user_err_unknown']);
    89   }
    90   else
    91   {
    92     // create a new association between the user and a group
    93104    $query = '
    94 INSERT INTO '.USER_GROUP_TABLE.'
    95   (user_id,group_id)
     105INSERT INTO '.GROUPS_TABLE.'
     106  (name)
    96107  VALUES
    97   ('.$userdata['id'].','.$_POST['edit_group_id'].')
     108  (\''.mysql_escape_string($_POST['groupname']).'\')
    98109;';
    99110    pwg_query($query);
    100   }
    101 }
    102 elseif (isset( $_POST['deny_user'] ))
    103 {
    104   $sql_in = '';
    105         $members = $_POST['members'];
    106         for($i = 0; $i < count($members); $i++)
    107   {
    108     $sql_in .= ( ( $sql_in != '' ) ? ', ' : '' ) . intval($members[$i]);
    109   }
    110   $query = 'DELETE FROM ' . USER_GROUP_TABLE;
    111   $query.= ' WHERE user_id IN ('.$sql_in;
    112         $query.= ') AND group_id = '.$_POST['edit_group_id'];
    113         pwg_query( $query );
    114 }
    115 //----------------------------------------------------------------- groups list
    116111
    117 $query = 'SELECT id,name FROM '.GROUPS_TABLE;
    118 $query.= ' ORDER BY id ASC;';
    119 $result = pwg_query( $query );
    120 $groups_display = '<select name="group_id">';
    121 $groups_nb=0;
    122 while ( $row = mysql_fetch_array( $result ) )
    123 {
    124   $groups_nb++;
    125         $selected = '';
    126         if (isset($_POST['group_id']) && $_POST['group_id']==$row['id'])
    127                 $selected = 'selected';
    128   $groups_display .= '<option value="' . $row['id'] . '" '.$selected.'>' . $row['name']  . '</option>';
    129 }
    130 $groups_display .= '</select>';
    131 
    132 $action = PHPWG_ROOT_PATH.'admin.php?page=group_list';
    133 //----------------------------------------------------- template initialization
    134 $template->set_filenames( array('groups'=>'admin/group_list.tpl') );
    135 $template->assign_vars(array(
    136   'S_GROUP_SELECT'=>$groups_display,
    137        
    138   'L_GROUP_SELECT'=>$lang['group_list_title'],
    139   'L_GROUP_CONFIRM'=>$lang['group_confirm_delete'],
    140   'L_LOOK_UP'=>$lang['edit'],
    141   'L_GROUP_DELETE'=>$lang['delete'],
    142   'L_CREATE_NEW_GROUP'=>$lang['group_add'],
    143   'L_GROUP_EDIT'=>$lang['group_edit'],
    144   'L_USER_NAME'=>$lang['login'],
    145   'L_USER_EMAIL'=>$lang['mail_address'],
    146   'L_USER_SELECT'=>$lang['Select'],
    147   'L_DENY_SELECTED'=>$lang['group_deny_user'],
    148   'L_ADD_MEMBER'=>$lang['group_add_user'],
    149   'L_FIND_USERNAME'=>$lang['Find_username'],
    150        
    151   'S_GROUP_ACTION'=>add_session_id($action),
    152   'U_SEARCH_USER' => add_session_id(PHPWG_ROOT_PATH.'admin/search.php')
    153   ));
    154 
    155 if ($groups_nb)
    156 {
    157   $template->assign_block_vars('select_box',array());
    158 }
    159 
    160 //----------------------------------------------------------------- add a group
    161 if ( isset( $_POST['edit']) || isset( $_POST['add']) || isset( $_POST['deny_user'] ))
    162 {
    163   // Retrieving the group name
    164   $query = 'SELECT id, name FROM '.GROUPS_TABLE;
    165   $query.= " WHERE id = '".$_POST['group_id']."'";
    166   $query.= ';';
    167   $result = mysql_fetch_array(pwg_query( $query ));
    168   $template->assign_block_vars('edit_group',array(
    169           'GROUP_NAME'=>$result['name'],
    170           'GROUP_ID'=>$result['id']
    171                 ));
    172                
    173   // Retrieving all the users
    174   $query = 'SELECT id, username, mail_address';
    175   $query.= ' FROM ('.USERS_TABLE.' as u';
    176   $query.= ' LEFT JOIN '.USER_GROUP_TABLE.' as ug ON ug.user_id=u.id)';
    177   $query.= " WHERE ug.group_id = '".$_POST['group_id']."';";
    178   $result = pwg_query( $query );
    179   $i=0;
    180   while ( $row = mysql_fetch_array( $result ) )
    181   {
    182     $class = ($i % 2)? 'row1':'row2'; $i++;
    183         $template->assign_block_vars('edit_group.user',array(
    184                 'ID'=>$row['id'],
    185                 'NAME'=>$row['username'],
    186                 'EMAIL'=>$row['mail_address'],
    187                 'T_CLASS'=>$class
    188         ));
     112    array_push(
     113      $page['infos'],
     114      sprintf(l10n('group "%s" added'), $_POST['groupname'])
     115      );
    189116  }
    190117}
    191118
    192 //----------------------------------------------------------- sending html code
    193 $template->assign_var_from_handle('ADMIN_CONTENT', 'groups');
     119// +-----------------------------------------------------------------------+
     120// |                             template init                             |
     121// +-----------------------------------------------------------------------+
     122
     123$template->set_filenames(array('group_list' => 'admin/group_list.tpl'));
     124
     125$template->assign_vars(
     126  array(
     127    'F_ADD_ACTION' =>
     128      add_session_id(PHPWG_ROOT_PATH.'admin.php?page=group_list')
     129    )
     130  );
     131
     132// +-----------------------------------------------------------------------+
     133// |                              group list                               |
     134// +-----------------------------------------------------------------------+
     135
     136$query = '
     137SELECT id, name
     138  FROM '.GROUPS_TABLE.'
     139  ORDER BY id ASC
     140;';
     141$result = pwg_query($query);
     142
     143$admin_url = PHPWG_ROOT_PATH.'admin.php?page=';
     144$perm_url    = $admin_url.'group_perm&amp;group_id=';
     145$del_url     = $admin_url.'group_list&amp;delete=';
     146$members_url = $admin_url.'user_list&amp;group=';
     147
     148$num = 0;
     149while ($row = mysql_fetch_array($result))
     150{
     151  $query = '
     152SELECT COUNT(*)
     153  FROM '.USER_GROUP_TABLE.'
     154  WHERE group_id = '.$row['id'].'
     155;';
     156  list($counter) = mysql_fetch_row(pwg_query($query));
     157 
     158  $template->assign_block_vars(
     159    'group',
     160    array(
     161      'CLASS' => ($num++ % 2 == 1) ? 'row2' : 'row1',
     162      'NAME' => $row['name'],
     163      'MEMBERS' => sprintf(l10n('%d members'), $counter),
     164      'U_MEMBERS' => $members_url.$row['id'],
     165      'U_DELETE' => $del_url.$row['id'],
     166      'U_PERM' => $perm_url.$row['id']
     167      )
     168    );
     169}
     170
     171// +-----------------------------------------------------------------------+
     172// |                           sending html code                           |
     173// +-----------------------------------------------------------------------+
     174
     175$template->assign_var_from_handle('ADMIN_CONTENT', 'group_list');
     176
    194177?>

  • trunk/admin/group_perm.php

    r675 r815  
    2525// | USA.                                                                  |
    2626// +-----------------------------------------------------------------------+
     27
    2728if( !defined("PHPWG_ROOT_PATH") )
    2829{
    29         die ("Hacking attempt!");
     30  die ("Hacking attempt!");
     31}
     32include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
     33
     34// +-----------------------------------------------------------------------+
     35// |                            variables init                             |
     36// +-----------------------------------------------------------------------+
     37
     38if (isset($_GET['group_id']) and is_numeric($_GET['group_id']))
     39{
     40  $page['group'] = $_GET['group_id'];
     41}
     42else
     43{
     44  echo l10n('group_id URL parameter is missing');
     45  exit();
    3046}
    3147
    32 include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
    33 //--------------------------------------------------------------------- updates
     48// +-----------------------------------------------------------------------+
     49// |                                updates                                |
     50// +-----------------------------------------------------------------------+
     51
    3452if (isset($_POST['falsify'])
    35          and isset($_POST['cat_true'])
    36          and count($_POST['cat_true']) > 0)
     53    and isset($_POST['cat_true'])
     54    and count($_POST['cat_true']) > 0)
    3755{
    3856  // if you forbid access to a category, all sub-categories become
    3957  // automatically forbidden
    4058  $subcats = get_subcat_ids($_POST['cat_true']);
    41   $query = 'DELETE FROM '.GROUP_ACCESS_TABLE.'
    42     WHERE group_id = '.$_POST['group_id'].'
    43     AND cat_id IN ('.implode(',', $subcats).');';
     59  $query = '
     60DELETE
     61  FROM '.GROUP_ACCESS_TABLE.'
     62  WHERE group_id = '.$page['group'].'
     63  AND cat_id IN ('.implode(',', $subcats).')
     64;';
    4465  pwg_query($query);
    4566}
    … …  
    5172  $private_uppercats = array();
    5273
    53   $query = 'SELECT id
    54     FROM '.CATEGORIES_TABLE.'
    55     WHERE id IN ('.implode(',', $uppercats).')
    56     AND status = \'private\';';
     74  $query = '
     75SELECT id
     76  FROM '.CATEGORIES_TABLE.'
     77  WHERE id IN ('.implode(',', $uppercats).')
     78  AND status = \'private\'
     79;';
    5780  $result = pwg_query($query);
    5881  while ($row = mysql_fetch_array($result))
    … …  
    6689  $authorized_ids = array();
    6790   
    68   $query = 'SELECT cat_id
     91  $query = '
     92SELECT cat_id
    6993  FROM '.GROUP_ACCESS_TABLE.'
    70   WHERE group_id = '.$_POST['group_id'].';';
     94  WHERE group_id = '.$page['group'].'
     95;';
    7196  $result = pwg_query($query);
    7297 
    … …  
    80105  foreach ($to_autorize_ids as $to_autorize_id)
    81106  {
    82     array_push($inserts, array('group_id' => $_POST['group_id'],
    83                                'cat_id' => $to_autorize_id));
     107    array_push(
     108      $inserts,
     109      array(
     110        'group_id' => $page['group'],
     111        'cat_id' => $to_autorize_id
     112        )
     113      );
    84114  }
    85115
    … …  
    87117}
    88118
    89 //----------------------------------------------------- template initialization
    90 $query = 'SELECT id,name FROM '.GROUPS_TABLE;
    91 $query.= ' ORDER BY id ASC;';
    92 $result = pwg_query( $query );
    93 $groups_display = '<select name="group_id">';
    94 $groups_nb=0;
    95 while ( $row = mysql_fetch_array( $result ) )
    96 {
    97   $groups_nb++;
    98   $selected = '';
    99   if (isset($_POST['group_id']) && $_POST['group_id']==$row['id'])
    100                 $selected = 'selected';
    101   $groups_display .= '<option value="' . $row['id'] . '" '.$selected.'>' . $row['name']  . '</option>';
    102 }
    103 $groups_display .= '</select>';
     119// +-----------------------------------------------------------------------+
     120// |                             template init                             |
     121// +-----------------------------------------------------------------------+
    104122
    105 $action = PHPWG_ROOT_PATH.'admin.php?page=group_perm';
    106 $template->set_filenames( array('groups'=>'admin/group_perm.tpl') );
    107 $template->assign_vars(array(
    108   'S_GROUP_SELECT'=>$groups_display,
    109   'L_GROUP_SELECT'=>$lang['group_list_title'],
    110   'L_LOOK_UP'=>$lang['edit'],
    111   'S_GROUP_ACTION'=>add_session_id($action)
    112   ));
     123$template->set_filenames(array('group_perm'=>'admin/cat_options.tpl'));
     124
     125$template->assign_vars(
     126  array(
     127    'L_RESET'=>$lang['reset'],
     128    'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
     129    'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
     130    'L_CAT_OPTIONS_INFO'=>$lang['permuser_info'],
     131   
     132    'F_ACTION' =>
     133    add_session_id(
     134      PHPWG_ROOT_PATH.
     135      'admin.php?page=group_perm&amp;group_id='.
     136      $page['group']
     137      )
     138    )
     139  );
    113140 
    114 if ($groups_nb)
    115 {
    116   $template->assign_block_vars('select_box',array());
    117 }
    118 
    119 if ( isset( $_POST['edit']) || isset($_POST['falsify']) || isset($_POST['trueify']))
    120 {
    121   $template->set_filenames(array('groups_auth'=>'admin/cat_options.tpl'));
    122   $template->assign_vars(array(
    123       'L_RESET'=>$lang['reset'],
    124       'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
    125       'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
    126       'L_CAT_OPTIONS_INFO'=>$lang['permuser_info'],
    127      
    128       'HIDDEN_NAME'=> 'group_id',
    129       'HIDDEN_VALUE'=>$_POST['group_id'],
    130       'F_ACTION' => add_session_id(PHPWG_ROOT_PATH.'admin.php?page=group_perm'),
    131   ));
    132  
    133   // only private categories are listed
    134   $query_true = '
     141// only private categories are listed
     142$query_true = '
    135143SELECT id,name,uppercats,global_rank
    136144  FROM '.CATEGORIES_TABLE.' INNER JOIN '.GROUP_ACCESS_TABLE.' ON cat_id = id
    137145  WHERE status = \'private\'
    138     AND group_id = '.$_POST['group_id'].'
     146    AND group_id = '.$page['group'].'
    139147;';
    140   display_select_cat_wrapper($query_true,array(),'category_option_true');
    141  
    142   $result = pwg_query($query_true);
    143   $authorized_ids = array();
    144   while ($row = mysql_fetch_array($result))
    145   {
    146     array_push($authorized_ids, $row['id']);
    147   }
    148  
    149   $query_false = '
     148display_select_cat_wrapper($query_true,array(),'category_option_true');
     149
     150$result = pwg_query($query_true);
     151$authorized_ids = array();
     152while ($row = mysql_fetch_array($result))
     153{
     154  array_push($authorized_ids, $row['id']);
     155}
     156
     157$query_false = '
    150158SELECT id,name,uppercats,global_rank
    151159  FROM '.CATEGORIES_TABLE.'
    152160  WHERE status = \'private\'';
    153   if (count($authorized_ids) > 0)
    154   {
    155     $query_false.= '
     161if (count($authorized_ids) > 0)
     162{
     163  $query_false.= '
    156164    AND id NOT IN ('.implode(',', $authorized_ids).')';
    157   }
    158   $query_false.= '
     165}
     166$query_false.= '
    159167;';
    160   display_select_cat_wrapper($query_false,array(),'category_option_false');
    161  
    162   $template->assign_var_from_handle('ADMIN_CONTENT_2', 'groups_auth');
    163 }
    164 //----------------------------------------------------------- sending html code
    165 $template->assign_var_from_handle('ADMIN_CONTENT', 'groups');
     168display_select_cat_wrapper($query_false,array(),'category_option_false');
     169
     170// +-----------------------------------------------------------------------+
     171// |                           html code display                           |
     172// +-----------------------------------------------------------------------+
     173
     174$template->assign_var_from_handle('ADMIN_CONTENT', 'group_perm');
    166175
    167176?>

  • trunk/admin/user_perm.php

    r709 r815  
    3232include_once(PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php');
    3333
    34 $userdata = array();
    35 if (isset($_POST['submituser']))
     34// +-----------------------------------------------------------------------+
     35// |                            variables init                             |
     36// +-----------------------------------------------------------------------+
     37
     38if (isset($_GET['user_id']) and is_numeric($_GET['user_id']))
    3639{
    37   $userdata = getuserdata($_POST['username']);
     40  $page['user'] = $_GET['user_id'];
    3841}
    39 else if (isset($_GET['user_id']))
     42else
    4043{
    41   $userdata = getuserdata(intval($_GET['user_id']));
     44  echo l10n('user_id URL parameter is missing');
     45  exit();
    4246}
    43 else if (isset($_POST['falsify'])
    44          and isset($_POST['cat_true'])
    45          and count($_POST['cat_true']) > 0)
     47
     48// +-----------------------------------------------------------------------+
     49// |                                updates                                |
     50// +-----------------------------------------------------------------------+
     51
     52if (isset($_POST['falsify'])
     53    and isset($_POST['cat_true'])
     54    and count($_POST['cat_true']) > 0)
    4655{
    47   $userdata = getuserdata(intval($_POST['userid']));
    4856  // if you forbid access to a category, all sub-categories become
    4957  // automatically forbidden
    … …  
    5159  $query = '
    5260DELETE FROM '.USER_ACCESS_TABLE.'
    53   WHERE user_id = '.$userdata['id'].'
     61  WHERE user_id = '.$page['user'].'
    5462    AND cat_id IN ('.implode(',', $subcats).')
    5563;';
    … …  
    6068         and count($_POST['cat_false']) > 0)
    6169{
    62   $userdata = getuserdata(intval($_POST['userid']));
    63    
    6470  $uppercats = get_uppercat_ids($_POST['cat_false']);
    6571  $private_uppercats = array();
    … …  
    8591SELECT cat_id
    8692  FROM '.USER_ACCESS_TABLE.'
    87   WHERE user_id = '.$userdata['id'].'
     93  WHERE user_id = '.$page['user'].'
    8894;';
    8995  $result = pwg_query($query);
    … …  
    98104  foreach ($to_autorize_ids as $to_autorize_id)
    99105  {
    100     array_push($inserts, array('user_id' => $userdata['id'],
     106    array_push($inserts, array('user_id' => $page['user'],
    101107                               'cat_id' => $to_autorize_id));
    102108  }
    … …  
    105111}
    106112//----------------------------------------------------- template initialization
    107 if (empty($userdata))
    108 {
    109   $template->set_filenames(array('user' => 'admin/user_perm.tpl'));
     113$template->set_filenames(array('user_perm'=>'admin/cat_options.tpl'));
    110114
    111   $base_url = PHPWG_ROOT_PATH.'admin.php?page=';
    112  
    113   $template->assign_vars(array(
    114     'L_SELECT_USERNAME'=>$lang['Select_username'],
    115     'L_LOOKUP_USER'=>$lang['Look_up_user'],
    116     'L_FIND_USERNAME'=>$lang['Find_username'],
    117     'L_AUTH_USER'=>$lang['permuser_only_private'],
    118     'L_SUBMIT'=>$lang['submit'],
     115$template->assign_vars(
     116  array(
     117    'L_RESET'=>$lang['reset'],
     118    'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
     119    'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
     120    'L_CAT_OPTIONS_INFO'=>$lang['permuser_info'],
     121   
     122    'F_ACTION' =>
     123      add_session_id(
     124        PHPWG_ROOT_PATH.
     125        'admin.php?page=user_perm'.
     126        '&amp;user_id='.$page['user']
     127        )
     128    )
     129  );
    119130
    120     'F_SEARCH_USER_ACTION' => add_session_id($base_url.'user_perm'),
    121     'U_SEARCH_USER' => add_session_id(PHPWG_ROOT_PATH.'admin/search.php')
    122     ));
    123 }
    124 else
    125 {
    126   $template->set_filenames(array('user'=>'admin/cat_options.tpl'));
    127   $template->assign_vars(
    128     array(
    129       'L_RESET'=>$lang['reset'],
    130       'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
    131       'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
    132       'L_CAT_OPTIONS_INFO'=>$lang['permuser_info'],
    133      
    134       'HIDDEN_NAME'=> 'userid',
    135       'HIDDEN_VALUE'=>$userdata['id'],
    136       'F_ACTION' => add_session_id(PHPWG_ROOT_PATH.'admin.php?page=user_perm'),
    137       ));
    138 
    139   // only private categories are listed
    140   $query_true = '
     131// only private categories are listed
     132$query_true = '
    141133SELECT id,name,uppercats,global_rank
    142134  FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_ACCESS_TABLE.' ON cat_id = id
    143135  WHERE status = \'private\'
    144     AND user_id = '.$userdata['id'].'
     136    AND user_id = '.$page['user'].'
    145137;';
    146   display_select_cat_wrapper($query_true,array(),'category_option_true');
     138display_select_cat_wrapper($query_true,array(),'category_option_true');
    147139 
    148   $result = pwg_query($query_true);
    149   $authorized_ids = array();
    150   while ($row = mysql_fetch_array($result))
    151   {
    152     array_push($authorized_ids, $row['id']);
    153   }
    154  
    155   $query_false = '
     140$result = pwg_query($query_true);
     141$authorized_ids = array();
     142while ($row = mysql_fetch_array($result))
     143{
     144  array_push($authorized_ids, $row['id']);
     145}
     146
     147$query_false = '
    156148SELECT id,name,uppercats,global_rank
    157149  FROM '.CATEGORIES_TABLE.'
    158150  WHERE status = \'private\'';
    159   if (count($authorized_ids) > 0)
    160   {
    161     $query_false.= '
     151if (count($authorized_ids) > 0)
     152{
     153  $query_false.= '
    162154    AND id NOT IN ('.implode(',', $authorized_ids).')';
    163   }
    164   $query_false.= '
     155}
     156$query_false.= '
    165157;';
    166   display_select_cat_wrapper($query_false,array(),'category_option_false');
    167 }
     158display_select_cat_wrapper($query_false,array(),'category_option_false');
     159
    168160//----------------------------------------------------------- sending html code
    169 $template->assign_var_from_handle('ADMIN_CONTENT', 'user');
     161
     162$template->assign_var_from_handle('ADMIN_CONTENT', 'user_perm');
    170163?>

  • trunk/doc/ChangeLog

    r814 r815  
     12005-08-16 Pierrick LE GALL
     2
     3        * modification : admin/group_list screen completely rewrite to
     4        present the list of existing groups and a form to add a new
     5        group. Here you can delete a group, go to permissions management
     6        for a group, go to member list of a group (on admin/user_list with
     7        a filter on group).
     8       
     9        * modification : admin/user_perm and admin/group_perm are not
     10        directly reachable by the admin menu anymore. Only the user/group
     11        list lets you reach user/group permissions management screen.
     12
    1132005-08-15 Pierrick LE GALL
    214

  • trunk/template/default/admin.tpl

    r814 r815  
    6363</ul>
    6464</div>
    65 <div class="titreMenu">{L_AUTH}</div>
    66 <div class="menu">
    67 <ul class="menu">
    68   <li><a class="adminMenu" href="{U_USERS_AUTH}">{L_USERS}</a></li>
    69   <li><a class="adminMenu" href="{U_GROUPS_AUTH}">{L_GROUPS}</a></li>
    70 </ul>
    71 </div>
    7265      </div>
    7366        </td>
    … …  
    9689  <!-- END infos -->
    9790  <div id="adminMain">
    98     {ADMIN_CONTENT}{ADMIN_CONTENT_2}
     91    {ADMIN_CONTENT}
    9992  </div>
    10093</div>

  • trunk/template/default/admin/cat_options.tpl

    r812 r815  
    22
    33<form method="post" action="{F_ACTION}">
    4   <input type="hidden" name="{HIDDEN_NAME}" value="{HIDDEN_VALUE}" />
    5 
    64  <table class="doubleSelect">
    75    <tr>

  • trunk/template/default/admin/group_list.tpl

    r792 r815  
    1 <form method="post" name="post" action="{S_GROUP_ACTION}">
    2 <div class="admin">{L_GROUP_SELECT}</div>
    3 <!-- BEGIN select_box -->
    4 {S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" />
    5 <input type="submit" name="delete" value="{L_GROUP_DELETE}" class="bouton" />
    6 <div style="vertical-align:middle;">
    7 <input type="checkbox" name="confirm_delete" value="1">{L_GROUP_CONFIRM}
    8 </div>
    9 <!-- END select_box -->
    10 <input type="text" name="newgroup">
    11 <input type="submit" class="bouton" name="new" value="{L_CREATE_NEW_GROUP}" />
    12 <br />
    13 <br />
    14 <!-- BEGIN edit_group -->
    15 <div class="admin">{L_GROUP_EDIT} [{edit_group.GROUP_NAME}]</div>
    16 <table class="table2" width="60%" style="margin-left:20%;">
    17 <tr class="throw">
    18     <th width="25%">{L_USER_NAME}</th>
    19           <th width="25%">{L_USER_EMAIL}</th>
    20     <th width="10%">{L_USER_SELECT}</th>
    21 </tr>
    22 <!-- BEGIN user -->
    23   <tr class="{edit_group.user.T_CLASS}">
    24     <td>{edit_group.user.NAME}</td>
    25     <td>{edit_group.user.EMAIL}</td>
    26           <td align="center"><input name="members[]" type="checkbox" value="{edit_group.user.ID}"></td>
     1<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
     2  <fieldset>
     3    <legend>{lang:Add group}</legend>
     4    <label>{lang:Group name} <input type="text" name="groupname" maxlength="50" size="20" /></label>
     5    <input type="submit" name="submit_add" value="{lang:Add}" />
     6  </fieldset>
     7</form>
     8
     9<table class="table2" style="width:100%;" >
     10  <tr class="throw">
     11    <th>{lang:Group name}</th>
     12    <th>{lang:Members}</th>
     13    <th>{lang:Actions}</th>
    2714  </tr>
    28 <!-- END user -->
    29 <tr>
    30   <td colspan="3" align="right" valign="middle">
    31     <input type="submit" name="deny_user" value="{L_DENY_SELECTED}" class="bouton" />
    32   </td>
    33 </tr>
     15  <!-- BEGIN group -->
     16  <tr class="{group.CLASS}">
     17    <td>{group.NAME}</td>
     18    <td><a href="{group.U_MEMBERS}">{group.MEMBERS}</a></td>
     19    <td style="text-align:center;">
     20      <a href="{group.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="permissions" title="{lang:permissions}" /></a>
     21      <a href="{group.U_DELETE}"><img src="./template/default/theme/delete.png" style="border:none" alt="delete" title="{lang:delete}" /></a>
     22    </td>
     23  </tr>
     24  <!-- END group -->
    3425</table>
    35 <div align="left" style="margin-left:20%;">
    36 <input type="text" name="username" maxlength="50" size="20" />
    37 <input type="submit" name="add" value="{L_ADD_MEMBER}" class="bouton" />
    38 <input name="edit_group_id" type="hidden" value="{edit_group.GROUP_ID}">
    39 <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
    40 </div>
    41 <br />
    42 <!-- END edit_group -->
    43 </form>

  • trunk/template/default/admin/user_list.tpl

    r808 r815  
    1 <div class="admin">{L_GROUP_ADD_USER}</div>
    2 
    3 <form method="post" name="add_user" action="{F_ADD_ACTION}">
    4 <div style="text-align:center">
    5   {L_USERNAME} <input type="text" name="login" maxlength="50" size="20" />
    6   {L_PASSWORD} <input type="text" name="password" />
    7   <input type="submit" name="submit_add" value="{L_SUBMIT}" class="bouton" />
    8 </div>
     1<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
     2  <fieldset>
     3    <legend>{lang:Add a user}</legend>
     4    <label>{L_USERNAME} <input type="text" name="login" maxlength="50" size="20" /></label>
     5    <label>{L_PASSWORD} <input type="text" name="password" /></label>
     6    <input type="submit" name="submit_add" value="{L_SUBMIT}" class="bouton" />
     7  </fieldset>
    98</form>
    10 
    11 <div class="admin">{L_USERS_LIST}</div>
    129
    1310<form class="filter" method="get" name="filter" action="{F_FILTER_ACTION}">
Note: See TracChangeset for help on using the changeset viewer.