phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php class.uiacco...


From: Caeies
Subject: [Phpgroupware-cvs] admin/inc class.boaccounts.inc.php class.uiacco...
Date: Mon, 02 Oct 2006 10:23:27 +0000

CVSROOT:        /sources/phpgroupware
Module name:    admin
Changes by:     Caeies <Caeies> 06/10/02 10:23:27

Modified files:
        inc            : class.boaccounts.inc.php 
                         class.uiaccounts.inc.php 

Log message:
        various fixes from E_ALL to account_expires not saved, and link using 
array ...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.boaccounts.inc.php?cvsroot=phpgroupware&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uiaccounts.inc.php?cvsroot=phpgroupware&r1=1.65&r2=1.66

Patches:
Index: class.boaccounts.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- class.boaccounts.inc.php    5 Sep 2006 10:04:01 -0000       1.53
+++ class.boaccounts.inc.php    2 Oct 2006 10:23:27 -0000       1.54
@@ -9,7 +9,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: class.boaccounts.inc.php,v 1.53 2006/09/05 10:04:01 skwashd Exp 
$ */
+       /* $Id: class.boaccounts.inc.php,v 1.54 2006/10/02 10:23:27 Caeies Exp 
$ */
 
        //FIXME define constants for rights so we can fuck all these magic 
numbers
        
@@ -105,11 +105,11 @@
                                
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
                        }
 
-                       $old_group =& CreateObject('phpgwapi.accounts', 
$values['account_id'], 'g');
+                       $old_group = CreateObject('phpgwapi.accounts', 
$values['account_id'], 'g');
                        $old_group->read_repository();                  
                        $old_group->member($old_group->account_id);
                        
-                       $new_group =& CreateObject('phpgwapi.accounts', 
$values['account_id'], 'g');
+                       $new_group = CreateObject('phpgwapi.accounts', 
$values['account_id'], 'g');
                        $new_group->read_repository();
                        $new_group->firstname = $values['account_name'];
 
@@ -148,7 +148,7 @@
                        $GLOBALS['phpgw']->db->unlock();                        
                                                                                
                 
 
                        // get all new applications for this group
