[Phpgroupware-cvs] CVS: setup setup_demo.php,1.30,1.30.2.1

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv28209

Modified Files:
      Tag: Version-0_9_16-branch
        setup_demo.php 
Log Message:
fix for new prefs system

Index: setup_demo.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/setup_demo.php,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -r1.30 -r1.30.2.1
*** setup_demo.php      21 Sep 2002 05:15:32 -0000      1.30
--- setup_demo.php      5 May 2003 03:55:27 -0000       1.30.2.1
***************
*** 145,149 ****
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM phpgw_acl');
  
!               $defaultprefs = 
'a:3:{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";s:0:"";s:10:"dateformat";s:5:"m/d/Y";s:10:"timeformat";s:2:"12";s:4:"lang";s:2:"en";s:11:"default_app";s:0:"";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";}}';
  
                /* Create the demo groups */
--- 145,151 ----
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM phpgw_acl');
  
!               $defaultprefs['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";s:0:"";s:10:"dateformat";s:5:"m/d/Y";s:10:"timeformat";s:2:"12";s:4:"lang";s:2:"en";s:11:"default_app";s:0:"";s:8:"currency";s:1:"$";}';
!               $defaultprefs['addressbook'] = 'a:1:{s:0:"";s:4:"True";}';
!               $defaultprefs['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";}';
  
                /* Create the demo groups */
***************
*** 167,171 ****
  
                        /* User permissions based on group membership with 
additional user perms for the messenger and infolog apps */
!                       $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences(preference_owner,preference_value) VALUES('" . $accountid . 
"','" . $defaultprefs . "')");
                        $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('preferences','changepassword', " . $accountid . ",0)");
                        $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('phpgw_group', '" . $defaultgroupid."'," . $accountid . ",1)");
--- 169,176 ----
  
                        /* User permissions based on group membership with 
additional user perms for the messenger and infolog apps */
!                       foreach($defaultprefs as $app => $vals)
!                       {
!                               $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences(preference_owner,preference_app, preference_value) VALUES('" 
. $accountid . "', '$app', '$vals')");
!                       }
                        $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('preferences','changepassword', " . $accountid . ",0)");
                        $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('phpgw_group', '" . $defaultgroupid."'," . $accountid . ",1)");
***************
*** 176,180 ****
  
                        /* User permissions based solely on group membership */
!                       $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences (preference_owner, preference_value) VALUES ('$accountid', 
'$defaultprefs')");
                        $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('preferences','changepassword', ".$accountid.", 0)");
                        $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('phpgw_group','" . $defaultgroupid . "'," . $accountid . ",1)");
--- 181,189 ----
  
                        /* User permissions based solely on group membership */
!                       foreach($defaultprefs as $app => $vals)
!                       {
!                               $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences(preference_owner,preference_app, preference_value) VALUES('" 
. $accountid . "', '$app', '$vals')");
!                       }
! 
                        $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('preferences','changepassword', ".$accountid.", 0)");
                        $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('phpgw_group','" . $defaultgroupid . "'," . $accountid . ",1)");
***************
*** 194,198 ****
                $accountid = add_account($username,$fname,$lname,$passwd);
  
!               $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences (preference_owner, preference_value) VALUES('" . $accountid . 
"','" . $defaultprefs . "')");
                $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('phpgw_group','" . $defaultgroupid."'," . $accountid . ", 1)");
                $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('phpgw_group','" . $admingroupid."'," . $accountid . ",1)");
--- 203,210 ----
                $accountid = add_account($username,$fname,$lname,$passwd);
  
!               foreach($defaultprefs as $app => $vals)
!               {
!                       $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences(preference_owner,preference_app, preference_value) VALUES('" 
. $accountid . "', '$app', '$vals')");
!               }
                $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('phpgw_group','" . $defaultgroupid."'," . $accountid . ", 1)");
                $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('phpgw_group','" . $admingroupid."'," . $accountid . ",1)");