[Phpgroupware-cvs] CVS: phpgwapi/inc class.setup.inc.php, 1.15.2.9, 1.15.2.10 class.setup_html.inc.php, 1.7.2.2, 1.7.2.3

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv16305

Modified Files:
      Tag: Version-0_9_16-branch
        class.setup.inc.php class.setup_html.inc.php 
Log Message:
fixed the db-creation and made the domain-selection a selectbox


Index: class.setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.setup.inc.php,v
retrieving revision 1.15.2.9
retrieving revision 1.15.2.10
diff -C2 -r1.15.2.9 -r1.15.2.10
*** class.setup.inc.php 11 Aug 2003 15:15:39 -0000      1.15.2.9
--- class.setup.inc.php 13 Aug 2003 10:50:26 -0000      1.15.2.10
***************
*** 54,64 ****
                function loaddb()
                {
!                       $GLOBALS['ConfigDomain'] = 
get_var('ConfigDomain',array('COOKIE','POST'));
! 
!                       if(empty($GLOBALS['ConfigDomain']))
!                       {
!                               /* This is to fix the reading of this value 
immediately after the cookie was set on login */
!                               $GLOBALS['ConfigDomain'] = 
get_var('ConfigDomain',Array('DEFAULT','POST'),'default');
!                       }
  
                        $GLOBALS['phpgw_info']['server']['db_type'] = 
$GLOBALS['phpgw_domain'][$GLOBALS['ConfigDomain']]['db_type'];
--- 54,58 ----
                function loaddb()
                {
!                       $GLOBALS['ConfigDomain'] = 
get_var('ConfigDomain',array('COOKIE','POST'),$_POST['FormDomain']);
  
                        $GLOBALS['phpgw_info']['server']['db_type'] = 
$GLOBALS['phpgw_domain'][$GLOBALS['ConfigDomain']]['db_type'];
***************
*** 150,153 ****
--- 144,148 ----
                                        /* config logout */
                                        setcookie('ConfigPW','');
+                                       
$GLOBALS['phpgw_info']['setup']['LastDomain'] = $_COOKIE['ConfigDomain'];
                                        setcookie('ConfigDomain','');
                                        
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = lang('You have successfully 
logged out');

Index: class.setup_html.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.setup_html.inc.php,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -r1.7.2.2 -r1.7.2.3
*** class.setup_html.inc.php    28 May 2003 02:46:31 -0000      1.7.2.2
--- class.setup_html.inc.php    13 Aug 2003 10:50:26 -0000      1.7.2.3
***************
*** 157,160 ****
--- 157,166 ----
                                if (count($GLOBALS['phpgw_domain']) > 1)
                                {
+                                       foreach($GLOBALS['phpgw_domain'] as 
$domain => $data)
+                                       {
+                                               $domains .= "<option 
value=\"$domain\" ".($domain == @$GLOBALS['phpgw_info']['setup']['LastDomain'] 
? ' SELECTED' : '').">$domain</option>\n";
+                                       }
+                                       
$GLOBALS['setup_tpl']->set_var('domains',$domains);
+ 
                                        // use BLOCK B_multi_domain inside of 
login_stage_header
                                        
$GLOBALS['setup_tpl']->parse('V_multi_domain','B_multi_domain');