[Phpgroupware-cvs] sitemgr/sitemgr-site config.inc.php, 1.3.2.2, 1.3.2.3

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/sitemgr-site
In directory subversions:/tmp/cvs-serv993

Modified Files:
      Tag: Version-0_9_16-branch
        config.inc.php 
Log Message:
added non default domain support

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/config.inc.php,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** config.inc.php      24 Aug 2003 07:02:27 -0000      1.3.2.2
--- config.inc.php      31 Oct 2003 00:27:21 -0000      1.3.2.3
***************
*** 7,12 ****
        $sitemgr_info = array(
                // add trailing slash
!               'phpgw_path'           => '../../',
!               'htaccess_rewrite'         => False,
        );
  
--- 7,13 ----
        $sitemgr_info = array(
                // add trailing slash
!               'phpgw_path'            => '../..',
!               'htaccess_rewrite'      => False,
!               'phpgw_domain'          => 'default', //which phpgw install to 
use
        );
  
***************
*** 22,31 ****
                include($sitemgr_info['phpgw_path'] . 'header.inc.php');
  
                $GLOBALS['phpgw_info']['flags']['currentapp'] = 'login';
                include(PHPGW_SERVER_ROOT . '/phpgwapi/inc/functions.inc.php');
                $GLOBALS['phpgw_info']['flags']['currentapp'] = 'sitemgr-site';
  
!               $site_url  = ($_SERVER['HTTPS'] ? 'https://' : 'http://');
!               $site_url .=  
preg_replace('/\/[^\/]*$/','',$_SERVER['SERVER_NAME'] . $_SERVER['PHP_SELF']) . 
'/';
  
                $GLOBALS['phpgw']->db->query("SELECT 
anonymous_user,anonymous_passwd FROM phpgw_sitemgr_sites WHERE site_url = 
'$site_url'");
--- 23,34 ----
                include($sitemgr_info['phpgw_path'] . 'header.inc.php');
  
+               //hack to support sitemgr on non default domain
+               $_GET['domain'] = $sitemgr_info['phpgw_domain'];
+ 
                $GLOBALS['phpgw_info']['flags']['currentapp'] = 'login';
                include(PHPGW_SERVER_ROOT . '/phpgwapi/inc/functions.inc.php');
                $GLOBALS['phpgw_info']['flags']['currentapp'] = 'sitemgr-site';
  
!               $site_url = 'http://' . 
preg_replace('/\/[^\/]*$/','',$_SERVER['SERVER_NAME'] . $_SERVER['PHP_SELF']) . 
'/';
  
                $GLOBALS['phpgw']->db->query("SELECT 
anonymous_user,anonymous_passwd FROM phpgw_sitemgr_sites WHERE site_url = 
'$site_url'");