-                       $apps =& CreateObject('phpgwapi.applications', 
$values['account_id']);
+                       $apps = CreateObject('phpgwapi.applications', 
$values['account_id']);
                        $old_apps = array_keys($apps->read());   
                        foreach($values['account_apps'] as $key => $value)
                        {
@@ -161,7 +161,7 @@
 
                        // members handling
                        // Add new members to group
-                       $acl =& CreateObject('phpgwapi.acl', 
$values['account_id']);
+                       $acl = CreateObject('phpgwapi.acl', 
$values['account_id']);
                        $old_group_list = $old_group->get_members();
                        for($i = 0; $i < count($values['account_user']); $i++)
                        {
@@ -240,7 +240,7 @@
                {
                        if (is_array($values))
                        {
-                               if($values['expires_never'])
+                               if(isset($values['expires_never']) && 
$values['expires_never'])
                                {
                                        $values['expires'] = 
$values['account_expires'] = -1;
                                }
@@ -263,8 +263,8 @@
                                        'account_passwd_2'              => 
$values['account_passwd_2'],
                                        'groups'                                
=> $values['account_groups'],
                                        'account_permissions'   => 
$values['account_permissions'],
-                                       'homedirectory'                 => 
$values['homedirectory'],
-                                       'loginshell'                    => 
$values['loginshell'],
+                                       'homedirectory'                 => 
isset($values['homedirectory']) ? $values['homedirectory'] : '',
+                                       'loginshell'                    => 
isset($values['loginshell']) ? $values['loginshell'] : '',
                                        'account_expires_month' => 
$values['account_expires_month'],
                                        'account_expires_day'   => 
$values['account_expires_day'],
                                        'account_expires_year'  => 
$values['account_expires_year'],
@@ -281,7 +281,7 @@
 
                                        if ($userData['passwd'])
                                        {
-                                               $auth =& 
CreateObject('phpgwapi.auth');
+                                               $auth = 
CreateObject('phpgwapi.auth');
                                                
$auth->change_password($old_passwd,$userData['passwd'],$userData['account_id']);
                                                
$GLOBALS['hook_values']['account_id'] = $userData['account_id'];
                                                
$GLOBALS['hook_values']['old_passwd'] = $old_passwd;
@@ -289,7 +289,7 @@
                                                
$GLOBALS['phpgw']->hooks->process('changepassword');
                                        }
                                        
-                                       
$GLOBALS['phpgw']->session->delete_cache(intval($userData['id']));
+                                       
$GLOBALS['phpgw']->session->delete_cache(intval($userData['account_id']));
                                        /* check if would create a menu
                                        // if we do, we can't return to the 
users list, because
                                        // there are also some other plugins
@@ -320,7 +320,7 @@
                        }
                        elseif($_POST['submit'])
                        {
-                               $acl =& 
CreateObject('phpgwapi.acl',intval($_POST['account_id']));
+                               $acl = 
CreateObject('phpgwapi.acl',intval($_POST['account_id']));
                                
                                $users = 
$GLOBALS['phpgw']->accounts->member($_POST['account_id']);
                                @reset($users);
@@ -342,7 +342,7 @@
 
                function validate_group($values)
                {
-                       $group =& 
CreateObject('phpgwapi.accounts',$values['account_id'],'g');
+                       $group = 
CreateObject('phpgwapi.accounts',$values['account_id'],'g');
                        $group->read_repository();
 
                        if ( $values['account_id'] == 0 && 
$GLOBALS['phpgw']->acl->check('group_access', PHPGW_ACL_ADD,'admin'))
@@ -381,7 +381,8 @@
                */
                function validate_user($values)
                {
-                       if (!$values['account_id'] && 
$GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
+                       $error = array();
+                       if ( !(isset($values['account_id']) && 
$values['account_id']) && 
$GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
                        {
                                $error[] = lang('no permission to add users');
                        }
@@ -453,7 +454,7 @@
                        }
                */
 
-                       if (is_array($error))
+                       if (is_array($error) && count($error) != 0)
                        {
                                return $error;
                        }
@@ -575,7 +576,7 @@
                        $account_apps = array();
                        if($account_id)
                        {
-                               $apps =& CreateObject('phpgwapi.applications', 
$account_id);
+                               $apps = CreateObject('phpgwapi.applications', 
$account_id);
                                $group_apps = $apps->read_account_specific();
 
                                foreach ( $group_apps as $app )
@@ -633,7 +634,7 @@
 
                        if($id && is_array($modules) )
                        {
-                               $apps =& CreateObject('phpgwapi.applications', 
$id);
+                               $apps = CreateObject('phpgwapi.applications', 
$id);
                                foreach ( $modules as $app_name => $app_status 
) 
                                {
                                        if ( $app_status )
@@ -647,7 +648,7 @@
                
                function set_groups2account($id, $groups)
                {
-                       $account =& CreateObject('phpgwapi.accounts', $id, 'u');
+                       $account = CreateObject('phpgwapi.accounts', $id, 'u');
                        $allGroups = $account->get_list('groups');
                        if ( is_array($groups) )
                        {
@@ -661,7 +662,7 @@
                                $groups = array();
                        }
 
-                       $acl =& CreateObject('phpgwapi.acl',$id);
+                       $acl = CreateObject('phpgwapi.acl',$id);
                        while (list($key,$groupData) = each($allGroups)) 
                        {
                                if (in_array($groupData['account_id'], 
$groups)) 

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- class.uiaccounts.inc.php    5 Sep 2006 12:32:21 -0000       1.65
+++ class.uiaccounts.inc.php    2 Oct 2006 10:23:27 -0000       1.66
@@ -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.65 2006/09/05 12:32:21 skwashd Exp 
$ */
+       /* $Id: class.uiaccounts.inc.php,v 1.66 2006/10/02 10:23:27 Caeies Exp 
$ */
 
        class uiaccounts
        {
@@ -116,11 +116,11 @@
                        {
                                $group_data[] = Array
                                (
-                                       'edit_url'                              
        => 
($this->bo->check_rights('edit')?$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_group&account_id='
 . $account['account_id']):''),
+                                       'edit_url'                              
        => 
($this->bo->check_rights('edit')?$GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'admin.uiaccounts.edit_group', 'account_id'=> 
$account['account_id'])):''),
                                        'lang_edit'                             
        => ($this->bo->check_rights('edit')?lang('edit'):''),
                                        'lang_edit_statustext'          => 
($this->bo->check_rights('edit')?lang('edit this group'):''),
                                        'group_name'                            
=> (!$account['account_lid']?'':$account['account_lid']),
-                                       'delete_url'                            
=> 
($this->bo->check_rights('delete')?$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group&account_id='
 . $account['account_id']):''),
+                                       'delete_url'                            
=> ($this->bo->check_rights('delete')?$GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => 'admin.uiaccounts.delete_group', 'account_id' 
=>$account['account_id'])):''),
                                        'lang_delete_statustext'        => 
($this->bo->check_rights('delete')?lang('delete this group'):''),
                                        'lang_delete'                           
=> ($this->bo->check_rights('delete')?lang('delete'):'')
                                );
@@ -130,7 +130,7 @@
                        (
                                'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a group'),
-                               'action_url'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
+                               'action_url'                    => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction' => 
'admin.uiaccounts.list_groups')),
                                'lang_done'                             => 
lang('done'),
                                'lang_done_statustext'  => lang('return to 
admin mainscreen'),
                                'add_access'                    => 
($this->bo->check_rights('add')?'yes':''),
@@ -161,12 +161,12 @@
                        if ( (isset($_POST['done']) && $_POST['done']) 
                                || 
$GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
                        {
-                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uimainscreen.mainscreen');
+                               
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction' => 
'admin.uimainscreen.mainscreen'));
                        }
 
                        if ( isset($_POST['add']) && $_POST['add'] )
                        {
-                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.edit_user');
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'admin.uiaccounts.edit_user'));
                        }
 
                        if($param_cd)
@@ -272,7 +272,7 @@
                        (
                                'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a user'),
-                               'action_url'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'),
+                               'action_url'                    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiaccounts.list_users')),
                                'lang_done'                             => 
lang('done'),
                                'lang_done_statustext'  => lang('return to 
admin mainscreen'),
                                'add_access'                    => 
($this->bo->check_rights('add','account_access')?'yes':''),
@@ -307,7 +307,7 @@
 
                        if ( (isset($values['cancel']) && $values['cancel']) || 
(!$account_id && $GLOBALS['phpgw']->acl->check('group_access',4,'admin')) || 
($account_id && $GLOBALS['phpgw']->acl->check('group_access',16,'admin')))
                        {
-                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'admin.uiaccounts.list_groups'));
                        }
 
                        //echo 'POST variables<pre>' . print_r($values, true) . 
'</pre>';
@@ -355,7 +355,7 @@
                        $js =& $GLOBALS['phpgw']->js;
                        $js->validate_file('base', 'groups', 'admin');
 
-                       $group =& CreateObject('phpgwapi.accounts', 
$account_id, 'g');
+                       $group = createObject('phpgwapi.accounts', $account_id, 
'g');
                        $group->read_repository();
                        $group->member($account_id);
                        $group_members = $group->get_members();
@@ -500,13 +500,17 @@
                        $values['old_loginid']         = get_var('old_loginid', 
array('GET'));
                        $values['account_groups']      = 
get_var('account_groups',array('POST'));
                        $values['account_permissions'] = 
get_var('account_permissions',array('POST'));
+                       //XXX Caeies fix waiting for JSCAL
+                       $values['account_expires_year']= 
get_var('account_expires_year', array('POST'));
+                       $values['account_expires_month']= 
get_var('account_expires_month', array('POST'));
+                       $values['account_expires_day'] = 
get_var('account_expires_day', array('POST'));
 
-                       if ($values['cancel'] || (!$account_id && 
$GLOBALS['phpgw']->acl->check('account_access',4,'admin')) || ($account_id && 
$GLOBALS['phpgw']->acl->check('account_access',16,'admin')))
+                       if ( (isset($values['cancel']) && $values['cancel']) || 
(!$account_id && $GLOBALS['phpgw']->acl->check('account_access',4,'admin')) || 
($account_id && $GLOBALS['phpgw']->acl->check('account_access',16,'admin')))
                        {
-                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_users');
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'admin.uiaccounts.list_users'));
                        }
