[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.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 |
|
Date: |
Sun, 21 Apr 2002 13:32:23 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv15656/phpgwapi/inc
Modified Files:
Tag: Version-0_9_14-branch
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.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** class.accounts_contacts.inc.php 27 Jun 2001 00:44:20 -0000 1.10
--- class.accounts_contacts.inc.php 21 Apr 2002 17:32:20 -0000 1.10.2.1
***************
*** 317,333 ****
$default_prefs =
'a:5:{s:6:"common";a:10:{s:9:"maxmatchs";s:2:"15";s:12:"template_set";s:8:"verdilak";s:5:"theme";s:6:"purple";s:13:"navbar_format";s:5:"icons";s:9:"tz_offset";N;s:10:"dateformat";s:5:"m/d/Y";s:10:"timeformat";s:2:"12";s:4:"lang";s:2:"en";s:11:"default_app";N;s:8:"currency";s:1:"$";}s:11:"addressbook";a:1:{s:0:"";s:4:"True";}:s:8:"calendar";a:4:{s:13:"workdaystarts";s:1:"7";s:11:"workdayends";s:2:"15";s:13:"weekdaystarts";s:6:"Monday";s:15:"defaultcalendar";s:9:"month.php";}}';
// $defaultprefs =
'a:5:{s:6:"common";a:1:{s:0:"";s:2:"en";}s:11:"addressbook";a:1:{s:0:"";s:4:"True";}s:8:"calendar";a:1:{s:0:"";s:13:"workdaystarts";}i:15;a:1:{s:0:"";s:11:"workdayends";}s:6:"Monday";a:1:{s:0:"";s:13:"weekdaystarts";}}';
! $this->db->query("insert into phpgw_preferences
(preference_owner, preference_value) values ('".$accountid."',
'$default_prefs')");
}
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();
--- 317,342 ----
$default_prefs =
'a:5:{s:6:"common";a:10:{s:9:"maxmatchs";s:2:"15";s:12:"template_set";s:8:"verdilak";s:5:"theme";s:6:"purple";s:13:"navbar_format";s:5:"icons";s:9:"tz_offset";N;s:10:"dateformat";s:5:"m/d/Y";s:10:"timeformat";s:2:"12";s:4:"lang";s:2:"en";s:11:"default_app";N;s:8:"currency";s:1:"$";}s:11:"addressbook";a:1:{s:0:"";s:4:"True";}:s:8:"calendar";a:4:{s:13:"workdaystarts";s:1:"7";s:11:"workdayends";s:2:"15";s:13:"weekdaystarts";s:6:"Monday";s:15:"defaultcalendar";s:9:"month.php";}}';
// $defaultprefs =
'a:5:{s:6:"common";a:1:{s:0:"";s:2:"en";}s:11:"addressbook";a:1:{s:0:"";s:4:"True";}s:8:"calendar";a:1:{s:0:"";s:13:"workdaystarts";}i:15;a:1:{s:0:"";s:11:"workdayends";}s:6:"Monday";a:1:{s:0:"";s:13:"weekdaystarts";}}';
! $this->db->query("insert into phpgw_preferences
(preference_owner, preference_value) values ('".$accountid."',
'$default_prefs')",__LINE__,__FILE__);
}
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.101.2.1
retrieving revision 1.101.2.2
diff -C2 -r1.101.2.1 -r1.101.2.2
*** class.accounts_ldap.inc.php 7 Apr 2002 14:28:31 -0000 1.101.2.1
--- class.accounts_ldap.inc.php 21 Apr 2002 17:32:20 -0000 1.101.2.2
***************
*** 742,745 ****
--- 742,755 ----
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);
***************
*** 751,760 ****
}
$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();
--- 761,769 ----
}
$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.80.2.2
retrieving revision 1.80.2.3
diff -C2 -r1.80.2.2 -r1.80.2.3
*** class.accounts_sql.inc.php 7 Apr 2002 14:28:31 -0000 1.80.2.2
--- class.accounts_sql.inc.php 21 Apr 2002 17:32:20 -0000 1.80.2.3
***************
*** 356,365 ****
// 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__);
}
}
--- 356,375 ----
// 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.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,
Mark A Peters <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: setup setup_demo.php,1.24.2.1,1.24.2.2
- Next by Date:
[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
- Previous by thread:
[Phpgroupware-cvs] CVS: setup setup_demo.php,1.24.2.1,1.24.2.2
- Next by 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
- Index(es):