[Phpgroupware-cvs] CVS: setup index.php, 1.113.2.3, 1.113.2.4 manageheader.php, 1.45.2.9, 1.45.2.10

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        index.php manageheader.php 
Log Message:
new setup options/enhancements

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.113.2.3
retrieving revision 1.113.2.4
diff -C2 -r1.113.2.3 -r1.113.2.4
*** index.php   13 Aug 2003 10:49:36 -0000      1.113.2.3
--- index.php   8 Sep 2003 01:27:44 -0000       1.113.2.4
***************
*** 21,28 ****
        $GLOBALS['phpgw_info']['flags'] = array
        (
!               'noheader'                      => True,
!               'nonavbar'                      => True,
                'currentapp'            => 'home',
!               'noapi'                         => True,
                'nocachecontrol'        => True
        );
--- 21,28 ----
        $GLOBALS['phpgw_info']['flags'] = array
        (
!               'noheader'              => True,
!               'nonavbar'              => True,
                'currentapp'            => 'home',
!               'noapi'                 => True,
                'nocachecontrol'        => True
        );
***************
*** 35,45 ****
        $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'
        ));
  
--- 35,45 ----
        $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'
        ));
  
***************
*** 140,148 ****
  
        // Old PHP
!       if (phpversion() < '3.0.16')
        {
                
$GLOBALS['phpgw_setup']->html->show_header($GLOBALS['phpgw_info']['setup']['header_msg'],True);
                $GLOBALS['phpgw_setup']->html->show_alert_msg('Error',
!                        lang('You appear to be running an old version of PHP 
<br>It its recommend that you upgrade to a new version. <br>Older version of 
PHP might not run phpGroupWare correctly, if at all. <br><br>Please upgrade to 
at least version 3.0.16'));
                $GLOBALS['phpgw_setup']->html->show_footer();
                exit;
--- 140,148 ----
  
        // Old PHP
!       if (!function_exists('version_compare'))
        {
                
$GLOBALS['phpgw_setup']->html->show_header($GLOBALS['phpgw_info']['setup']['header_msg'],True);
                $GLOBALS['phpgw_setup']->html->show_alert_msg('Error',
!                        lang('You appear to be using PHP earlier than 4.1.0. 
phpGroupWare now requires 4.1.0 or later'));
                $GLOBALS['phpgw_setup']->html->show_footer();
                exit;

Index: manageheader.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/manageheader.php,v
retrieving revision 1.45.2.9
retrieving revision 1.45.2.10
diff -C2 -r1.45.2.9 -r1.45.2.10
*** manageheader.php    24 Aug 2003 14:35:18 -0000      1.45.2.9
--- manageheader.php    8 Sep 2003 01:27:44 -0000       1.45.2.10
***************
*** 477,480 ****
--- 477,489 ----
                        }
  
+                       if(@$GLOBALS['phpgw_info']['server']['domain_by_host'])
+                       {
+                               $setup_tpl->set_var('domain_by_host_yes',' 
selected');
+                       }
+                       else
+                       {
+                               $setup_tpl->set_var('domain_by_host_no',' 
selected');
+                       }
+ 
                        $errors = '';
                        if(!$found_dbtype)
***************
*** 537,540 ****
--- 546,551 ----
                        $setup_tpl->set_var('lang_mcryptivdescr',lang('This 
should be around 30 bytes in length.<br>Note: The default has been randomly 
generated.'));
                        $setup_tpl->set_var('lang_domselect',lang('Domain 
select box on login'));
+                       $setup_tpl->set_var('lang_domain_from_host', 
lang('Automatically detect domain from hostname'));
+                       $setup_tpl->set_var('lang_note_domain_from_host', 
lang('Note: This option will only work if show domain select box is off.'));
                        $setup_tpl->set_var('lang_finaldescr',lang('After 
retrieving the file, put it into place as the header.inc.php.  Then, click 
"continue".'));
                        $setup_tpl->set_var('lang_continue',lang('Continue'));