-
-                       if ($values['save'])
+                       $error_list = '';
+                       if (isset($values['save']) && $values['save'])
                        {
                                $error = $this->bo->validate_user($values);
 
@@ -521,22 +525,24 @@
                                                $values['account_id'] = 
$account_id;
                                        }
                                        $this->bo->save_user($values);
-                                       
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_users');
+                                       
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
'admin.uiaccounts.list_users'));
                                }
                        }
 
-                       $sbox =& CreateObject('phpgwapi.sbox');
+                       $sbox = CreateObject('phpgwapi.sbox');
 
+                       /* XXX Caeies And ?
                        if 
($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'] && 
($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap'))
                        {
                        }
-
-                       print_debug('Type : 
'.gettype($_userData).'<br>_userData(size) = 
"'.$_userData.'"('.strlen($_userData).')');
+                        */
+                       //XXX Caeies Where does that comes from ???
+                       //print_debug('Type : 
'.gettype($_userData).'<br>_userData(size) = 
"'.$_userData.'"('.strlen($_userData).')');
 
                        $GLOBALS['phpgw']->xslttpl->add_file('users');
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('administration') . ': ' . ($account_id?lang('edit user 
account'):lang('add user account'));
 
-                       $acl =& createObject('phpgwapi.acl', $account_id);
+                       $acl = createObject('phpgwapi.acl', $account_id);
                        if ($account_id)
                        {
                                $user_info = array
@@ -549,7 +555,7 @@
 
                        if($account_id)
                        {
-                               $account =& 
CreateObject('phpgwapi.accounts',intval($account_id),'u');
+                               $account = 
createObject('phpgwapi.accounts',intval($account_id),'u');
                                $userData = $account->read_repository();
                                $userGroups = $account->membership($account_id);
                                $userData['anonymous'] = 
$acl->check('anonymous', 1, 'phpgwapi');
@@ -558,7 +564,7 @@
                        }
                        else
                        {
-                               $account =& CreateObject('phpgwapi.accounts');
+                               $account = createObject('phpgwapi.accounts');
                                $userData = Array();
                                $userData['status'] = 'A';
                                $userData['anonymous'] = false;
@@ -581,7 +587,11 @@
                                $userData['account_expires_year']  = 
date('Y',$userData['expires'] > 0 ? $userData['expires'] : $time_var);
                        }
 
-                       if 
($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'])
+                       $homedirectory = '';
+                       $loginshell = '';
+                       $lang_homedir  = '';
+                       $lang_shell = '';
+                       if 
(isset($GLOBALS['phpgw_info']['server']['ldap_extra_attributes']) && 
!empty($GLOBALS['phpgw_info']['server']['ldap_extra_attributes']))
                        {
                                $lang_homedir   = lang('home directory');
                                $lang_shell             = lang('login shell');
@@ -593,7 +603,7 @@
                                        . '">';
                        }
                        
-                       $add_masters= 
$GLOBALS['phpgw']->acl->get_ids_for_location('addressmaster',7,'addressbook');
+                       $add_masters    = 
$GLOBALS['phpgw']->acl->get_ids_for_location('addressmaster',7,'addressbook');
                        $add_users      = 
$GLOBALS['phpgw']->accounts->return_members($add_masters);
                        $masters        = $add_users['users'];
 
@@ -606,7 +616,7 @@
                                        (
                                                'menuaction'    => 
'addressbook.uiaddressbook.edit_person',
                                                'ab_id'         => 
$userData['person_id'],
-                                               'referer'       => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiaccounts.edit_user', 'account_id' =>  $_account_id) )  
+                                               'referer'       => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiaccounts.edit_user', 'account_id' =>  $account_id) )  
                                        ));
                                }
                                else
@@ -622,7 +632,7 @@
                                (
                                        'menuaction'    => 
'admin.uiaclmanager.edit_addressmasters',
                                        'account_id'    => 
$GLOBALS['phpgw_info']['user']['account_id'],
-                                       'referer'       => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiaccounts.edit_user', 'account_id' =>  $_account_id) )
+                                       'referer'       => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiaccounts.edit_user', 'account_id' =>  $account_id) )
                                ));
                        }
                        
