[Fusionforge-commits] r10725 - in trunk/src: common/widget www/admin

Roland Mas lolando at libremir.placard.fr.eu.org
Sun Sep 26 18:52:45 CEST 2010


Author: lolando
Date: 2010-09-26 18:52:45 +0200 (Sun, 26 Sep 2010)
New Revision: 10725

Modified:
   trunk/src/common/widget/Widget_MyAdmin.class.php
   trunk/src/www/admin/index.php
   trunk/src/www/admin/userlist.php
Log:
Pending users list: fix link in widget, add in /admin/

Modified: trunk/src/common/widget/Widget_MyAdmin.class.php
===================================================================
--- trunk/src/common/widget/Widget_MyAdmin.class.php	2010-09-26 16:49:30 UTC (rev 10724)
+++ trunk/src/common/widget/Widget_MyAdmin.class.php	2010-09-26 16:52:45 UTC (rev 10725)
@@ -46,7 +46,7 @@
 		
 		$html_my_admin .= $this->_get_admin_row(
 			$i++, 
-			vsprintf(_('Users in <a href="%s"><B>P</B> (pending) Status</a>'), array("/admin/approve_pending_users.php?page=pending")),
+			vsprintf(_('Users in <a href="%s"><B>P</B> (pending) Status</a>'), array("/admin/userlist.php?status=P")),
 			$pending_users,
 			$this->_get_color($pending_users)
 			);

Modified: trunk/src/www/admin/index.php
===================================================================
--- trunk/src/www/admin/index.php	2010-09-26 16:49:30 UTC (rev 10724)
+++ trunk/src/www/admin/index.php	2010-09-26 16:52:45 UTC (rev 10725)
@@ -76,6 +76,7 @@
     echo _('Register a New User');
     ?></a>
     </li>
+	<li><a href="userlist.php?status=P"><?php echo _('Pending users'); ?></a></li>
 </ul>
 <?php if (USE_PFO_RBAC) { ?>
 <h2><?php echo _('Global roles and permissions'); ?></h2>
@@ -140,7 +141,7 @@
 </ul>
 <ul>
 	<li><?php echo util_make_link ('/register/',_('Register New Project')); ?></li>
-	<li><?php echo _('Projects with status'); ?> <a href="approve-pending.php"><?php echo _('Pending (P)'); ?> <em><?php echo _('(New Project Approval)'); ?></em></a></li>
+	<li><a href="approve-pending.php"><?php echo _('Pending projects (new project approval)'); ?></a></li>
 	<li><form name="projectsearch" action="search.php">
 	<?php echo _('Projects with status'); ?>
 	<select name="status">

Modified: trunk/src/www/admin/userlist.php
===================================================================
--- trunk/src/www/admin/userlist.php	2010-09-26 16:49:30 UTC (rev 10724)
+++ trunk/src/www/admin/userlist.php	2010-09-26 16:52:45 UTC (rev 10725)
@@ -118,7 +118,8 @@
 
 $group_id = getIntFromRequest('group_id');
 $action = getStringFromRequest('action');
-$user_id = getStringFromRequest('user_id');
+$user_id = getIntFromRequest('user_id');
+$status = getStringFromRequest('status');
 
 if ($action=='delete') {
 	performAction('D', "DELETED", $user_id);
@@ -145,6 +146,9 @@
 	if ($user_name_search) {
 		$res = db_query_params ('SELECT user_id FROM users WHERE lower(user_name) LIKE $1 OR lower(lastname) LIKE $1 ORDER BY realname',
 					   array (strtolower("$user_name_search%")));
+	} elseif ($status) {
+		$res = db_query_params ('SELECT user_id FROM users WHERE status = $1 ORDER BY realname',
+					   array ($status));
 	} else {
 		$sortorder = getStringFromRequest('sortorder', 'realname');
 		util_ensure_value_in_set ($sortorder,




More information about the Fusionforge-commits mailing list