[Phpgroupware-cvs] CVS: sitemgr/sitemgr-link index.php,1.7,1.7.2.1

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/sitemgr-link
In directory subversions:/tmp/cvs-serv14915/sitemgr-link

Modified Files:
      Tag: Version-0_9_16-branch
        index.php 
Log Message:
sync up with HEAD


Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-link/index.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** index.php   31 Jan 2003 17:03:42 -0000      1.7
--- index.php   23 Jun 2003 20:31:21 -0000      1.7.2.1
***************
*** 25,32 ****
                die();
        }
!       $pref_so = CreateObject('sitemgr.sitePreference_SO', True);
!       $location = $pref_so->getPreference('sitemgr-site-url');
!       $dir = $pref_so->getPreference('sitemgr-site-dir');
!       $sitemgr_info['sitemgr-site-url'] = 
$pref_so->getPreference('sitemgr-site-url');
        if ($location && file_exists($dir . '/functions.inc.php'))
        {
--- 25,33 ----
                die();
        }
!       $sites_bo = createobject('sitemgr.Sites_BO');
!       $siteinfo = $sites_bo->get_currentsiteinfo();
!       $location = $siteinfo['site_url'];
!       $dir = $siteinfo['site_dir'];
!       $sitemgr_info['site_url'] = $location;
        if ($location && file_exists($dir . '/functions.inc.php'))
        {