[Phpgroupware-cvs] CVS: phpgroupware header.inc.php.template, 1.35.2.5.2.1, 1.35.2.5.2.2 login.php, 1.76.2.4.2.14, 1.76.2.4.2.15

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        header.inc.php.template login.php 
Log Message:
new setup options/enhancements

Index: header.inc.php.template
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/header.inc.php.template,v
retrieving revision 1.35.2.5.2.1
retrieving revision 1.35.2.5.2.2
diff -C2 -r1.35.2.5.2.1 -r1.35.2.5.2.2
*** header.inc.php.template     27 Mar 2003 18:19:37 -0000      1.35.2.5.2.1
--- header.inc.php.template     8 Sep 2003 01:27:44 -0000       1.35.2.5.2.2
***************
*** 32,35 ****
--- 32,41 ----
        $GLOBALS['phpgw_info']['server']['show_domain_selectbox'] = 
{DOMAIN_SELECTBOX};
  
+       /*
+       ** As an alternative to the domain select box, set this option to True
+       ** to use the domain name from the browser provided hostname 
($_SERVER['HTTP_HOST'])
+       */
+       $GLOBALS['phpgw_info']['server']['domain_from_host'] = 
{DOMAIN_FROM_HOST};
+ 
        $GLOBALS['phpgw_info']['server']['db_persistent'] = {DB_PERSISTENT};
  
***************
*** 93,99 ****
        $GLOBALS['phpgw_info']['server']['versions']['current_header'] = 
$setup_info['phpgwapi']['versions']['current_header'];
        unset($setup_info);
!       $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.23';
        /* This is a fix for NT */
!       if(!isset($GLOBALS['phpgw_info']['flags']['noapi']) || 
!$GLOBALS['phpgw_info']['flags']['noapi'] == True)
        {
                include(PHPGW_API_INC . '/functions.inc.php');
--- 99,105 ----
        $GLOBALS['phpgw_info']['server']['versions']['current_header'] = 
$setup_info['phpgwapi']['versions']['current_header'];
        unset($setup_info);
!       $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.24';
        /* This is a fix for NT */
!       if(!isset($GLOBALS['phpgw_info']['flags']['noapi']) || 
$GLOBALS['phpgw_info']['flags']['noapi'] != True)
        {
                include(PHPGW_API_INC . '/functions.inc.php');

Index: login.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/login.php,v
retrieving revision 1.76.2.4.2.14
retrieving revision 1.76.2.4.2.15
diff -C2 -r1.76.2.4.2.14 -r1.76.2.4.2.15
*** login.php   29 Aug 2003 04:53:00 -0000      1.76.2.4.2.14
--- login.php   8 Sep 2003 01:27:44 -0000       1.76.2.4.2.15
***************
*** 79,82 ****
--- 79,91 ----
                $tmpl->set_var('charset',lang('charset'));
        }
+       
+       if(@$GLOBALS['phpgw_info']['server']['domain_from_host'] 
+               && 
address@hidden'phpgw_info']['server']['show_domain_selectbox'])
+       {
+               $tmpl->set_var('extra', '@' . $_SERVER['SERVER_NAME'] 
+                       . '<input type="hidden" name="logindomain" value="'
+                       . $SERVER['SERVER_NAME'] . '">');
+       }
+       
  
        function check_logoutcode($code)