@@ -682,7 +692,7 @@
 
                        /* create list of available apps */
                        $i = 0;
-                       $apps =& 
CreateObject('phpgwapi.applications',$account_id);
+                       $apps = 
createObject('phpgwapi.applications',$account_id);
                        $db_perms = $apps->read_account_specific();
 
                        $available_apps = $GLOBALS['phpgw_info']['apps'];
@@ -699,14 +709,14 @@
 
                        /* create apps output */
                        $appRightsOutput = '';
-//                     @reset($perm_display);
+                       //@reset($perm_display);
                        for ($i=0;$i<count($perm_display);$i++) 
                        {
                                $app_list[] = array
                                (
                                        'app_title'             => 
$perm_display[$i]['translatedName'],
                                        'checkbox_name' => 
'account_permissions[' . $perm_display[$i]['appName'] . ']',
-                                       'checked'               => 
($userData['account_permissions'][$perm_display[$i]['appName']] || 
$db_perms[$perm_display[$i]['appName']]? '1' : '0')
+                                       'checked'               => ( 
(isset($userData['account_permissions']) && 
$userData['account_permissions'][$perm_display[$i]['appName']]) || 
(isset($db_perms[$perm_display[$i]['appName']]) && 
$db_perms[$perm_display[$i]['appName']])? '1' : '0')
                                );
                        }
 
