[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php |
|
Date: |
Thu, 23 Mar 2006 21:34:42 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: admin
Branch:
Changes by: Dave Hall <address@hidden> 06/03/23 21:34:42
Modified files:
inc : class.uiaccounts.inc.php
Log message:
fix up the ui bits i broke and some other minor fixes, bo will be done
2moro nite, too tired to follow it all now
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.uiaccounts.inc.php.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
Patches:
Index: admin/inc/class.uiaccounts.inc.php
diff -u admin/inc/class.uiaccounts.inc.php:1.56
admin/inc/class.uiaccounts.inc.php:1.57
--- admin/inc/class.uiaccounts.inc.php:1.56 Wed Mar 22 13:27:05 2006
+++ admin/inc/class.uiaccounts.inc.php Thu Mar 23 21:34:42 2006
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.uiaccounts.inc.php,v 1.56 2006/03/22 13:27:05 skwashd Exp
$ */
+ /* $Id: class.uiaccounts.inc.php,v 1.57 2006/03/23 21:34:42 skwashd Exp
$ */
class uiaccounts
{
@@ -77,6 +77,8 @@
{
$sort = 'ASC';
}
+
+ $total = 0;
$query = isset($_POST['query']) ? $_POST['query'] : '';
@@ -190,23 +192,16 @@
{
$sort = 'ASC';
}
+
+ $total = 0;
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . lang('list users');
$GLOBALS['phpgw']->xslttpl->add_file('users');
-/* the same like in groups... we really should remove this... :) [ceb] */
-
- if
($GLOBALS['phpgw']->acl->check('account_access',2,'admin'))
- {
- $account_info =
$GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$GLOBALS['query'],$total);
- $total = $GLOBALS['phpgw']->accounts->total;
- }
- else
- {
- $account_info =
$GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$GLOBALS['query'],$total);
- $total = $GLOBALS['phpgw']->accounts->total;
- }
+ // FIXME $GLOBALS[query] wtf? skwashd Mar-2005
+ $account_info =
$GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$GLOBALS['query'],$total);
+ $total = $GLOBALS['phpgw']->accounts->total;
$link_data = array
(
@@ -367,10 +362,10 @@
// this information should be provided by the app itself
$apps_with_acl = array
(
- 'addressbook' => array('top_grant'
=>True),
+ 'addressbook' => array('top_grant' =>True),
'bookmarks' => array('top_grant'
=>True),
'calendar' => array('top_grant'
=>True),
- 'filemanager' => array('top_grant'
=>True),
+ 'filemanager' => array('top_grant' =>True),
'hrm' => array('top_grant'
=>False),
'img' => array('top_grant'
=>True),
'infolog' => array('top_grant'
=>True),
@@ -378,7 +373,7 @@
'netsaint' => array('top_grant'
=>True),
'notes' => array('top_grant'
=>True),
'phonelog' => array('top_grant'
=>True),
- 'phpwebhosting' => array('top_grant'
=>True),
+ 'phpwebhosting' => array('top_grant' =>True),
'projects' => array('top_grant'
=>True),
'property' => array('top_grant'
=>False),
'todo' => array('top_grant'
=>True),
@@ -412,9 +407,9 @@
$app_list[] = array
(
'acl_url' =>
(isset($apps_with_acl[$app]) && $account_id)
-
? $GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'preferences.uiaclprefs.index',
+
? $GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'preferences.uiadmin_acl.list_acl',
'acl_app' => $app,
-
'owner' =>$account_id)) : '',
+
'granting_group'=> $account_id)) : '',
'acl_img' =>
$GLOBALS['phpgw']->common->image('admin','dot', '.png', false),
'app_name' => $app,
'app_title' =>
lang($app),