[geeklog-cvs] geeklog-1.3/public_html/admin group.php,1.42,1.43 user.php,1.90,1.91
blaine at iowaoutdoors.org
blaine at iowaoutdoors.org
Fri Mar 25 16:47:29 EST 2005
Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv21845/public_html/admin
Modified Files:
group.php user.php
Log Message:
Ehanced User and Group Admin screens. Added ability to sort user listing by headings (ascending or descending).
Edit Group - users membership now shows group being edited.
Index: group.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/group.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** group.php 19 Oct 2004 10:52:48 -0000 1.42
--- group.php 25 Mar 2005 21:47:27 -0000 1.43
***************
*** 519,522 ****
--- 519,523 ----
$result = DB_query("SELECT * FROM {$_TABLES['groups']}");
$nrows = DB_numRows($result);
+ $rowid = 0;
for ($i = 0; $i < $nrows; $i++) {
$A = DB_fetchArray ($result);
***************
*** 531,536 ****
--- 532,539 ----
$group_templates->set_var ('group_description', $A['grp_descr']);
$group_templates->set_var ('group_core', $core);
+ $group_templates->set_var ('cssid', ($rowid%2)+1);
$group_templates->set_var ('lang_list', $LANG_ACCESS['listthem']);
$group_templates->parse ('group_row', 'row', true);
+ $rowid++;
}
}
***************
*** 649,652 ****
--- 652,656 ----
$user_templates->set_var ('user_fullname', $A['fullname']);
$user_templates->set_var ('user_email', $A['email']);
+ $user_templates->set_var ('cssid', ($i%2)+1);
$user_templates->parse ('user_row', 'row', true);
}
***************
*** 700,703 ****
--- 704,708 ----
$thisUsersGroups = SEC_getUserGroups ();
+ $groupName = DB_getItem($_TABLES['groups'],'grp_name',"grp_id='$group'");
if (!empty ($group) && ($group > 0) &&
!in_array ($group, $thisUsersGroups)) {
***************
*** 716,720 ****
}
! $retval .= COM_startBlock ($LANG_ACCESS['usergroupadmin'] , '',
COM_getBlockTemplate ('_admin_block', 'header'));
$groupmembers = new Template($_CONF['path_layout'] . 'admin/group');
--- 721,725 ----
}
! $retval .= COM_startBlock ($LANG_ACCESS['usergroupadmin'] . " - $groupName" , '',
COM_getBlockTemplate ('_admin_block', 'header'));
$groupmembers = new Template($_CONF['path_layout'] . 'admin/group');
Index: user.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/user.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** user.php 25 Mar 2005 21:34:08 -0000 1.90
--- user.php 25 Mar 2005 21:47:27 -0000 1.91
***************
*** 432,436 ****
function listusers ($offset, $curpage, $query = '', $query_limit = 50)
{
! global $_CONF, $_TABLES, $LANG28;
$retval = '';
--- 432,436 ----
function listusers ($offset, $curpage, $query = '', $query_limit = 50)
{
! global $_CONF, $_TABLES, $LANG28, $order,$prevorder,$direction;
$retval = '';
***************
*** 457,460 ****
--- 457,494 ----
$user_templates->set_var('lang_emailaddress', $LANG28[7]);
+ if ($prevorder != $order) {
+ $direction = 'desc';
+ }
+ switch($order) {
+ case 1:
+ $orderby = 'uid';
+ break;
+ case 2:
+ $orderby = 'username';
+ break;
+ case 3:
+ $orderby = 'fullname';
+ break;
+ case 4:
+ $orderby = 'email';
+ break;
+ default:
+ $orderby = 'uid';
+ $order = 1;
+ break;
+ }
+ if ($direction == "asc") {
+ $prevdirection = 'asc';
+ $direction = 'desc';
+ $user_templates->set_var ('img_arrow'.$order, ' <img src="'.$_CONF['layout_url'] .'/images/bararrowup.gif" border="0">');
+ } else {
+ $prevdirection = 'desc';
+ $direction = 'asc';
+ $user_templates->set_var ('img_arrow'.$order, ' <img src="'.$_CONF['layout_url'] .'/images/bararrowdown.gif" border="0">');
+ }
+
+ $user_templates->set_var ('direction', $direction);
+ $user_templates->set_var ('page', $page);
+ $user_templates->set_var ('prevorder', $order);
if (empty($query_limit)) {
$limit = 50;
***************
*** 462,465 ****
--- 496,505 ----
$limit = $query_limit;
}
+ if ($query != '') {
+ $user_templates->set_var ('query', urlencode($query) );
+ } else {
+ $user_templates->set_var ('query', '');
+ }
+ $user_templates->set_var ('query_limit', $query_limit);
$user_templates->set_var($limit . '_selected', 'selected="selected"');
***************
*** 479,485 ****
if (!empty($query)) {
! $sql = "SELECT uid,username,fullname,email FROM {$_TABLES['users']} WHERE uid > 1 AND (username LIKE '$query' OR email LIKE '$query' OR fullname LIKE '$query') ORDER BY uid LIMIT $offset,$limit";
} else {
! $sql = "SELECT uid,username,fullname,email FROM {$_TABLES['users']} WHERE uid > 1 ORDER BY uid LIMIT $offset,$limit";
}
$result = DB_query($sql);
--- 519,525 ----
if (!empty($query)) {
! $sql = "SELECT uid,username,fullname,email FROM {$_TABLES['users']} WHERE uid > 1 AND (username LIKE '$query' OR email LIKE '$query' OR fullname LIKE '$query') ORDER BY $orderby $direction LIMIT $offset,$limit";
} else {
! $sql = "SELECT uid,username,fullname,email FROM {$_TABLES['users']} WHERE uid > 1 ORDER BY $orderby $direction LIMIT $offset,$limit ";
}
$result = DB_query($sql);
***************
*** 492,502 ****
$user_templates->set_var('user_fullname', $A['fullname']);
$user_templates->set_var('user_email', $A['email']);
$user_templates->parse('user_row', 'row', true);
}
if (!empty($query)) {
$query = str_replace('%','*',$query);
! $base_url = $_CONF['site_admin_url'] . '/user.php?q=' . urlencode($query) . '&query_limit=' . $query_limit;
} else {
! $base_url = $_CONF['site_admin_url'] . '/user.php?query_limit=' . $query_limit;
}
--- 532,543 ----
$user_templates->set_var('user_fullname', $A['fullname']);
$user_templates->set_var('user_email', $A['email']);
+ $user_templates->set_var ('cssid', ($i%2)+1);
$user_templates->parse('user_row', 'row', true);
}
if (!empty($query)) {
$query = str_replace('%','*',$query);
! $base_url = $_CONF['site_admin_url'] . '/user.php?q=' . urlencode($query) . "&query_limit={$query_limit}&order={$order}&prevorder={$prevorder}&direction={$prevdirection}";
} else {
! $base_url = $_CONF['site_admin_url'] . "/user.php?query_limit={$query_limit}&order={$order}&prevorder={$prevorder}&direction={$prevdirection}";
}
***************
*** 689,692 ****
--- 730,741 ----
}
+ if (isset ($_REQUEST['order'])) {
+ $order = COM_applyFilter ($_REQUEST['order'],true);
+ }
+
+ if (isset ($_GET['direction'])) {
+ $direction = COM_applyFilter ($_GET['direction']);
+ }
+
if (($mode == $LANG28[19]) && !empty ($LANG28[19])) { // delete
$uid = COM_applyFilter ($_POST['uid'], true);
More information about the geeklog-cvs
mailing list