[Phpgroupware-cvs] CVS: setup lang.php,1.46.2.4,1.46.2.5

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        lang.php 
Log Message:
more error_reporting fixes

Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.46.2.4
retrieving revision 1.46.2.5
diff -C2 -r1.46.2.4 -r1.46.2.5
*** lang.php    16 Apr 2003 12:03:32 -0000      1.46.2.4
--- lang.php    18 Apr 2003 02:23:57 -0000      1.46.2.5
***************
*** 164,168 ****
        else
        {
!               if ($GLOBALS['HTTP_POST_VARS']['cancel'])
                {
                        Header('Location: index.php');
--- 164,168 ----
        else
        {
!               if (@$GLOBALS['HTTP_POST_VARS']['cancel'])
                {
                        Header('Location: index.php');
***************
*** 170,174 ****
                }
  
!               if (!$included)
                {
                        $tpl_root = 
$GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
--- 170,174 ----
                }
  
!               if (address@hidden)
                {
                        $tpl_root = 
$GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
***************
*** 185,194 ****
                        $stage_title = lang('Multi-Language support setup');
                        $stage_desc  = lang('This program will help you upgrade 
or install different languages for phpGroupWare');
!                       $tbl_width   = $newinstall ? '60%' : '80%';
!                       $td_colspan  = $newinstall ? '1' : '2';
!                       $td_align    = $newinstall ? ' align="center"' : '';
!                       $hidden_var1 = $newinstall ? '<input type="hidden" 
name="newinstall" value="True">' : '';
  
!                       if (!$newinstall && 
!isset($GLOBALS['phpgw_info']['setup']['installed_langs']))
                        {
                                
$GLOBALS['phpgw_setup']->detection->check_lang(false);  // get installed langs
--- 185,194 ----
                        $stage_title = lang('Multi-Language support setup');
                        $stage_desc  = lang('This program will help you upgrade 
or install different languages for phpGroupWare');
!                       $tbl_width   = @$newinstall ? '60%' : '80%';
!                       $td_colspan  = @$newinstall ? '1' : '2';
!                       $td_align    = @$newinstall ? ' align="center"' : '';
!                       $hidden_var1 = @$newinstall ? '<input type="hidden" 
name="newinstall" value="True">' : '';
  
!                       if (address@hidden && 
!isset($GLOBALS['phpgw_info']['setup']['installed_langs']))
                        {
                                
$GLOBALS['phpgw_setup']->detection->check_lang(false);  // get installed langs
***************
*** 201,212 ****
                                $id = $GLOBALS['phpgw_setup']->db->f('lang_id');
                                $select_box_langs = 
!                                       $select_box_langs 
                                        .'<option value="' . $id . '"'
!                                       
.($GLOBALS['phpgw_info']['setup']['installed_langs'][$id]?' SELECTED':'').'>'
                                        . 
$GLOBALS['phpgw_setup']->db->f('lang_name') . '</option>'
                                        ."\n";
                        }
  
!                       if (! $newinstall)
                        {
                                $meth_desc = lang('Select which method of 
upgrade you would like to do');
--- 201,212 ----
                                $id = $GLOBALS['phpgw_setup']->db->f('lang_id');
                                $select_box_langs = 
!                                       @$select_box_langs 
                                        .'<option value="' . $id . '"'
!                                       
.(@$GLOBALS['phpgw_info']['setup']['installed_langs'][$id]?' SELECTED':'').'>'
                                        . 
$GLOBALS['phpgw_setup']->db->f('lang_name') . '</option>'
                                        ."\n";
                        }
  
!                       if (address@hidden)
                        {
                                $meth_desc = lang('Select which method of 
upgrade you would like to do');