[Phpgroupware-cvs] phpgwapi/inc functions.inc.php

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/10/20 14:07:42

Modified files:
        inc            : functions.inc.php 

Log message:
        remove some old commented code which really doesn't need to be kept

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/functions.inc.php?cvsroot=phpgwapi&r1=1.209&r2=1.210

Patches:
Index: functions.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- functions.inc.php   3 Oct 2006 14:05:02 -0000       1.209
+++ functions.inc.php   20 Oct 2006 14:07:42 -0000      1.210
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage utilities
-       * @version $Id: functions.inc.php,v 1.209 2006/10/03 14:05:02 Caeies 
Exp $
+       * @version $Id: functions.inc.php,v 1.210 2006/10/20 14:07:42 skwashd 
Exp $
        */
        
        
@@ -602,16 +602,6 @@
                define('PHPGW_IMAGES', 
ExecMethod('phpgwapi.phpgw.common.get_image_path'));
                define('PHPGW_APP_IMAGES_DIR', 
ExecMethod('phpgwapi.phpgw.common.get_image_dir'));
 
-               /*      define('PHPGW_APP_IMAGES_DIR', 
$GLOBALS['phpgw']->common->get_image_dir()); */
-
-               /* Moved outside of this logic
-               define('PHPGW_ACL_READ',1);
-               define('PHPGW_ACL_ADD',2);
-               define('PHPGW_ACL_EDIT',4);
-               define('PHPGW_ACL_DELETE',8);
-               define('PHPGW_ACL_PRIVATE',16);
-               */
-
        
/************************************************************************\
        * Load the menuaction                                                   
 *
        
\************************************************************************/
@@ -644,7 +634,8 @@
                
/*************************************************************************\
                * These lines load up the templates class                       
          *
                
\*************************************************************************/
-               
if(address@hidden'phpgw_info']['flags']['disable_Template_class'])
+               if ( 
!isset($GLOBALS['phpgw_info']['flags']['disable_Template_class'])
+                       || 
!$GLOBALS['phpgw_info']['flags']['disable_Template_class'] )
                {
                        $GLOBALS['phpgw']->template = 
createObject('phpgwapi.Template',PHPGW_APP_TPL);
                        $GLOBALS['phpgw']->xslttpl = 
createObject('phpgwapi.xslttemplates',PHPGW_APP_TPL);