[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.108,1
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.108,1.109 class.accounts_shared.inc.php,1.48,1.49 class.accounts_sql.inc.php,1.87,1.88 |
|
Date: |
Sun, 26 May 2002 17:16:27 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv7377
Modified Files:
class.accounts_ldap.inc.php class.accounts_shared.inc.php
class.accounts_sql.inc.php
Log Message:
formatting
Index: class.accounts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_ldap.inc.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** class.accounts_ldap.inc.php 5 May 2002 02:51:26 -0000 1.108
--- class.accounts_ldap.inc.php 26 May 2002 21:16:25 -0000 1.109
***************
*** 818,826 ****
$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'];
return $data;
--- 818,826 ----
$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'];
return $data;
Index: class.accounts_shared.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_shared.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** class.accounts_shared.inc.php 25 Dec 2001 09:22:31 -0000 1.48
--- class.accounts_shared.inc.php 26 May 2002 21:16:25 -0000 1.49
***************
*** 105,109 ****
function is_expired()
{
! if ($this->data['expires'] != -1 &&
$this->data['expires'] < time())
{
return True;
--- 105,109 ----
function is_expired()
{
! if($this->data['expires'] != -1 &&
$this->data['expires'] < time())
{
return True;
***************
*** 117,121 ****
function read()
{
! if (count($this->data) == 0)
{
$this->read_repository();
--- 117,121 ----
function read()
{
! if(count($this->data) == 0)
{
$this->read_repository();
***************
*** 143,147 ****
$security_equals =
$GLOBALS['phpgw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id);
! if ($security_equals == False)
{
return False;
--- 143,147 ----
$security_equals =
$GLOBALS['phpgw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id);
! if($security_equals == False)
{
return False;
***************
*** 150,154 ****
$this->memberships = Array();
! for ($idx=0; $idx<count($security_equals); $idx++)
{
$groups = intval($security_equals[$idx]);
--- 150,154 ----
$this->memberships = Array();
! for($idx=0; $idx<count($security_equals); $idx++)
{
$groups = intval($security_equals[$idx]);
***************
*** 168,177 ****
unset($acl);
! if ($security_equals == False)
{
return False;
}
! for ($idx=0; $idx<count($security_equals); $idx++)
{
$name =
$this->id2name(intval($security_equals[$idx]));
--- 168,177 ----
unset($acl);
! if($security_equals == False)
{
return False;
}
! for($idx=0; $idx<count($security_equals); $idx++)
{
$name =
$this->id2name(intval($security_equals[$idx]));
***************
*** 192,196 ****
$max =
$GLOBALS['phpgw_info']['server']['account_max_id'] ?
$GLOBALS['phpgw_info']['server']['account_max_id'] : 0;
! if ($account_type == 'g')
{
$type = 'groups';
--- 192,196 ----
$max =
$GLOBALS['phpgw_info']['server']['account_max_id'] ?
$GLOBALS['phpgw_info']['server']['account_max_id'] : 0;
! if($account_type == 'g')
{
$type = 'groups';
***************
*** 204,212 ****
/* Loop until we find a free id */
$free = 0;
! while (!$free)
{
$account_lid = '';
//echo '<br>calling search for id: '.$nextid;
! if ($this->exists($nextid))
{
$nextid =
intval($GLOBALS['phpgw']->common->next_id($type,$min,$max));
--- 204,212 ----
/* Loop until we find a free id */
$free = 0;
! while(!$free)
{
$account_lid = '';
//echo '<br>calling search for id: '.$nextid;
! if($this->exists($nextid))
{
$nextid =
intval($GLOBALS['phpgw']->common->next_id($type,$min,$max));
***************
*** 226,230 ****
}
}
! if
($GLOBALS['phpgw_info']['server']['account_max_id'] &&
($nextid >
$GLOBALS['phpgw_info']['server']['account_max_id']))
{
--- 226,230 ----
}
}
! if($GLOBALS['phpgw_info']['server']['account_max_id'] &&
($nextid >
$GLOBALS['phpgw_info']['server']['account_max_id']))
{
Index: class.accounts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_sql.inc.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -r1.87 -r1.88
*** class.accounts_sql.inc.php 7 May 2002 12:54:12 -0000 1.87
--- class.accounts_sql.inc.php 26 May 2002 21:16:25 -0000 1.88
***************
*** 52,67 ****
$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');
return $this->data;
--- 52,67 ----
$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');
return $this->data;
***************
*** 94,103 ****
function get_list($_type='both',$start = '',$sort = '', $order
= '', $query = '', $offset = '')
{
! if (! $sort)
{
$sort = "DESC";
}
! if ($order)
{
$orderclause = "ORDER BY $order $sort";
--- 94,103 ----
function get_list($_type='both',$start = '',$sort = '', $order
= '', $query = '', $offset = '')
{
! if(!$sort)
{
$sort = "DESC";
}
! if($order)
{
$orderclause = "ORDER BY $order $sort";
***************
*** 125,129 ****
$query = ereg_replace('"','',$query);
! if ($whereclause)
{
$whereclause .= ' AND ( ';
--- 125,129 ----
$query = ereg_replace('"','',$query);
! if($whereclause)
{
$whereclause .= ' AND ( ';
***************
*** 136,140 ****
$whereclause .= " account_firstname LIKE
'%$query%' OR account_lastname LIKE "
. "'%$query%' OR account_lid LIKE
'%$query%' ";
! if ($whereclause)
{
$whereclause .= ' ) ';
--- 136,140 ----
$whereclause .= " account_firstname LIKE
'%$query%' OR account_lastname LIKE "
. "'%$query%' OR account_lid LIKE
'%$query%' ";
! if($whereclause)
{
$whereclause .= ' ) ';
***************
*** 143,151 ****
$sql = "SELECT * FROM phpgw_accounts $whereclause
$orderclause";
! if ($offset)
{
$this->db->limit_query($sql,$start,__LINE__,__FILE__,$offset);
}
! elseif ($start)
{
$this->db->limit_query($sql,$start,__LINE__,__FILE__);
--- 143,151 ----
$sql = "SELECT * FROM phpgw_accounts $whereclause
$orderclause";
! if($offset)
{
$this->db->limit_query($sql,$start,__LINE__,__FILE__,$offset);
}
! elseif($start)
{
$this->db->limit_query($sql,$start,__LINE__,__FILE__);
***************
*** 156,160 ****
}
! while ($this->db->next_record())
{
$accounts[] = Array(
--- 156,160 ----
}
! while($this->db->next_record())
{
$accounts[] = Array(
***************
*** 176,180 ****
static $name_list;
! if (! $account_lid)
{
return False;
--- 176,180 ----
static $name_list;
! if(!$account_lid)
{
return False;
***************
*** 203,207 ****
static $id_list;
! if (! $account_id)
{
return False;
--- 203,207 ----
static $id_list;
! if(!$account_id)
{
return False;
***************
*** 211,216 ****
{
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())
--- 211,216 ----
{
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())
***************
*** 236,240 ****
}
$this->db->query("SELECT account_type FROM
phpgw_accounts WHERE account_id=".$account_id,__LINE__,__FILE__);
! if ($this->db->num_rows())
{
$this->db->next_record();
--- 236,240 ----
}
$this->db->query("SELECT account_type FROM
phpgw_accounts WHERE account_id=".$account_id,__LINE__,__FILE__);
! if($this->db->num_rows())
{
$this->db->next_record();
***************
*** 305,309 ****
function auto_add($accountname, $passwd, $default_prefs =
False, $default_acls = False, $expiredate = 0, $account_status = 'A')
{
! if ($expiredate)
{
$expires = mktime(2,0,0,date('n',$expiredate),
intval(date('d',$expiredate)), date('Y',$expiredate));
--- 305,309 ----
function auto_add($accountname, $passwd, $default_prefs =
False, $default_acls = False, $expiredate = 0, $account_status = 'A')
{
! if($expiredate)
{
$expires = mktime(2,0,0,date('n',$expiredate),
intval(date('d',$expiredate)), date('Y',$expiredate));
***************
*** 345,354 ****
$accountid = $this->name2id($accountname);
! 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)
{
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('phpgw_group', "
--- 345,354 ----
$accountid = $this->name2id($accountname);
! 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)
{
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('phpgw_group', "
***************
*** 412,420 ****
$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'];
return $data;
--- 412,420 ----
$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'];
return $data;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.108,1.109 class.accounts_shared.inc.php,1.48,1.49 class.accounts_sql.inc.php,1.87,1.88,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_pop3_sock.inc.php,1.1,1.2 class.msg_pop3.inc.php,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.xmlrpc_server.inc.php,1.24,1.25
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_pop3_sock.inc.php,1.1,1.2 class.msg_pop3.inc.php,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.xmlrpc_server.inc.php,1.24,1.25
- Index(es):