[Phpgroupware-cvs] ged/inc/hook_home.inc.php infolog/inc/hook_home...

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    stocks
Changes by:     Dave Hall <skwashd>     06/08/30 17:02:38

Modified files:
        ged/inc        : hook_home.inc.php 
        infolog/inc    : hook_home.inc.php 
        projects/inc   : hook_home.inc.php 
        inc            : hook_home.inc.php 

Log message:
        E_NOTICES

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/infolog/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/projects/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/stocks/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23

Patches:
Index: ged/inc/hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/ged/inc/hook_home.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ged/inc/hook_home.inc.php   17 Jun 2006 18:25:07 -0000      1.4
+++ ged/inc/hook_home.inc.php   30 Aug 2006 17:02:38 -0000      1.5
@@ -11,17 +11,10 @@
        *  option) any later version
        
***************************************************************************/
        
-       $d1=strtolower(substr(PHPGW_APP_INC,0,3));
-       if($d1=='htt' || $d1=='ftp' )
-       {
-               echo 'Failed attempt to break in via an old Security 
Hole!<br>'."\n";
-               $GLOBALS['phpgw']->common->phpgw_exit();
-       }
-       unset($d1);
-
-       $tmp_app_inc=$GLOBALS['phpgw']->common->get_inc_dir('ged');
+       $tmp_app_inc = $GLOBALS['phpgw']->common->get_inc_dir('ged');
 
-       if 
($GLOBALS['phpgw_info']['user']['preferences']['ged']['mainscreen_show_ged_news']=='True')
+       if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['ged']['mainscreen_show_ged_news'])
+               && 
$GLOBALS['phpgw_info']['user']['preferences']['ged']['mainscreen_show_ged_news']
 == 'True' )
        {
                        $title='<font color="#FFFFFF">'.lang('ged').'</font>';
                

Index: infolog/inc/hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_home.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- infolog/inc/hook_home.inc.php       5 Jan 2005 22:07:58 -0000       1.9
+++ infolog/inc/hook_home.inc.php       30 Aug 2006 17:02:38 -0000      1.10
@@ -14,9 +14,10 @@
  * the Free Software Foundation; either version 2 of the License, or   *
  * at your option) any later version.                                  *
  \**********************************************************************/
- /* $Id: hook_home.inc.php,v 1.9 2005/01/05 22:07:58 ceb Exp $ */
+ /* $Id: hook_home.inc.php,v 1.10 2006/08/30 17:02:38 skwashd Exp $ */
 
-       if 
($GLOBALS['phpgw_info']['user']['preferences']['infolog']['homeShowEvents'])
+       if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['infolog']['homeShowEvents'])
+               && 
$GLOBALS['phpgw_info']['user']['preferences']['infolog']['homeShowEvents'] )
        {
                $save_app = $GLOBALS['phpgw_info']['flags']['currentapp'];
                $GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog';

Index: projects/inc/hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_home.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- projects/inc/hook_home.inc.php      9 Apr 2005 22:36:30 -0000       1.5
+++ projects/inc/hook_home.inc.php      30 Aug 2006 17:02:38 -0000      1.6
@@ -6,19 +6,12 @@
        * @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 projects
-       * @version $Id: hook_home.inc.php,v 1.5 2005/04/09 22:36:30 ceb Exp $
+       * @version $Id: hook_home.inc.php,v 1.6 2006/08/30 17:02:38 skwashd Exp 
$
        * $Source: /cvsroot/phpgroupware/projects/inc/hook_home.inc.php,v $
        */
 
-       $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
-       if($d1 == 'htt' || $d1 == 'ftp' )
-       {
-               echo "Failed attempt to break in via an old Security Hole!<br 
/>\n";
-               $GLOBALS['phpgw']->common->phpgw_exit();
-       }
-       unset($d1);
-
-       if 
($GLOBALS['phpgw_info']['user']['preferences']['projects']['mainscreen_showevents']
 == True)
+       if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['projects']['mainscreen_showevents'])
+               && 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['mainscreen_showevents']
 == True)
        {
 
                $projects = CreateObject('projects.uiprojects');

Index: stocks/inc/hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/stocks/inc/hook_home.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- stocks/inc/hook_home.inc.php        30 Aug 2006 16:24:28 -0000      1.22
+++ stocks/inc/hook_home.inc.php        30 Aug 2006 17:02:38 -0000      1.23
@@ -8,10 +8,11 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your   *
        * option) any later version.                                            
   *
        
\**************************************************************************/
-       /* $Id: hook_home.inc.php,v 1.22 2006/08/30 16:24:28 skwashd Exp $ */
+       /* $Id: hook_home.inc.php,v 1.23 2006/08/30 17:02:38 skwashd Exp $ */
 
        if ( isset($GLOBALS['phpgw_info']['user']['apps']['stocks'])
                && $GLOBALS['phpgw_info']['user']['apps']['stocks'] 
+               && 
isset($GLOBALS['phpgw_info']['user']['preferences']['stocks']['mainscreen'])
                && 
$GLOBALS['phpgw_info']['user']['preferences']['stocks']['mainscreen'] == 
'enabled')
        {
                $app_id = $GLOBALS['phpgw']->applications->name2id('stocks');