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

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/10/01 14:06:13

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

Log message:
        notices and little cleaning as we go

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

Patches:
Index: class.hooks.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.hooks.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- class.hooks.inc.php 3 Sep 2006 16:53:01 -0000       1.21
+++ class.hooks.inc.php 1 Oct 2006 14:06:13 -0000       1.22
@@ -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.21 2006/09/03 16:53:01 Caeies 
Exp $
+       * @version $Id: class.hooks.inc.php,v 1.22 2006/10/01 14:06:13 skwashd 
Exp $
        */
 
        /**
@@ -133,26 +133,21 @@
                                                $method = 
'hook_'.$location.'.inc.php';
                                        }
                                        $f = PHPGW_SERVER_ROOT . $SEP . 
$appname . $SEP . 'inc' . $SEP . $method;
-                                       if (file_exists($f) &&
-                                               ( 
(isset($GLOBALS['phpgw_info']['user']) && 
$GLOBALS['phpgw_info']['user']['apps'][$appname]) || (($no_permission_check || 
$location == 'config' || $appname == 'phpgwapi') && $appname)) )
+                                       if ( ( 
(isset($GLOBALS['phpgw_info']['user']['apps'][$appname]) && 
$GLOBALS['phpgw_info']['user']['apps'][$appname]) 
+                                                       || 
(($no_permission_check || $location == 'config' || $appname == 'phpgwapi') && 
$appname)) 
+                                               && file_exists($f) )
                                        {
-                                               include($f);
-                                               return True;
-                                       }
-                                       else
-                                       {
-                                               return False;
+                                               include_once($f);
+                                               return true;
                                        }
+                                       return false;
                                }
                                else    // new style method-hook
                                {
                                        return ExecMethod($method,$args);
                                }
                        }
-                       else
-                       {
-                               return False;
-                       }
+                       return false;
                }
 
                /**