[Phpgroupware-cvs] phpgroupware index.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    phpgroupware
Changes by:     Dave Hall <skwashd>     06/08/29 05:00:37

Modified files:
        .              : index.php 

Log message:
        fix footer output, esp with json and some E_NOTICES along the way

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/index.php?cvsroot=phpgroupware&r1=1.128&r2=1.129

Patches:
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/index.php,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- index.php   17 Aug 2006 23:07:34 -0000      1.128
+++ index.php   29 Aug 2006 05:00:37 -0000      1.129
@@ -6,7 +6,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgroupware
-       * @version $Id: index.php,v 1.128 2006/08/17 23:07:34 skwashd Exp $
+       * @version $Id: index.php,v 1.129 2006/08/29 05:00:37 skwashd Exp $
        */
 
        $phpgw_info = array();
@@ -21,13 +21,14 @@
        */
        $GLOBALS['sessionid'] = $_REQUEST['sessionid'];
 
+       $invalid_data = false;
        // 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)
                {
-                       $invalid_data = True;
+                       $invalid_data = true;
                }
        }
        else
@@ -36,18 +37,20 @@
        //$phpgw->log->commit();
 
                $app = 'home';
-               $invalid_data = True;
+               $invalid_data = true;
        }
 
+       $api_requested = false;
        if ($app == 'phpgwapi')
        {
                $app = 'home';
-               $api_requested = True;
+               $api_requested = true;
        }
 
-       $GLOBALS['phpgw_info']['flags'] = array(
-               'noheader'   => True,
-               'nonavbar'   => True,
+       $GLOBALS['phpgw_info']['flags'] = array
+       (
+               'noheader'   => true,
+               'nonavbar'   => true,
                'currentapp' => $app
        );
        
@@ -80,7 +83,7 @@
                {
                        $return_data = $GLOBALS[$class]->$method();
                        echo execMethod('phpgwapi.Services_JSON.encode', 
$return_data);
-                       $GLOBALS['phpgw_info']['nofooter'] = true;
+                       $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
                }
                else
                {
@@ -119,8 +122,5 @@
                $GLOBALS['phpgw']->redirect_link('/home.php');
        }
 
-       if (! $GLOBALS['phpgw_info']['nofooter'])
-       {
                $GLOBALS['phpgw']->common->phpgw_footer();
-       }
 ?>