Changeset 2549 for trunk/phpgwapi/inc/functions.inc.php

Timestamp:

04/15/10 15:26:02 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problemas com a inclusão de javascript.

File:

• trunk/phpgwapi/inc/functions.inc.php (modified) (4 diffs)

trunk/phpgwapi/inc/functions.inc.php

@@ -30 +30 @@
         error_reporting(error_reporting() & ~E_NOTICE);
 
-        include(PHPGW_API_INC.'/common_functions.inc.php');
+        include_once(PHPGW_API_INC.'/common_functions.inc.php');
         
         /*!
@@ -234 +234 @@
         $GLOBALS['phpgw']->preferences  = CreateObject('phpgwapi.preferences');
         $GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications');
+        $GLOBALS['phpgw']->js           = CreateObject('phpgwapi.javascript');
         print_debug('main class loaded', 'messageonly','api');
         if (! isset($GLOBALS['phpgw_info']['flags']['included_classes']['error']) ||
@@ -403 +404 @@
                                 ! $GLOBALS['phpgw_info']['user']['apps']['admin']))
                         {
-                                $GLOBALS['phpgw']->common->phpgw_header();
+                                //$GLOBALS['phpgw']->common->phpgw_header();
 
                                 $GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access %1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));
@@ -416 +417 @@
                         $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.date_time');
                 }
+
                 $GLOBALS['phpgw']->applications->read_installed_apps(); // to get translated app-titles
-                
-                /*************************************************************************\
-                * Load the header unless the developer turns it off                       *
-                \*************************************************************************/
-                if ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) || array_key_exists( 'BackgroundRequest', $_GET ) )
-                {
-                        $GLOBALS['phpgw_info']['flags'] = array(
-                                'noheader'   => true,
-                                'nonavbar'   => true
-                        );
-                }
-                if (!@$GLOBALS['phpgw_info']['flags']['noheader'])
-                {
-                        $GLOBALS['phpgw']->common->phpgw_header();
-                }
-        }
+        }