[Phpgroupware-cvs] CVS: setup index.php,1.98,1.98.2.1

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        index.php 
Log Message:
This will now correctly remove the system level cache.  Previous problem was 
occuring because loaddb() was not called prior to clearing the cache.  This 
also clears up all warning messages being dumped to the HTTP log file.

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.98
retrieving revision 1.98.2.1
diff -C2 -r1.98 -r1.98.2.1
*** index.php   13 Jan 2002 17:20:33 -0000      1.98
--- index.php   14 Jan 2002 12:14:17 -0000      1.98.2.1
***************
*** 19,23 ****
        $DEBUG = False;
  
!       $phpgw_info = array();
        $GLOBALS['phpgw_info']['flags'] = array(
                'noheader' => True,
--- 19,23 ----
        $DEBUG = False;
  
!       $GLOBALS['phpgw_info'] = array();
        $GLOBALS['phpgw_info']['flags'] = array(
                'noheader' => True,
***************
*** 65,76 ****
                $phpgw_setup->login_form();
                $phpgw_setup->show_footer();
- 
-               /* Add cleaning of app_sessions per skeeter, but with a check 
for the table being there, just in case */
-               $phpgw_setup->clear_session_cache();
                exit;
        }
  
-       // Database actions
        $phpgw_setup->loaddb();
        $setup_info = $phpgw_setup->get_versions();
        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 
$phpgw_setup->check_db();
--- 65,77 ----
                $phpgw_setup->login_form();
                $phpgw_setup->show_footer();
                exit;
        }
  
        $phpgw_setup->loaddb();
+ 
+       /* Add cleaning of app_sessions per skeeter, but with a check for the 
table being there, just in case */
+       $phpgw_setup->clear_session_cache();
+ 
+       // Database actions
        $setup_info = $phpgw_setup->get_versions();
        $GLOBALS['phpgw_info']['setup']['stage']['db'] = 
$phpgw_setup->check_db();
***************
*** 92,96 ****
        // end DEBUG code
  
!       switch($HTTP_POST_VARS['action'])
        {
                case 'Uninstall all applications':
--- 93,97 ----
        // end DEBUG code
  
!       switch(@$GLOBALS['HTTP_POST_VARS']['action'])
        {
                case 'Uninstall all applications':
***************
*** 130,136 ****
                        break;
        }
!       $setup_tpl->set_var('subtitle',$subtitle);
!       $setup_tpl->set_var('submsg',$submsg);
!       $setup_tpl->set_var('subaction',lang($subaction));
  
        // Old PHP
--- 131,137 ----
                        break;
        }
!       $setup_tpl->set_var('subtitle',@$subtitle);
!       $setup_tpl->set_var('submsg',@$submsg);
!       $setup_tpl->set_var('subaction',lang(@$subaction));
  
        // Old PHP
***************
*** 156,161 ****
        $setup_tpl->set_var('db_step_text',lang('Step 1 - Simple Application 
Management'));
  
-       $ConfigDomain = $HTTP_COOKIE_VARS['ConfigDomain'] ? 
$HTTP_COOKIE_VARS['ConfigDomain'] : $HTTP_POST_VARS['ConfigDomain'];
- 
        switch($GLOBALS['phpgw_info']['setup']['stage']['db'])
        {
--- 157,160 ----
***************
*** 166,170 ****
                        $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:'));
!                       switch ($phpgw_domain[$ConfigDomain]['db_type'])
                        {
                                case 'mysql':
--- 165,169 ----
                        $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:'));
!                       switch 
($phpgw_domain[$GLOBALS['ConfigDomain']]['db_type'])
                        {
                                case 'mysql':
***************
*** 392,404 ****
                        while (list ($key, $value) = each 
($GLOBALS['phpgw_info']['setup']['installed_langs']))
                        {
!                               if (!$notfirst)
!                               {
!                                       $langs_list = $value;
!                               }
!                               else
!                               {
!                                       $langs_list =  $langs_list .', ' 
.$value;
!                               }
!                               $notfirst = True;
                        }
  
--- 391,395 ----
                        while (list ($key, $value) = each 
($GLOBALS['phpgw_info']['setup']['installed_langs']))
                        {
!                               $langs_list = ($langs_list?$langs_list.', ':'') 
. $value;
                        }
  
***************
*** 441,445 ****
        }
  
!       
$phpgw_setup->show_header($GLOBALS['phpgw_info']['setup']['header_msg'],False,'config',$ConfigDomain
 . '(' . $phpgw_domain[$ConfigDomain]['db_type'] . ')');
        $setup_tpl->pparse('out','T_setup_main');
        $phpgw_setup->show_footer();
--- 432,436 ----
        }
  
!       
$phpgw_setup->show_header($GLOBALS['phpgw_info']['setup']['header_msg'],False,'config',$GLOBALS['ConfigDomain']
 . '(' . $GLOBALS['phpgw_domain'][$GLOBALS['ConfigDomain']]['db_type'] . ')');
        $setup_tpl->pparse('out','T_setup_main');
        $phpgw_setup->show_footer();