@@ -746,8 +756,8 @@
                                'account_status'                => 
($userData['status']?'yes':''),
                                'account_firstname'             => 
$userData['account_firstname'],
                                'account_lastname'              => 
$userData['account_lastname'],
-                               'account_passwd'                => 
$account_passwd,
-                               'account_passwd_2'              => 
$account_passwd_2,
+                               'account_passwd'                => '',
+                               'account_passwd_2'              => '',
                                'account_quota'                 => 
$userData['quota'],
                                'anonymous'                             => 
(int) $userData['anonymous'],
                                'changepassword'                => (int) 
$userData['changepassword'],
@@ -759,7 +769,7 @@
                        );
 
                        /* create the menu on the left, if needed
-                       $menuClass =& CreateObject('admin.uimenuclass');
+                       $menuClass = CreateObject('admin.uimenuclass');
                        This is now using ExecMethod()
                        
$t->set_var('rows',ExecMethod('admin.uimenuclass.createHTMLCode','edit_user')); 
*/
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('account_edit' => $data));
@@ -773,7 +783,7 @@
                                return false;
                        }
 
-                       $account =& CreateObject('phpgwapi.accounts', (int) 
$_GET['account_id'],'u');
+                       $account = createObject('phpgwapi.accounts', (int) 
$_GET['account_id'],'u');
                        $userData = $account->read_repository();
                        
                        if ($userData['status'])
