[Phpgroupware-cvs] setup applications.php, 1.21.2.9, 1.21.2.10 index.php, 1.113.2.4, 1.113.2.5 setup_demo.php, 1.30.2.9, 1.30.2.10

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        applications.php index.php setup_demo.php 
Log Message:
many bug fixes

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.113.2.4
retrieving revision 1.113.2.5
diff -C2 -d -r1.113.2.4 -r1.113.2.5
*** index.php   8 Sep 2003 01:27:44 -0000       1.113.2.4
--- index.php   28 Oct 2003 01:26:47 -0000      1.113.2.5
***************
*** 97,101 ****
        // end DEBUG code
  
!       switch(@get_var('action',Array('POST')))
        {
                case 'Uninstall all applications':
--- 97,101 ----
        // end DEBUG code
  
!       switch(@get_var('action',Array('POST', 'GET')))
        {
                case 'Uninstall all applications':
***************
*** 232,236 ****
                        $db_filled_block = 
$setup_tpl->get_var('V_db_stage_6_pre');
                        
!                       // FIXME : CAPTURE THIS OUTPUT
                        $GLOBALS['phpgw_setup']->db->Halt_On_Error = 'report';
  
--- 232,237 ----
                        $db_filled_block = 
$setup_tpl->get_var('V_db_stage_6_pre');
                        
!                       flush();
!                       ob_start();
                        $GLOBALS['phpgw_setup']->db->Halt_On_Error = 'report';
  
***************
*** 250,254 ****
  
                                        $GLOBALS['included'] = True;
!                                       include('lang.php');
                                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
                                        break;
--- 251,255 ----
  
                                        $GLOBALS['included'] = True;
!                                       include_once('lang.php');
                                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
                                        break;
***************
*** 258,261 ****
--- 259,263 ----
                                        break;
                        }
+                       ob_clean();
  
                        $GLOBALS['phpgw_setup']->db->Halt_On_Error = 'no';

Index: setup_demo.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/setup_demo.php,v
retrieving revision 1.30.2.9
retrieving revision 1.30.2.10
diff -C2 -d -r1.30.2.9 -r1.30.2.10
*** setup_demo.php      26 Oct 2003 03:24:43 -0000      1.30.2.9
--- setup_demo.php      28 Oct 2003 01:26:47 -0000      1.30.2.10
***************
*** 167,173 ****
                foreach($contacts_to_delete as $contact_id)
                {
!                       $contacts->delete($contact_id);
                }
                unset($contacts_to_delete);
                /* Create the demo groups */
                $defaultgroupid = 
intval(add_account('Default','Default','Group',$passwd,'g'));
--- 167,174 ----
                foreach($contacts_to_delete as $contact_id)
                {
!                       $contacts->delete($contact_id, '', False);
                }
                unset($contacts_to_delete);
+               echo 'got this far!';
                /* Create the demo groups */
                $defaultgroupid = 
intval(add_account('Default','Default','Group',$passwd,'g'));

Index: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.21.2.9
retrieving revision 1.21.2.10
diff -C2 -d -r1.21.2.9 -r1.21.2.10
*** applications.php    8 Oct 2003 23:46:39 -0000       1.21.2.9
--- applications.php    28 Oct 2003 01:26:47 -0000      1.21.2.10
***************
*** 65,69 ****
        $setup_tpl->set_block('T_setup_main','footer','footer');
  
!       $bgcolor = array('#DDDDDD','#EEEEEE');
  
        function parsedep($depends,$main=True)
--- 65,69 ----
        $setup_tpl->set_block('T_setup_main','footer','footer');
  
!       $bgcolor = array('row_on', 'row_off');
  
        function parsedep($depends,$main=True)
***************
*** 235,248 ****
        {
                @ksort($setup_info[$detail]);
!               $setup_tpl->set_var('description',lang('App details') . ':');
                $setup_tpl->pparse('out','header');
  
!               $setup_tpl->set_var('name','application');
!               $setup_tpl->set_var('details', 
lang($setup_info[$detail]['title']));
                $setup_tpl->pparse('out','detail');
        
                foreach($setup_info[$detail] as $key => $val)
                {
!                       if($key != 'title')
                        {
                                $i = ($i ? 0 : 1);
--- 235,252 ----
        {
                @ksort($setup_info[$detail]);
!               $setup_tpl->set_var('description','<a 
href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>');
                $setup_tpl->pparse('out','header');
  
!               
!               $name = ($setup_info[$detail]['title'] ? 
$setup_info[$detail]['title'] 
!                        : lang($setup_info[$detail]['name']));
!               $setup_tpl->set_var('name',lang('application'));
!               $setup_tpl->set_var('details', $name);
!               $setup_tpl->set_var('bg_color', 'th');
                $setup_tpl->pparse('out','detail');
        
                foreach($setup_info[$detail] as $key => $val)
                {
!                       if($key != 'title' && $key != 'name')
                        {
                                $i = ($i ? 0 : 1);
***************
*** 268,273 ****
                        }
                }
- 
-               echo '<br><a href="applications.php?debug='.$DEBUG.'">' . 
lang('Go back') . '</a>';
                $setup_tpl->pparse('out','footer');
                exit;
--- 272,275 ----
***************
*** 382,386 ****
                $setup_tpl->set_var('upgrade_all',lang('Upgrade All'));
                $setup_tpl->set_var('remove_all',lang('Remove All'));
!               $setup_tpl->set_var('lang_debug',lang('enable for extra 
debug-messages'));
                $setup_tpl->set_var('debug','<input type="checkbox" 
name="debug" value="True"' .($DEBUG ? ' checked' : '') . '>');
                $setup_tpl->set_var('bg_color',$bgcolor[0]);
--- 384,388 ----
                $setup_tpl->set_var('upgrade_all',lang('Upgrade All'));
                $setup_tpl->set_var('remove_all',lang('Remove All'));
!               $setup_tpl->set_var('lang_debug',lang('enable debug messages'));
                $setup_tpl->set_var('debug','<input type="checkbox" 
name="debug" value="True"' .($DEBUG ? ' checked' : '') . '>');
                $setup_tpl->set_var('bg_color',$bgcolor[0]);