phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/inc class.hooks.inc.php


From: Caeies
Subject: [Phpgroupware-cvs] phpgwapi/inc class.hooks.inc.php
Date: Sun, 03 Sep 2006 16:53:02 +0000

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Caeies <Caeies> 06/09/03 16:53:02

Modified files:
        inc            : class.hooks.inc.php 

Log message:
        E_ALL fix

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.hooks.inc.php?cvsroot=phpgwapi&r1=1.20&r2=1.21

Patches:
Index: class.hooks.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.hooks.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.hooks.inc.php 3 Sep 2006 06:15:27 -0000       1.20
+++ class.hooks.inc.php 3 Sep 2006 16:53:01 -0000       1.21
@@ -6,7 +6,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.hooks.inc.php,v 1.20 2006/09/03 06:15:27 skwashd 
Exp $
+       * @version $Id: class.hooks.inc.php,v 1.21 2006/09/03 16:53:01 Caeies 
Exp $
        */
 
        /**
@@ -76,6 +76,7 @@
                        {
                                $apps = $GLOBALS['phpgw_info']['user']['apps'];
                        }
+                       if(is_array($apps))
                        foreach($apps as $app)
                        {
                                $appname = $app['name'];
@@ -119,7 +120,11 @@
                        /* First include the ordered apps hook file */
                        if (isset($this->found_hooks[$appname][$location]) || 
$try_unregistered)
                        {
+                               $parts = null;
+                               
if(isset($this->found_hooks[$appname][$location]))
+                               {
                                $parts = explode('.',$method = 
$this->found_hooks[$appname][$location]);
+                               }
                                
                                if (count($parts) != 3 || ($parts[1] == 'inc' 
&& $parts[2] == 'php'))
                                {
@@ -129,7 +134,7 @@
                                        }
                                        $f = PHPGW_SERVER_ROOT . $SEP . 
$appname . $SEP . 'inc' . $SEP . $method;
                                        if (file_exists($f) &&
-                                               ( 
$GLOBALS['phpgw_info']['user']['apps'][$appname] || (($no_permission_check || 
$location == 'config' || $appname == 'phpgwapi') && $appname)) )
+                                               ( 
(isset($GLOBALS['phpgw_info']['user']) && 
$GLOBALS['phpgw_info']['user']['apps'][$appname]) || (($no_permission_check || 
$location == 'config' || $appname == 'phpgwapi') && $appname)) )
                                        {
                                                include($f);
                                                return True;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]