[Phpgroupware-cvs] CVS: phpgroupware index.php,1.118,1.119

[Ralf Becker <address@hidden>]

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

Modified Files:
        index.php 
Log Message:
redirect to setup if there is no header and some other stuff from .16

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/index.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -r1.118 -r1.119
*** index.php   21 Apr 2003 08:38:17 -0000      1.118
--- index.php   18 May 2003 15:18:02 -0000      1.119
***************
*** 12,16 ****
  
        $GLOBALS['phpgw_info'] = array();
!       $GLOBALS['sessionid'] = @$GLOBALS['HTTP_GET_VARS']['sessionid'] ? 
@$GLOBALS['HTTP_GET_VARS']['sessionid'] : 
@$GLOBALS['HTTP_COOKIE_VARS']['sessionid'];
        if (! $GLOBALS['sessionid'])
        {
--- 12,22 ----
  
        $GLOBALS['phpgw_info'] = array();
!       if (!file_exists('header.inc.php'))
!       {
!               Header('Location: setup/index.php');
!               exit;
!       }
! 
!       $GLOBALS['sessionid'] = get_var('sessionid',array('GET','COOKIE'));
        if (! $GLOBALS['sessionid'])
        {
***************
*** 22,28 ****
                This is the preliminary menuaction driver for the new 
multi-layered design
        */
!       if (@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
        {
!               list($app,$class,$method) = 
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
                if (! $app || ! $class || ! $method)
                {
--- 28,34 ----
                This is the preliminary menuaction driver for the new 
multi-layered design
        */
!       if (@isset($_GET['menuaction']))
        {
!               list($app,$class,$method) = explode('.',$_GET['menuaction']);
                if (! $app || ! $class || ! $method)
                {
***************
*** 70,74 ****
        {
  //            eval("\$GLOBALS['obj']->$method();");
!               execmethod($GLOBALS['HTTP_GET_VARS']['menuaction']);
  
                if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
--- 76,80 ----
        {
  //            eval("\$GLOBALS['obj']->$method();");
!               execmethod($_GET['menuaction']);
  
                if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
***************
*** 107,111 ****
                $GLOBALS['phpgw']->log->commit();
  
!               $phpgw->redirect($GLOBALS['phpgw']->link('/home.php'));
                /*
                $_obj = CreateObject('home.home');
--- 113,117 ----
                $GLOBALS['phpgw']->log->commit();
  
!               $GLOBALS['phpgw']->redirect_link('/home.php');
                /*
                $_obj = CreateObject('home.home');