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

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        setup_demo.php 
Log Message:
another pref fix

Index: setup_demo.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/setup_demo.php,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -C2 -r1.30.2.1 -r1.30.2.2
*** setup_demo.php      5 May 2003 03:55:27 -0000       1.30.2.1
--- setup_demo.php      5 May 2003 04:03:42 -0000       1.30.2.2
***************
*** 171,175 ****
                        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)");
--- 171,175 ----
                        foreach($defaultprefs as $app => $vals)
                        {
!                               $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences(preference_owner,preference_app, preference_value) 
VALUES($accountid, '$app', '$vals')", __LINE__, __FILE__);
                        }
                        $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('preferences','changepassword', " . $accountid . ",0)");
***************
*** 183,187 ****
                        foreach($defaultprefs as $app => $vals)
                        {
!                               $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences(preference_owner,preference_app, preference_value) VALUES('" 
. $accountid . "', '$app', '$vals')");
                        }
  
--- 183,187 ----
                        foreach($defaultprefs as $app => $vals)
                        {
!                               $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences(preference_owner,preference_app, preference_value) 
VALUES($accountid, '$app', '$vals')", __LINE__, __FILE__);
                        }
  
***************
*** 192,196 ****
  
                        /* User-specific perms, no 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('addressbook','run', " . $accountid . ", 1)");
--- 192,200 ----
  
                        /* User-specific perms, no 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')", __LINE__, __FILE__);
!                       }
! 
                        $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('addressbook','run', " . $accountid . ", 1)");
***************
*** 205,209 ****
                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)");
--- 209,213 ----
                foreach($defaultprefs as $app => $vals)
                {
!                       $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_preferences(preference_owner,preference_app, preference_value) 
VALUES($accountid, '$app', '$vals')", __LINE__, __FILE__);
                }
                $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('phpgw_group','" . $defaultgroupid."'," . $accountid . ", 1)");