[Phpgroupware-cvs] phpgroupware home.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    phpgroupware
Changes by:     Dave Hall <skwashd>     06/08/30 16:19:46

Modified files:
        .              : home.php 

Log message:
        E_ALL

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/home.php?cvsroot=phpgroupware&r1=1.30&r2=1.31

Patches:
Index: home.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/home.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- home.php    15 Apr 2005 13:19:15 -0000      1.30
+++ home.php    30 Aug 2006 16:19:46 -0000      1.31
@@ -7,7 +7,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: home.php,v 1.30 2005/04/15 13:19:15 powerstat Exp $
+       * @version $Id: home.php,v 1.31 2006/08/30 16:19:46 skwashd Exp $
        */
 
        /**
@@ -45,7 +45,7 @@
        include_once('header.inc.php');
 
        // check if forward parameter is set
-       if (@$_GET['phpgw_forward'])
+       if ( isset($_GET['phpgw_forward']) && is_array($_GET['phpgw_forward']) )
        {
                foreach($_GET as $name => $value)
                {
@@ -61,15 +61,15 @@
                exit;
        }
 
-       if ($GLOBALS['phpgw_info']['server']['force_default_app'] 
+       if ( isset($GLOBALS['phpgw_info']['server']['force_default_app'])
                && $GLOBALS['phpgw_info']['server']['force_default_app'] != 
'user_choice')
        {
                
$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] = 
$GLOBALS['phpgw_info']['server']['force_default_app'];
        }
 
-       if 
(($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'] &&
-               $GLOBALS['phpgw_info']['server']['useframes'] == 'allowed') ||
-               ($GLOBALS['phpgw_info']['server']['useframes'] == 'always'))
+       if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'])
+               && ($GLOBALS['phpgw_info']['server']['useframes'] == 'allowed'
+               || $GLOBALS['phpgw_info']['server']['useframes'] == 'always') )
                {
                        if ($_GET['cd'] == 'yes')
                        {
@@ -227,22 +227,24 @@
                $GLOBALS['phpgw_info']['user']['preferences'] = 
$GLOBALS['phpgw']->preferences->save_repository();
        }
 
-       
if(is_array($GLOBALS['phpgw_info']['user']['preferences']['portal_order']))
+       if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['portal_order'])
+               && 
is_array($GLOBALS['phpgw_info']['user']['preferences']['portal_order']) )
        {
                $app_check = Array();
-               
@ksort($GLOBALS['phpgw_info']['user']['preferences']['portal_order']);
-               while(list($order,$app) = 
each($GLOBALS['phpgw_info']['user']['preferences']['portal_order']))
+               
ksort($GLOBALS['phpgw_info']['user']['preferences']['portal_order']);
+               
foreach($GLOBALS['phpgw_info']['user']['preferences']['portal_order'] as $app 
=> $order)
                {
-                       if(!isset($app_check[intval($app)]) || 
!$app_check[intval($app)])
+                       if(!isset($app_check[$app]) || !$app_check[$app])
                        {
                                $app_check[intval($app)] = True;
-                               $sorted_apps[] = 
$GLOBALS['phpgw']->applications->id2name(intval($app));
+                               $sorted_apps[] = 
$GLOBALS['phpgw']->applications->id2name($app);
                        }
                }
        }
        else
        {
-               $sorted_apps = Array(
+               $sorted_apps = array
+               (
                        'email',
                        'calendar',
                        'news_admin',
@@ -250,10 +252,9 @@
                        'squirrelmail'
                );
        }
-       @reset($sorted_apps);
        $GLOBALS['phpgw']->hooks->process('home',$sorted_apps);
 
-       if($GLOBALS['portal_order'])
+       if ( isset($GLOBALS['portal_order']) )
        {
                $GLOBALS['phpgw']->preferences->delete('portal_order');
                @reset($GLOBALS['portal_order']);