@@ -811,7 +821,7 @@
 
                        //Permissions
                        $availableApps = $GLOBALS['phpgw_info']['apps'];
-                       $apps  =& 
CreateObject('phpgwapi.applications',intval($_GET['account_id']));
+                       $apps  = 
CreateObject('phpgwapi.applications',intval($_GET['account_id']));
                        $perms = array_keys($apps->read_account_specific());
                        if(is_array($availableApps) && count($availableApps))
                        {
@@ -848,7 +858,7 @@
                        $userData['l_applications']     = lang('applications');
 
                        // Interactions
-                       $userData['i_back']                     = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users');
+                       $userData['i_back']                     = 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiaccounts.list_users'));
                        
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('account "%1" properties', $userData['account_lid']);
                        $GLOBALS['phpgw']->xslttpl->add_file('users');
@@ -861,13 +871,13 @@
 
                        if ($_POST['cancel'] || 
$GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
                        {
-                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'admin.uiaccounts.list_groups'));
                        }
 
                        if ($account_id && $_POST['delete'])
                        {
                                $this->bo->delete_group($account_id);
-                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'admin.uiaccounts.list_groups'));
                        }
 
                        $GLOBALS['phpgw']->xslttpl->set_root(PHPGW_APP_TPL);    
                
@@ -876,7 +886,7 @@
 
                        $data = array
                        (
-                               'delete_url'                            => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group&account_id='
 . $account_id),
+                               'delete_url'                            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiaccounts.delete_group', 'account_id' => $account_id)),
                                'lang_delete'                           => 
lang('delete'),
                                'lang_cancel'                           => 
lang('cancel'),
                                'lang_delete_statustext'        => lang('delete 
the group'),
@@ -895,7 +905,7 @@
                                {
                                        $data['user_list'][] = array
                                        (
-                                               'user_url'                      
                => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_user&account_id='
 . $id),
+                                               'user_url'                      
                => $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiaccounts.edit_user', 'account_id' => $id)),
                                                'user_name'                     
                => $GLOBALS['phpgw']->common->grab_owner_name($id),
                                                'lang_user_url_statustext'      
=> lang('edit user')
                                        );
@@ -1015,7 +1025,7 @@
                                return False;
                        }
 
-                       $accounts =& 
CreateObject('phpgwapi.accounts',$group_info['account_id'],'u');
+                       $accounts = 
createObject('phpgwapi.accounts',$group_info['account_id'],'u');
                        $account_list = 
$accounts->member($group_info['account_id']);
                        $user_list = '';
                        while (list($key,$entry) = each($account_list))
@@ -1030,7 +1040,7 @@
                        unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
                        $GLOBALS['phpgw']->common->phpgw_header();
 
-                       $t =& CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+                       $t = createObject('phpgwapi.Template',PHPGW_APP_TPL);
                        $t->set_unknowns('remove');
 
                        $t->set_file(
@@ -1046,7 +1056,7 @@
                        $var['lang_group'] = lang('Group');
                        $var['group_name'] = $group_info['account_name'];
                        $var['tr_color1'] = 
$GLOBALS['phpgw_info']['user']['theme']['row_on'];
-                       $var['form_action'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.set_group_managers');
+                       $var['form_action'] = 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.boaccounts.set_group_managers'));
                        $var['hidden'] = '<input type="hidden" 
name="account_id" value="'.$group_info['account_id'].'">';
                        $var['lang_select_managers'] = lang('Select Group 
Managers');
                        $var['group_members'] = '<select name="managers[]" 
size="'.(count($account_list)<5?count($account_list):5).'" 
multiple>'.$user_list.'</select>';




reply via email to

[Prev in Thread] Current Thread [Next in Thread]