[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php class.soacco...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php class.soacco... |
|
Date: |
Tue, 21 Feb 2006 14:42:12 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: admin
Branch:
Changes by: Dave Hall <address@hidden> 06/02/21 14:42:11
Modified files:
inc : class.boaccounts.inc.php
class.soaccounts.inc.php
class.uiaccounts.inc.php class.uiconfig.inc.php
Log message:
clean up and some fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.boaccounts.inc.php.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.soaccounts.inc.php.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.uiaccounts.inc.php.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.uiconfig.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: admin/inc/class.boaccounts.inc.php
diff -u admin/inc/class.boaccounts.inc.php:1.40
admin/inc/class.boaccounts.inc.php:1.41
--- admin/inc/class.boaccounts.inc.php:1.40 Tue Feb 14 08:48:21 2006
+++ admin/inc/class.boaccounts.inc.php Tue Feb 21 14:42:11 2006
@@ -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.40 2006/02/14 08:48:21 skwashd Exp
$ */
+ /* $Id: class.boaccounts.inc.php,v 1.41 2006/02/21 14:42:11 skwashd Exp
$ */
class boaccounts
{
@@ -37,7 +37,7 @@
function boaccounts()
{
- $this->so = createobject('admin.soaccounts');
+ $this->so =& CreateObject('admin.soaccounts');
}
function DONTlist_methods($_type='xmlrpc')
@@ -102,34 +102,34 @@
$error[] = lang('no permission to create
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->get_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->set_lid($values['account_name']);
$GLOBALS['phpgw']->db->lock(array('phpgw_accounts',
- 'phpgw_preferences',
- 'phpgw_config',
- 'phpgw_applications',
- 'phpgw_hooks',
- 'phpgw_sessions',
- 'phpgw_acl',
- 'phpgw_app_sessions'
- ));
+
'phpgw_preferences',
+
'phpgw_config',
+
'phpgw_applications',
+
'phpgw_hooks',
+
'phpgw_sessions',
+
'phpgw_acl',
+
'phpgw_app_sessions'
+
));
if(!$values['account_id']) // add new group
{
$new_group_values = array('type' => 'g',
- 'account_lid' =>
$values['account_name'],
- 'passwd' => '',
- 'firstname' =>
$values['account_name'],
- 'lastname' =>
'Group',
- 'status' => 'A',
- 'expires' => -1
- );
+
'account_lid' => $values['account_name'],
+
'passwd' => '',
+
'firstname' => $values['account_name'],
+
'lastname' => 'Group',
+
'status' => 'A',
+
'expires' => -1
+
);
$new_group->create($new_group_values, false);
}
else //edit group
@@ -139,7 +139,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)
{
@@ -154,7 +154,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++)
{
@@ -178,7 +178,7 @@
$docommit = false;
if(count($new_apps))
{
- $GLOBALS['pref'] =
CreateObject('phpgwapi.preferences', $values['account_user'][$i]);
+ $GLOBALS['pref'] =&
CreateObject('phpgwapi.preferences', $values['account_user'][$i]);
$t =
$GLOBALS['pref']->read_repository();
while(list($app_key,$app_name)
= each($new_apps))
for($j = 0; $j <
count($new_apps); $j++)
@@ -237,25 +237,25 @@
$userData = array
(
- 'type' => 'u',
- 'account_lid' =>
$values['account_lid'],
- 'firstname' =>
$values['account_firstname'],
- 'lastname' =>
$values['account_lastname'],
- 'passwd' =>
$values['account_passwd'],
- 'status' =>
($values['account_status'] ? 'A' : ''),
- 'old_loginid' =>
($values['old_loginid']?rawurldecode($GLOBALS['HTTP_GET_VARS']['old_loginid']):''),
- 'account_id' =>
$values['account_id'],
- 'account_passwd_2' =>
$values['account_passwd_2'],
- 'groups' =>
$values['account_groups'],
- 'account_permissions' =>
$values['account_permissions'],
- 'homedirectory' =>
$values['homedirectory'],
- 'loginshell' =>
$values['loginshell'],
- 'account_expires_month' =>
$values['account_expires_month'],
- 'account_expires_day' =>
$values['account_expires_day'],
- 'account_expires_year' =>
$values['account_expires_year'],
+ 'type'
=> 'u',
+ 'account_lid' =>
$values['account_lid'],
+ 'account_firstname' =>
$values['account_firstname'],
+ 'account_lastname' =>
$values['account_lastname'],
+ 'passwd'
=> $values['account_passwd'],
+ 'status'
=> ($values['account_status'] ? 'A' : ''),
+ 'old_loginid' =>
($values['old_loginid']?rawurldecode($_GET['old_loginid']):''),
+ 'account_id' =>
$values['account_id'],
+ 'account_passwd_2' =>
$values['account_passwd_2'],
+ 'groups'
=> $values['account_groups'],
+ 'account_permissions' =>
$values['account_permissions'],
+ 'homedirectory' =>
$values['homedirectory'],
+ 'loginshell' =>
$values['loginshell'],
+ 'account_expires_month' =>
$values['account_expires_month'],
+ 'account_expires_day' =>
$values['account_expires_day'],
+ 'account_expires_year' =>
$values['account_expires_year'],
'account_expires_never' =>
$values['expires'],
- 'expires' =>
$values['expires'],
- /* 'file_space' =>
$GLOBALS['HTTP_POST_VARS']['account_file_space_number'] . "-" .
$GLOBALS['HTTP_POST_VARS']['account_file_space_type'] */
+ 'expires'
=> $values['expires'],
+ /* 'file_space' =>
$_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
);
if ($values['account_id']) //user exists
@@ -265,7 +265,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;
@@ -296,27 +296,27 @@
function set_group_managers()
{
-
if($GLOBALS['phpgw']->acl->check('group_access',16,'admin') ||
$GLOBALS['HTTP_POST_VARS']['cancel'])
+
if($GLOBALS['phpgw']->acl->check('group_access',16,'admin') || $_POST['cancel'])
{
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
$GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
exit;
}
- elseif($GLOBALS['HTTP_POST_VARS']['submit'])
+ elseif($_POST['submit'])
{
- $acl =
CreateObject('phpgwapi.acl',intval($GLOBALS['HTTP_POST_VARS']['account_id']));
+ $acl =&
CreateObject('phpgwapi.acl',intval($_POST['account_id']));
- $users =
$GLOBALS['phpgw']->accounts->member($GLOBALS['HTTP_POST_VARS']['account_id']);
+ $users =
$GLOBALS['phpgw']->accounts->member($_POST['account_id']);
@reset($users);
while($managers && list($key,$user) =
each($users))
{
-
$acl->add_repository('phpgw_group',intval($GLOBALS['HTTP_POST_VARS']['account_id']),$user['account_id'],1);
+
$acl->add_repository('phpgw_group',intval($_POST['account_id']),$user['account_id'],1);
}
- $managers =
$GLOBALS['HTTP_POST_VARS']['managers'];
+ $managers = $_POST['managers'];
@reset($managers);
while($managers && list($key,$manager) =
each($managers))
{
-
$acl->add_repository('phpgw_group',intval($GLOBALS['HTTP_POST_VARS']['account_id']),$manager,(1
+ PHPGW_ACL_GROUP_MANAGERS));
+
$acl->add_repository('phpgw_group',intval($_POST['account_id']),$manager,(1 +
PHPGW_ACL_GROUP_MANAGERS));
}
}
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
@@ -326,7 +326,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'] &&
$GLOBALS['phpgw']->acl->check('group_access',4,'admin'))
@@ -487,7 +487,7 @@
$account_id = get_account_id( (int) $id );
$GLOBALS['hook_values']['account_id'] = $account_id;
- $db = $GLOBALS['phpgw']->db;
+ $db = clone($GLOBALS['phpgw']->db);
$db->query('SELECT app_name,app_order FROM
phpgw_applications WHERE app_enabled!=0 ORDER BY app_order',__LINE__,__FILE__);
if($db->num_rows())
{
@@ -567,7 +567,7 @@
$account_apps = array();
if($account_id)
{
- $apps =
CreateObject('phpgwapi.applications',intval($account_id));
+ $apps =&
CreateObject('phpgwapi.applications',intval($account_id));
$app_list = $apps->read_account_specific();
while(list($key,$app) = each($app_list))
@@ -598,7 +598,7 @@
{
if($id)
{
- $apps = CreateObject('phpgwapi.applications',
intval($id));
+ $apps =& CreateObject('phpgwapi.applications',
intval($id));
while($app = each($modules))
{
if($app[1])
@@ -612,7 +612,7 @@
function set_groups2account($id, $groups)
{
- $account = CreateObject('phpgwapi.accounts', $id, 'u');
+ $account =& CreateObject('phpgwapi.accounts', $id, 'u');
$allGroups = $account->get_list('groups');
if ($groups)
{
@@ -622,7 +622,7 @@
}
}
- $acl = CreateObject('phpgwapi.acl',$id);
+ $acl =& CreateObject('phpgwapi.acl',$id);
while (list($key,$groupData) = each($allGroups))
{
if (in_array($groupData['account_id'],
$groups))
Index: admin/inc/class.soaccounts.inc.php
diff -u admin/inc/class.soaccounts.inc.php:1.14
admin/inc/class.soaccounts.inc.php:1.15
--- admin/inc/class.soaccounts.inc.php:1.14 Tue Feb 14 08:48:21 2006
+++ admin/inc/class.soaccounts.inc.php Tue Feb 21 14:42:11 2006
@@ -9,7 +9,7 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.soaccounts.inc.php,v 1.14 2006/02/14 08:48:21 skwashd Exp
$ */
+ /* $Id: class.soaccounts.inc.php,v 1.15 2006/02/21 14:42:11 skwashd Exp
$ */
class soaccounts
{
@@ -54,7 +54,7 @@
$userData['account_id'] =
$GLOBALS['phpgw']->accounts->create($userData);
- $apps =
CreateObject('phpgwapi.applications',array($userData['account_id'],'u'));
+ $apps =&
CreateObject('phpgwapi.applications',array($userData['account_id'],'u'));
$apps->read_installed_apps();
// Read Group Apps
@@ -113,7 +113,7 @@
/* if ($apps_after)
{
- $GLOBALS['pref'] =
CreateObject('phpgwapi.preferences',$userData['account_id']);
+ $GLOBALS['pref'] =&
CreateObject('phpgwapi.preferences',$userData['account_id']);
$GLOBALS['phpgw']->hooks->single('add_def_pref','admin');
while ($apps = each($apps_after))
{
Index: admin/inc/class.uiaccounts.inc.php
diff -u admin/inc/class.uiaccounts.inc.php:1.52
admin/inc/class.uiaccounts.inc.php:1.53
--- admin/inc/class.uiaccounts.inc.php:1.52 Tue Feb 14 08:48:21 2006
+++ admin/inc/class.uiaccounts.inc.php Tue Feb 21 14:42:11 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.52 2006/02/14 08:48:21 skwashd Exp
$ */
+ /* $Id: class.uiaccounts.inc.php,v 1.53 2006/02/21 14:42:11 skwashd Exp
$ */
class uiaccounts
{
@@ -32,8 +32,8 @@
{
$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
- $this->bo =
createobject('admin.boaccounts');
- $this->nextmatchs =
createobject('phpgwapi.nextmatchs');
+ $this->bo =&
CreateObject('admin.boaccounts');
+ $this->nextmatchs =&
CreateObject('phpgwapi.nextmatchs');
@set_time_limit(300);
}
@@ -58,7 +58,7 @@
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.edit_group');
}
- $start =
(isset($GLOBALS['HTTP_POST_VARS']['start'])?intval($GLOBALS['HTTP_POST_VARS']['start']):'');
+ $start =
(isset($_POST['start'])?intval($_POST['start']):'');
if(isset($_GET['order']))
{
@@ -78,16 +78,16 @@
$sort = 'ASC';
}
- $query = (isset($_POST['query'])?$_POST['query']:'');
+ $query = isset($_POST['query']) ? $_POST['query'] : '';
- $GLOBALS['cd'] = ($_GET['cd']?$_GET['cd']:0);
+ $GLOBALS['cd'] = isset($_GET['cd']) ? $_GET['cd'] : 0;
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . lang('list groups');
$GLOBALS['phpgw']->xslttpl->add_file('groups');
-/* what should this be for??? this is the same call for both cases! can this
be removed? [ceb] */
-
+
+ /* what should this be for??? this is the same call for
both cases! can this be removed? [ceb] */
if
($GLOBALS['phpgw']->acl->check('group_access',2,'admin'))
{
$account_info =
$GLOBALS['phpgw']->accounts->get_list('groups',$start,$sort, $order, $query,
$total);
@@ -180,8 +180,8 @@
$cd = $param_cd;
}
- $GLOBALS['query'] =
(isset($GLOBALS['HTTP_POST_VARS']['query'])?$GLOBALS['HTTP_POST_VARS']['query']:'');
- $start =
(isset($GLOBALS['HTTP_POST_VARS']['start'])?intval($GLOBALS['HTTP_POST_VARS']['start']):'');
+ $GLOBALS['query'] =
(isset($_POST['query'])?$_POST['query']:'');
+ $start =
(isset($_POST['start'])?intval($_POST['start']):'');
if(isset($_GET['order']))
{
@@ -266,8 +266,8 @@
'lang_edit'
=> ($this->bo->check_rights('edit','account_access')?lang('edit'):''),
'lang_edit_statustext' =>
($this->bo->check_rights('edit','account_access')?lang('edit this user'):''),
'lid'
=> (!$account['account_lid']?'':$account['account_lid']),
- 'firstname'
=> (!$account['firstname']?'':$account['firstname']),
- 'lastname'
=> (!$account['lastname']?'':$account['lastname']),
+ 'firstname'
=> (!$account['account_firstname']?'':$account['account_firstname']),
+ 'lastname'
=> (!$account['account_lastname']?'':$account['account_lastname']),
'delete_url'
=>
($this->bo->check_rights('delete','account_access')?$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_user&account_id='
. $account['account_id']):''),
'lang_delete_statustext' =>
($this->bo->check_rights('delete','account_access')?lang('delete this
user'):''),
'lang_delete'
=> ($this->bo->check_rights('delete','account_access')?lang('delete'):'')
@@ -349,7 +349,7 @@
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
}
- $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();
@@ -375,7 +375,7 @@
);
- $accounts = CreateObject('phpgwapi.accounts');
+ $accounts =& CreateObject('phpgwapi.accounts');
$account_list = $accounts->get_list('accounts');
$account_num = count($account_list);
while (list($key,$entry) = each($account_list))
@@ -384,9 +384,9 @@
(
'account_id' => $entry['account_id'],
'account_name' =>
$GLOBALS['phpgw']->common->display_fullname($entry['account_lid'],
-
$entry['account_firstname'],
-
$entry['account_lastname']
-
),
+
$entry['account_firstname'],
+
$entry['account_lastname']
+
),
'selected' =>
in_array(intval($entry['account_id']), $group_members) ? ' selected' : ''
);
}
@@ -417,8 +417,8 @@
'account_id' => $account_id,
'msgbox_data' => $error_list,
'edit_url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiaccounts.edit_group',
-
'account_id' => $account_id
-
)),
+
'account_id' => $account_id
+
)),
'lang_account_name' => lang('group name'),
'value_account_name' => $group->get_lid(),
'lang_include_user' => lang('select users for
inclusion'),
@@ -471,7 +471,7 @@
}
}
- $sbox = createobject('phpgwapi.sbox');
+ $sbox =& CreateObject('phpgwapi.sbox');
if
($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'] &&
($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap'))
{
@@ -494,20 +494,20 @@
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);
}
else
{
- $account = CreateObject('phpgwapi.accounts');
+ $account =& CreateObject('phpgwapi.accounts');
$userData = Array();
$userData['status'] = 'A';
$userGroups = Array();
}
$allGroups = $account->get_list('groups');
- if ($userData['expires'] == -1)
+ if ($userData['expires'] == -1) //switch to js cal -
skwashd
{
$userData['account_expires_month'] = 0;
$userData['account_expires_day'] = 0;
@@ -588,19 +588,18 @@
/* 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();
@reset($GLOBALS['phpgw_info']['apps']);
- $availableApps = $GLOBALS['phpgw_info']['apps'];
- @asort($availableApps);
- @reset($availableApps);
- while (list($key,$application) = each($availableApps))
+ $available_apps = $GLOBALS['phpgw_info']['apps'];
+ @asort($available_apps);
+ foreach ( $available_apps as $key => $application )
{
if ($application['enabled'] &&
$application['status'] != 3)
{
$perm_display[$i]['appName'] =
$key;
- $perm_display[$i]['translatedName'] =
$application['title'];
+ $perm_display[$i]['translatedName'] =
lang($perm_display[$i]['appName']);
$i++;
}
}
@@ -648,8 +647,8 @@
'homedirectory' =>
$homedirectory,
'loginshell' => $loginshell,
'account_status' =>
($userData['status']?'yes':''),
- 'account_firstname' =>
$userData['firstname'],
- 'account_lastname' =>
$userData['lastname'],
+ 'account_firstname' =>
$userData['account_firstname'],
+ 'account_lastname' =>
$userData['account_lastname'],
'account_passwd' =>
$account_passwd,
'account_passwd_2' =>
$account_passwd_2,
'expires_never' =>
(($userData['expires'] == -1)?'yes':''),
@@ -658,7 +657,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));
@@ -672,7 +671,7 @@
return false;
}
- $account =
CreateObject('phpgwapi.accounts',intval($_GET['account_id']),'u');
+ $account =&
CreateObject('phpgwapi.accounts',intval($_GET['account_id']),'u');
$userData = $account->read_repository();
if ($userData['status'])
@@ -710,7 +709,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))
{
@@ -830,10 +829,10 @@
//Add list entry to delete all references to
this account (user)
$accountlist[0] = array('account_id' => '0',
- 'account_name' =>
lang('Delete all entries')
- );
+
'account_name' => lang('Delete all entries')
+ );
// get account list for new owner
- $accounts = CreateObject('phpgwapi.accounts');
+ $accounts =& CreateObject('phpgwapi.accounts');
$accounts = $accounts->get_list('accounts');
for($i=0; $i < count($accounts); $i++)
{
@@ -843,18 +842,18 @@
(
'account_id' =>
$accounts[$i]['account_id'],
'account_name' =>
$GLOBALS['phpgw']->common->display_fullname($accounts[$i]['account_lid'],
-
$accounts[$i]['account_firstname'],
-
$accounts[$i]['account_lastname']
-
)
+
$accounts[$i]['account_firstname'],
+
$accounts[$i]['account_lastname']
+
)
);
}
}
$data = array ('delete_id' => $id2delete,
- 'accountlist' => $accountlist,
- 'lang_new_owner' => lang('Who
would you like to transfer ALL records owned by the deleted user to?'),
- 'l_cancel' =>
lang('cancel'),
- 'l_delete' =>
lang('delete')
- );
+ 'accountlist' =>
$accountlist,
+ 'lang_new_owner' =>
lang('Who would you like to transfer ALL records owned by the deleted user
to?'),
+ 'l_cancel' =>
lang('cancel'),
+ 'l_delete' =>
lang('delete')
+ );
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('new_owner_list' => $data));
}
}
@@ -902,7 +901,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))
@@ -917,7 +916,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(
Index: admin/inc/class.uiconfig.inc.php
diff -u admin/inc/class.uiconfig.inc.php:1.17
admin/inc/class.uiconfig.inc.php:1.18
--- admin/inc/class.uiconfig.inc.php:1.17 Tue Feb 14 08:48:21 2006
+++ admin/inc/class.uiconfig.inc.php Tue Feb 21 14:42:11 2006
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiconfig.inc.php,v 1.17 2006/02/14 08:48:21 skwashd Exp $ */
+ /* $Id: class.uiconfig.inc.php,v 1.18 2006/02/21 14:42:11 skwashd Exp $ */
class uiconfig
{
@@ -18,7 +18,11 @@
function index()
{
- $referer =
urldecode($GLOBALS['HTTP_GET_VARS']['referer']);
+ $referer = '';
+ if ( isset($_GET['referer']) )
+ {
+ $referer = urldecode( str_replace('&', '&',
$_GET['referer']) );
+ }
if($referer)
{
@@ -35,7 +39,7 @@
$_redir = $referer ? $referer :
$GLOBALS['phpgw']->link('/admin/index.php');
}
- $appname = $GLOBALS['HTTP_GET_VARS']['appname'];
+ $appname = $_GET['appname'];
switch($appname)
{
case 'admin':
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.boaccounts.inc.php class.soacco...,
Dave Hall <=