[Phpgroupware-cvs] CVS: setup index.php,1.113.2.2,1.113.2.3

[Ralf Becker <address@hidden>]

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

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


Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.113.2.2
retrieving revision 1.113.2.3
diff -C2 -r1.113.2.2 -r1.113.2.3
*** index.php   22 Apr 2003 19:52:15 -0000      1.113.2.2
--- index.php   13 Aug 2003 10:49:36 -0000      1.113.2.3
***************
*** 102,106 ****
                        $subtitle = lang('Deleting Tables');
                        $submsg = lang('Are you sure you want to delete your 
existing tables and data?') . '.';
!                       $subaction = 'uninstall';
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'predrop';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 5;
--- 102,106 ----
                        $subtitle = lang('Deleting Tables');
                        $submsg = lang('Are you sure you want to delete your 
existing tables and data?') . '.';
!                       $subaction = lang('uninstall');
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'predrop';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 5;
***************
*** 109,113 ****
                        $subtitle = lang('Create Database');
                        $submsg = lang('At your request, this script is going 
to attempt to create the database and assign the db user rights to it');
!                       $subaction = 'created';
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'dbcreate';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 6;
--- 109,113 ----
                        $subtitle = lang('Create Database');
                        $submsg = lang('At your request, this script is going 
to attempt to create the database and assign the db user rights to it');
!                       $subaction = lang('created');
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'dbcreate';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 6;
***************
*** 116,120 ****
                        $subtitle = lang('Deleting Tables');
                        $submsg = lang('At your request, this script is going 
to take the evil action of uninstalling all your apps, which deletes your 
existing tables and data') . '.';
!                       $subaction = 'uninstalled';
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'drop';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 6;
--- 116,120 ----
                        $subtitle = lang('Deleting Tables');
                        $submsg = lang('At your request, this script is going 
to take the evil action of uninstalling all your apps, which deletes your 
existing tables and data') . '.';
!                       $subaction = lang('uninstalled');
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'drop';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 6;
***************
*** 123,127 ****
                        $subtitle = lang('Upgrading Tables');
                        $submsg = lang('At your request, this script is going 
to attempt to upgrade your old applications to the current versions').'.';
!                       $subaction = 'upgraded';
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 6;
--- 123,127 ----
                        $subtitle = lang('Upgrading Tables');
                        $submsg = lang('At your request, this script is going 
to attempt to upgrade your old applications to the current versions').'.';
!                       $subaction = lang('upgraded');
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 6;
***************
*** 130,134 ****
                        $subtitle = lang('Creating Tables');
                        $submsg = lang('At your request, this script is going 
to attempt to install the core tables and the admin and preferences 
applications for you').'.';
!                       $subaction = 'installed';
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'new';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 6;
--- 130,134 ----
                        $subtitle = lang('Creating Tables');
                        $submsg = lang('At your request, this script is going 
to attempt to install the core tables and the admin and preferences 
applications for you').'.';
!                       $subaction = lang('installed');
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'new';
                        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 6;
***************
*** 137,141 ****
        $setup_tpl->set_var('subtitle',@$subtitle);
        $setup_tpl->set_var('submsg',@$submsg);
!       $setup_tpl->set_var('subaction',lang(@$subaction));
  
        // Old PHP
--- 137,141 ----
        $setup_tpl->set_var('subtitle',@$subtitle);
        $setup_tpl->set_var('submsg',@$submsg);
!       $setup_tpl->set_var('subaction',@$subaction);
  
        // Old PHP
***************
*** 169,172 ****
--- 169,173 ----
                        $setup_tpl->set_var('oncesetup',lang('Once the database 
is setup correctly'));
                        $setup_tpl->set_var('createdb',lang('Or we can attempt 
to create the database for you:'));
+                       $setup_tpl->set_var('create_database',lang('Create 
database'));
                        switch 
($phpgw_domain[$GLOBALS['ConfigDomain']]['db_type'])
                        {
***************
*** 422,426 ****
        switch($GLOBALS['phpgw_info']['setup']['stage']['db'])
        {
-               case 1:
                case 10:
                        $setup_tpl->set_var('apps_status_img',$completed);
--- 423,426 ----