extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Miles Lott 2002-05-26 21:16:25 +00:00
parent f8ee781c06
commit cdc2926ff3
3 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpgwapi/inc/class.accounts_ldap.inc.php
View File

@ -817,11 +817,11 @@
$this->account_id = $account_id;
$this->read_repository();
$data[$this->data['account_id']]['lid'] = $this->data['account_lid'];
$data[$this->data['account_id']]['firstname'] = $this->data['firstname'];
$data[$this->data['account_id']]['lastname'] = $this->data['lastname'];
$data[$this->data['account_id']]['fullname'] = $this->data['fullname'];
$data[$this->data['account_id']]['type'] = $this->data['account_type'];
$data[$this->data['account_id']]['lid'] = $this->data['account_lid'];
$data[$this->data['account_id']]['firstname'] = $this->data['firstname'];
$data[$this->data['account_id']]['lastname'] = $this->data['lastname'];
$data[$this->data['account_id']]['fullname'] = $this->data['fullname'];
$data[$this->data['account_id']]['type'] = $this->data['account_type'];
return $data;
}

20
phpgwapi/inc/class.accounts_shared.inc.php
View File

@ -104,7 +104,7 @@
function is_expired()
{
if ($this->data['expires'] != -1 && $this->data['expires'] < time())
if($this->data['expires'] != -1 && $this->data['expires'] < time())
{
return True;
}
@ -116,7 +116,7 @@
function read()
{
if (count($this->data) == 0)
if(count($this->data) == 0)
{
$this->read_repository();
}
@ -142,14 +142,14 @@
$security_equals = Array();
$security_equals = $GLOBALS['phpgw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id);
if ($security_equals == False)
if($security_equals == False)
{
return False;
}
$this->memberships = Array();
for ($idx=0; $idx<count($security_equals); $idx++)
for($idx=0; $idx<count($security_equals); $idx++)
{
$groups = intval($security_equals[$idx]);
$this->memberships[] = Array('account_id' => $groups, 'account_name' => $this->id2name($groups));
@ -167,12 +167,12 @@
$security_equals = $acl->get_ids_for_location($account_id, 1, 'phpgw_group');
unset($acl);
if ($security_equals == False)
if($security_equals == False)
{
return False;
}
for ($idx=0; $idx<count($security_equals); $idx++)
for($idx=0; $idx<count($security_equals); $idx++)
{
$name = $this->id2name(intval($security_equals[$idx]));
$this->members[] = Array('account_id' => intval($security_equals[$idx]), 'account_name' => $name);
@ -191,7 +191,7 @@
$min = $GLOBALS['phpgw_info']['server']['account_min_id'] ? $GLOBALS['phpgw_info']['server']['account_min_id'] : 0;
$max = $GLOBALS['phpgw_info']['server']['account_max_id'] ? $GLOBALS['phpgw_info']['server']['account_max_id'] : 0;
if ($account_type == 'g')
if($account_type == 'g')
{
$type = 'groups';
}
@ -203,11 +203,11 @@
/* Loop until we find a free id */
$free = 0;
while (!$free)
while(!$free)
{
$account_lid = '';
//echo '<br>calling search for id: '.$nextid;
if ($this->exists($nextid))
if($this->exists($nextid))
{
$nextid = intval($GLOBALS['phpgw']->common->next_id($type,$min,$max));
}
@ -225,7 +225,7 @@
}
}
}
if ($GLOBALS['phpgw_info']['server']['account_max_id'] &&
if($GLOBALS['phpgw_info']['server']['account_max_id'] &&
($nextid > $GLOBALS['phpgw_info']['server']['account_max_id']))
{
return False;

64
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -51,18 +51,18 @@
$this->db->query("SELECT * FROM phpgw_accounts WHERE account_id='" . $this->account_id . "'",__LINE__,__FILE__);
$this->db->next_record();
$this->data['userid'] = $this->db->f('account_lid');
$this->data['account_id'] = $this->db->f('account_id');
$this->data['account_lid'] = $this->db->f('account_lid');
$this->data['firstname'] = $this->db->f('account_firstname');
$this->data['lastname'] = $this->db->f('account_lastname');
$this->data['fullname'] = $this->db->f('account_firstname') . ' ' . $this->db->f('account_lastname');
$this->data['lastlogin'] = $this->db->f('account_lastlogin');
$this->data['lastloginfrom'] = $this->db->f('account_lastloginfrom');
$this->data['lastpasswd_change'] = $this->db->f('account_lastpwd_change');
$this->data['status'] = $this->db->f('account_status');
$this->data['expires'] = $this->db->f('account_expires');
$this->data['account_type'] = $this->db->f('account_type');
$this->data['userid'] = $this->db->f('account_lid');
$this->data['account_id'] = $this->db->f('account_id');
$this->data['account_lid'] = $this->db->f('account_lid');
$this->data['firstname'] = $this->db->f('account_firstname');
$this->data['lastname'] = $this->db->f('account_lastname');
$this->data['fullname'] = $this->db->f('account_firstname') . ' ' . $this->db->f('account_lastname');
$this->data['lastlogin'] = $this->db->f('account_lastlogin');
$this->data['lastloginfrom'] = $this->db->f('account_lastloginfrom');
$this->data['lastpasswd_change'] = $this->db->f('account_lastpwd_change');
$this->data['status'] = $this->db->f('account_status');
$this->data['expires'] = $this->db->f('account_expires');
$this->data['account_type'] = $this->db->f('account_type');
return $this->data;
}
@ -93,12 +93,12 @@
function get_list($_type='both',$start = '',$sort = '', $order = '', $query = '', $offset = '')
{
if (! $sort)
if(!$sort)
{
$sort = "DESC";
}
if ($order)
if($order)
{
$orderclause = "ORDER BY $order $sort";
}
@ -124,7 +124,7 @@
$query = ereg_replace("'",'',$query);
$query = ereg_replace('"','',$query);
if ($whereclause)
if($whereclause)
{
$whereclause .= ' AND ( ';
}
@ -135,18 +135,18 @@
$whereclause .= " account_firstname LIKE '%$query%' OR account_lastname LIKE "
. "'%$query%' OR account_lid LIKE '%$query%' ";
if ($whereclause)
if($whereclause)
{
$whereclause .= ' ) ';
}
}
$sql = "SELECT * FROM phpgw_accounts $whereclause $orderclause";
if ($offset)
if($offset)
{
$this->db->limit_query($sql,$start,__LINE__,__FILE__,$offset);
}
elseif ($start)
elseif($start)
{
$this->db->limit_query($sql,$start,__LINE__,__FILE__);
}
@ -155,7 +155,7 @@
$this->db->query($sql,__LINE__,__FILE__);
}
while ($this->db->next_record())
while($this->db->next_record())
{
$accounts[] = Array(
'account_id' => $this->db->f('account_id'),
@ -175,7 +175,7 @@
{
static $name_list;
if (! $account_lid)
if(!$account_lid)
{
return False;
}
@ -202,7 +202,7 @@
{
static $id_list;
if (! $account_id)
if(!$account_id)
{
return False;
}
@ -210,8 +210,8 @@
if($id_list[$account_id])
{
return $id_list[$account_id];
}
}
$this->db->query("SELECT account_lid FROM phpgw_accounts WHERE account_id=".$account_id,__LINE__,__FILE__);
if($this->db->num_rows())
{
@ -235,7 +235,7 @@
return $account_type[$account_id];
}
$this->db->query("SELECT account_type FROM phpgw_accounts WHERE account_id=".$account_id,__LINE__,__FILE__);
if ($this->db->num_rows())
if($this->db->num_rows())
{
$this->db->next_record();
$account_type[$account_id] = $this->db->f('account_type');
@ -304,7 +304,7 @@
function auto_add($accountname, $passwd, $default_prefs = False, $default_acls = False, $expiredate = 0, $account_status = 'A')
{
if ($expiredate)
if($expiredate)
{
$expires = mktime(2,0,0,date('n',$expiredate), intval(date('d',$expiredate)), date('Y',$expiredate));
}
@ -344,12 +344,12 @@
$this->create($acct_info,$default_prefs);
$accountid = $this->name2id($accountname);
if ($default_acls == False)
if($default_acls == False)
{
$default_group_lid = $GLOBALS['phpgw_info']['server']['default_group_lid'];
$default_group_id = $this->name2id($default_group_lid);
$defaultgroupid = $default_group_id ? $default_group_id : $this->name2id('Default');
if ($defaultgroupid)
if($defaultgroupid)
{
$this->db->query("insert into phpgw_acl (acl_appname, acl_location, acl_account, acl_rights) values('phpgw_group', "
. $defaultgroupid . ", " . $accountid . ", 1)",__LINE__,__FILE__);
@ -411,11 +411,11 @@
$this->account_id = $account_id;
$this->read_repository();
$data[$this->data['account_id']]['lid'] = $this->data['account_lid'];
$data[$this->data['account_id']]['firstname'] = $this->data['firstname'];
$data[$this->data['account_id']]['lastname'] = $this->data['lastname'];
$data[$this->data['account_id']]['fullname'] = $this->data['fullname'];
$data[$this->data['account_id']]['type'] = $this->data['account_type'];
$data[$this->data['account_id']]['lid'] = $this->data['account_lid'];
$data[$this->data['account_id']]['firstname'] = $this->data['firstname'];
$data[$this->data['account_id']]['lastname'] = $this->data['lastname'];
$data[$this->data['account_id']]['fullname'] = $this->data['fullname'];
$data[$this->data['account_id']]['type'] = $this->data['account_type'];
return $data;
}