[Phpgroupware-cvs] CVS: setup index.php,1.111,1.112

[Bettina Gille <address@hidden>]

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

Modified Files:
        index.php 
Log Message:
update to install admin/prefs/api at once during new install

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -r1.111 -r1.112
*** index.php   11 Aug 2002 23:54:57 -0000      1.111
--- index.php   19 Dec 2002 23:33:22 -0000      1.112
***************
*** 1,14 ****
  <?php
!   /**************************************************************************\
!   * phpGroupWare                                                             *
!   * http://www.phpgroupware.org                                              *
!   * --------------------------------------------                             *
!   *  This program is free software; you can redistribute it and/or modify it *
!   *  under the terms of the GNU General Public License as published by the   *
!   *  Free Software Foundation; either version 2 of the License, or (at your  *
!   *  option) any later version.                                              *
!   \**************************************************************************/
! 
!   /* $Id$ */
  
        /*
--- 1,13 ----
  <?php
!       
/**************************************************************************\
!       * phpGroupWare                                                          
   *
!       * http://www.phpgroupware.org                                           
   *
!       * --------------------------------------------                          
   *
!       *  This program is free software; you can redistribute it and/or modify 
it *
!       *  under the terms of the GNU General Public License as published by 
the   *
!       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
!       *  option) any later version.                                           
   *
!       
\**************************************************************************/
!       /* $Id$ */
  
        /*
***************
*** 20,29 ****
  
        $GLOBALS['phpgw_info'] = array();
!       $GLOBALS['phpgw_info']['flags'] = array(
!               'noheader'   => True,
!               'nonavbar'   => True,
!               'currentapp' => 'home',
!               'noapi'      => True,
!               'nocachecontrol' => True
        );
        include('./inc/functions.inc.php');
--- 19,29 ----
  
        $GLOBALS['phpgw_info'] = array();
!       $GLOBALS['phpgw_info']['flags'] = array
!       (
!               'noheader'                      => True,
!               'nonavbar'                      => True,
!               'currentapp'            => 'home',
!               'noapi'                         => True,
!               'nocachecontrol'        => True
        );
        include('./inc/functions.inc.php');
***************
*** 33,44 ****
        $tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
        $setup_tpl = CreateObject('setup.Template',$tpl_root);
!       $setup_tpl->set_file(array(
!               'T_head' => 'head.tpl',
!               'T_footer' => 'footer.tpl',
!               'T_alert_msg' => 'msg_alert_msg.tpl',
!               'T_login_main' => 'login_main.tpl',
!               'T_login_stage_header' => 'login_stage_header.tpl',
!               'T_setup_main' => 'setup_main.tpl',
!               'T_setup_db_blocks' => 'setup_db_blocks.tpl'
        ));
  
--- 33,45 ----
        $tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
        $setup_tpl = CreateObject('setup.Template',$tpl_root);
!       $setup_tpl->set_file(array
!       (
!               'T_head'                                => 'head.tpl',
!               'T_footer'                              => 'footer.tpl',
!               'T_alert_msg'                   => 'msg_alert_msg.tpl',
!               'T_login_main'                  => 'login_main.tpl',
!               'T_login_stage_header'  => 'login_stage_header.tpl',
!               'T_setup_main'                  => 'setup_main.tpl',
!               'T_setup_db_blocks'             => 'setup_db_blocks.tpl'
        ));
  
***************
*** 128,132 ****
                case 'Install':
                        $subtitle = lang('Creating Tables');
!                       $submsg = lang('At your request, this script is going 
to attempt to install all the applications for you').'.';
                        $subaction = 'installed';
                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'new';
--- 129,133 ----
                case 'Install':
                        $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';
***************
*** 192,196 ****
                        $setup_tpl->set_var('install',lang('Install'));
                        $setup_tpl->set_var('proceed',lang('We can proceed'));
!                       $setup_tpl->set_var('allapps',lang('all applications'));
                        $setup_tpl->parse('V_db_stage_3','B_db_stage_3');
                        $db_filled_block = $setup_tpl->get_var('V_db_stage_3');
--- 193,197 ----
                        $setup_tpl->set_var('install',lang('Install'));
                        $setup_tpl->set_var('proceed',lang('We can proceed'));
!                       $setup_tpl->set_var('coreapps',lang('all core tables 
and the admin and preferences applications'));
                        $setup_tpl->parse('V_db_stage_3','B_db_stage_3');
                        $db_filled_block = $setup_tpl->get_var('V_db_stage_3');