Changeset 2549 for trunk/phpgwapi/inc/class.common.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/class.common.inc.php (modified) (7 diffs)

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

@@ -368 +368 @@
                                 define('PHPGW_FINAL',True);
 
+                                $module_content = ob_get_contents( );
+
+                                ob_clean( );
+
+                                /*************************************************************************\
+                                * 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_merge( $GLOBALS['phpgw_info']['flags'], array(
+                                                'noheader'   => true,
+                                                'nonavbar'   => true
+                                        ) );
+
+                                if ( ! @$GLOBALS['phpgw_info']['flags']['noheader'] )
+                                {
+                                        if ( ! isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script_thirst' ] ) )
+                                                $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = '';
+
+                                        $GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= '<script type="text/javascript">var URL_SERVER = "'
+                                                . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] . '";'
+                                                . 'var template = "' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ] . '";</script>';
+
+                                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'wz_dragdrop', 'wz_dragdrop', NULL, true );
+                                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'expressoAjax', 'expressoAjax', NULL, true );
+                                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xlink', NULL, true );
+                                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xconnector', NULL, true );
+                                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xevent', NULL, true );
+
+                                        $this -> phpgw_header( );
+                                }
+                                else
+                                        echo $this -> get_java_script( );
+
+                                echo $module_content;
+
                                 /*if (is_object($GLOBALS['phpgw']->accounts))
                                 {
                                         $GLOBALS['phpgw']->accounts->save_session_cache();
                                 }*/
+
                                 // call the asyncservice check_run function if it is not explicitly set to cron-only
                                 //
@@ -378 +414 @@
                                         ExecMethod('phpgwapi.asyncservice.check_run','fallback');
                                 }
+
                                 /* Clean up mcrypt */
                                 if (@is_object($GLOBALS['phpgw']->crypto))
@@ -384 +421 @@
                                         unset($GLOBALS['phpgw']->crypto);
                                 }
+
                                 $GLOBALS['phpgw']->db->disconnect();
                         }
@@ -1213 +1251 @@
                         // add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv)
                         header('Content-type: text/html; charset='.$GLOBALS['phpgw']->translation->charset());
-                        include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set']
-                                . '/head.inc.php');
+
+                        include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/head.inc.php');
+
                         $this->navbar(False);
-                        include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set']
-                                . '/navbar.inc.php');
-
-                        if(!@is_object($GLOBALS['phpgw']->js))
-                        {
-                                $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
-                        }
-
-                        $GLOBALS['phpgw']->js->validate_file( 'tools','xevent' );
-                        $GLOBALS['phpgw']->js->validate_file( 'tools','xconnector' );
-                        $GLOBALS['phpgw']->js->validate_file( 'tools','xlink' );
-
-                        $GLOBALS['phpgw']->js->validate_file('expressoAjax','expressoAjax');
-
-                        $GLOBALS['phpgw']->js->validate_file('wz_dragdrop','wz_dragdrop');
-
-                        echo "\n<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>\n";
-                        echo $GLOBALS['phpgw']->js->get_script_links();
-
-                        $GLOBALS['phpgw']->js->unset_script_link( 'phpgwapi','tools' );
-
-                        $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','expressoAjax');
-
-                        // TODO
-                        // Esse javascript será carregado sempre pois causa grandes
-                        // problemas em diversos módulos. Algum dia será substituido.
-                        $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','wz_dragdrop');
+
+                        include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/navbar.inc.php');
 
                         if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target'])
-                        {
                                 echo parse_navbar();
-                        } 
                 }
 
@@ -1343 +1355 @@
                 * @return string the javascript to be included
                 */
-                function get_java_script()
+                function get_java_script( )
                 {
                         $java_script = '';
@@ -1349 +1361 @@
                         /* this flag is for all javascript code that has to be put before other jscode. 
                         Think of conf vars etc...  (pim@lingewoud.nl) */
-                        if (isset($GLOBALS['phpgw_info']['flags']['java_script_thirst']))
-                        {
-                                $java_script .= $GLOBALS['phpgw_info']['flags']['java_script_thirst'] . "\n";
-                        }
-                        
-                        if(@is_object($GLOBALS['phpgw']->js))
-                        {
-                                $java_script .= $GLOBALS['phpgw']->js->get_script_links();
-                        }
+                        if ( isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script_thirst' ] ) )
+                                $java_script .= $GLOBALS['phpgw_info']['flags']['java_script_thirst'];
+
+                        if( is_object( $GLOBALS[ 'phpgw' ] -> js ) )
+                                $java_script .= $GLOBALS[ 'phpgw' ] -> js -> get_script_links( );
 
                         if(@isset($_GET['menuaction']))
@@ -1368 +1376 @@
                                 }
                         }
-                        if (isset($GLOBALS['phpgw_info']['flags']['java_script']))
-                        {
-                                $java_script .= $GLOBALS['phpgw_info']['flags']['java_script'] . "\n";
-                        }
+
+                        if ( isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] ) )
+                                $java_script .= $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ];
+
                         return $java_script;
                 }