[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_contacts.inc.php,1.1
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_contacts.inc.php,1.11,1.12 class.accounts_ldap.inc.php,1.106,1.107 class.accounts_sql.inc.php,1.85,1.86 |
|
Date: |
Sun, 21 Apr 2002 13:42:42 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv16205/phpgwapi/inc
Modified Files:
class.accounts_contacts.inc.php class.accounts_ldap.inc.php
class.accounts_sql.inc.php
Log Message:
GNU Patch #246.
Index: class.accounts_contacts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_contacts.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.accounts_contacts.inc.php 29 Jan 2002 00:40:16 -0000 1.11
--- class.accounts_contacts.inc.php 21 Apr 2002 17:42:40 -0000 1.12
***************
*** 332,343 ****
if (!$default_acls)
{
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights)values('preferences',
'changepassword', ".$accountid.", 1)",__LINE__,__FILE__);
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('phpgw_group', '1',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('addressbook',
'run', ".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('filemanager',
'run', ".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('calendar', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('email', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('notes', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('todo', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
}
$this->db->transaction_commit();
--- 332,352 ----
if (!$default_acls)
{
+ $apps = Array(
+ 'addressbook',
+ 'calendar',
+ 'email',
+ 'notes',
+ 'todo',
+ 'phpwebhosting',
+ 'manual'
+ );
+
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights)values('preferences',
'changepassword', ".$accountid.", 1)",__LINE__,__FILE__);
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('phpgw_group', '1',
".$accountid.", 1)",__LINE__,__FILE__);
! @reset($apps);
! while(list($key,$app) = each($apps))
! {
! $this->db->query("INSERT INTO phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) VALUES ('".$app."', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! }
}
$this->db->transaction_commit();
Index: class.accounts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_ldap.inc.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -r1.106 -r1.107
*** class.accounts_ldap.inc.php 7 Apr 2002 14:28:43 -0000 1.106
--- class.accounts_ldap.inc.php 21 Apr 2002 17:42:40 -0000 1.107
***************
*** 741,744 ****
--- 741,754 ----
if($default_acls == False)
{
+ $apps = Array(
+ 'addressbook',
+ 'calendar',
+ 'email',
+ 'notes',
+ 'todo',
+ 'phpwebhosting',
+ 'manual'
+ );
+
$default_group_lid =
$GLOBALS['phpgw_info']['server']['default_group_lid'];
$default_group_id =
$this->name2id($default_group_lid);
***************
*** 750,759 ****
}
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights)values('preferences',
'changepassword', ".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('addressbook',
'run', ".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('filemanager',
'run', ".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('calendar', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('email', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('notes', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('todo', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
}
$this->db->transaction_commit();
--- 760,768 ----
}
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights)values('preferences',
'changepassword', ".$accountid.", 1)",__LINE__,__FILE__);
! @reset($apps);
! while(list($key,$app) = each($apps))
! {
! $this->db->query("INSERT INTO phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) VALUES ('".$app."', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! }
}
$this->db->transaction_commit();
Index: class.accounts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_sql.inc.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** class.accounts_sql.inc.php 7 Apr 2002 14:28:43 -0000 1.85
--- class.accounts_sql.inc.php 21 Apr 2002 17:42:40 -0000 1.86
***************
*** 358,367 ****
// This generally doesn't / shouldn't
happen, but will (jengo)
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('preferences',
'changepassword', ".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('addressbook',
'run', ".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('filemanager',
'run', ".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('calendar', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('email', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('notes', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
! $this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('todo', 'run',
".$accountid.", 1)",__LINE__,__FILE__);
}
}
--- 358,377 ----
// This generally doesn't / shouldn't
happen, but will (jengo)
$this->db->query("insert into phpgw_acl
(acl_appname, acl_location, acl_account, acl_rights) values('preferences',
'changepassword', ".$accountid.", 1)",__LINE__,__FILE__);
!
! $apps = Array(
! 'addressbook',
! 'calendar',
! 'email',
! 'notes',
! 'todo',
! 'phpwebhosting',
! 'manual'
! );
!
! @reset($apps);
! while(list($key,$app) = each($apps))
! {
! $this->db->query("INSERT INTO
phpgw_acl (acl_appname, acl_location, acl_account, acl_rights) VALUES
('".$app."', 'run', ".$accountid.", 1)",__LINE__,__FILE__);
! }
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_contacts.inc.php,1.11,1.12 class.accounts_ldap.inc.php,1.106,1.107 class.accounts_sql.inc.php,1.85,1.86,
Mark A Peters <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_contacts.inc.php,1.10,1.10.2.1 class.accounts_ldap.inc.php,1.101.2.1,1.101.2.2 class.accounts_sql.inc.php,1.80.2.2,1.80.2.3
- Next by Date:
[Phpgroupware-cvs] CVS: chat body.php,1.6,1.6.2.1 channels.php,1.12,1.12.2.1 index.php,1.18,1.18.2.1 load.php,1.9,1.9.2.1 messages.php,1.6,1.6.2.1 sendmsg.php,1.7,1.7.2.1 users.php,1.10,1.10.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_contacts.inc.php,1.10,1.10.2.1 class.accounts_ldap.inc.php,1.101.2.1,1.101.2.2 class.accounts_sql.inc.php,1.80.2.2,1.80.2.3
- Next by thread:
[Phpgroupware-cvs] CVS: chat body.php,1.6,1.6.2.1 channels.php,1.12,1.12.2.1 index.php,1.18,1.18.2.1 load.php,1.9,1.9.2.1 messages.php,1.6,1.6.2.1 sendmsg.php,1.7,1.7.2.1 users.php,1.10,1.10.2.1
- Index(es):