Changeset 2367

Timestamp:

03/29/10 12:52:27 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Desfazendo alteração, pois foi enviado arquivos extras

Location:

trunk

Files:

• home.php (modified) (2 diffs)
• phpgwapi/inc/class.common.inc.php (modified) (1 diff)
• phpgwapi/inc/functions.inc.php (modified) (1 diff)

trunk/home.php

@@ -27 +27 @@
         $GLOBALS['phpgw_info']['flags'] = array(
                 'noheader'                => True,
-                'nonavbar'                => ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) ) ? true : false ),
+                'nonavbar'                => True,
                 'currentapp'              => 'home',
                 'enable_network_class'    => True,
@@ -65 +65 @@
         {
                 $GLOBALS['phpgw']->common->phpgw_header();
-                //echo parse_navbar();
+                echo parse_navbar();
         }
         // Default Applications (Home Page) 

trunk/phpgwapi/inc/class.common.inc.php

@@ -1224 +1224 @@
                         }
 
-                        $GLOBALS['phpgw']->js->validate_file( 'tools','event_config' );
-                        $GLOBALS['phpgw']->js->validate_file( 'tools','xconnector' );
+                        //$GLOBALS['phpgw']->js->validate_file( 'tools','event_config' );
+                        //$GLOBALS['phpgw']->js->validate_file( 'tools','xconnector' );
                         //$GLOBALS['phpgw']->js->validate_file( 'tools','xlink' );
 

trunk/phpgwapi/inc/functions.inc.php

@@ -421 +421 @@
                         {
                                 $GLOBALS['phpgw']->common->phpgw_header();
+                                if ($GLOBALS['phpgw_info']['flags']['noheader'])
+                                {
+                                        echo parse_navbar();
+                                }
 
                                 $GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access %1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));