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

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/26 12:39:18

Modified files:
        inc            : functions.inc.php class.xslttemplates.inc.php 

Log message:
        fix navbar outputting

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/functions.inc.php?cvsroot=phpgwapi&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xslttemplates.inc.php?cvsroot=phpgwapi&r1=1.32&r2=1.33

Patches:
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- functions.inc.php   26 Sep 2006 11:16:19 -0000      1.207
+++ functions.inc.php   26 Sep 2006 12:39:17 -0000      1.208
@@ -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.207 2006/09/26 11:16:19 skwashd 
Exp $
+       * @version $Id: functions.inc.php,v 1.208 2006/09/26 12:39:17 skwashd 
Exp $
        */
        
        
@@ -661,7 +661,7 @@
                {
                        if (!$GLOBALS['phpgw']->acl->check('run', 
PHPGW_ACL_READ, $GLOBALS['phpgw_info']['flags']['currentapp']))
                        {
-                               
$GLOBALS['phpgw']->common->phpgw_header($GLOBALS['phpgw_info']['flags']['nonavbar']?False:True);
+                               $GLOBALS['phpgw']->common->phpgw_header( 
!(isset($GLOBALS['phpgw_info']['flags']['nonavbar']) && 
$GLOBALS['phpgw_info']['flags']['nonavbar']) );
                                
$GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access 
%1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));
 
                                echo '<p><center><b>'.lang('Access not 
permitted').'</b></center>';

Index: class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- class.xslttemplates.inc.php 25 Sep 2006 15:34:15 -0000      1.32
+++ class.xslttemplates.inc.php 26 Sep 2006 12:39:17 -0000      1.33
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.xslttemplates.inc.php,v 1.32 2006/09/25 15:34:15 
skwashd Exp $
+       * @version $Id: class.xslttemplates.inc.php,v 1.33 2006/09/26 12:39:17 
skwashd Exp $
        */
 
        if( (floor(phpversion()) == 4 && !extension_loaded('xslt') )
@@ -275,7 +275,7 @@
 
                function parse($parsexsl = True, $parsexml = True)
                {
-                       $output_header = 
isset($GLOBALS['phpgw_info']['flags']['nonavbar']) && 
$GLOBALS['phpgw_info']['flags']['nonavbar'];
+                       $output_header = 
!(isset($GLOBALS['phpgw_info']['flags']['nonavbar']) && 
$GLOBALS['phpgw_info']['flags']['nonavbar']);
                        
                        // Determine whether the browser is wml-capable or not
                        $wml_out = execMethod('phpgwapi.browser.is_mobile');