Changeset 2608 for trunk/filemanager/inc/class.uifilemanager.inc.php

Timestamp:

04/20/10 16:39:19 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Garantindo que a variável URL_SERVER esteja populada.

File:

• trunk/filemanager/inc/class.uifilemanager.inc.php (modified) (2 diffs)

trunk/filemanager/inc/class.uifilemanager.inc.php

@@ -325 +325 @@
                         //$GLOBALS['phpgw']->common->phpgw_header();
 
-                        echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/global.js' )}'></script>";
-                        echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/main.js' )}'></script>";
-                        echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/common_functions.js' )}'></script>";
-                        echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/connector.js' )}'></script>";
-                        echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/draw_api.js' )}'></script>";
-                        echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/drag_area.js' )}'></script>";
-                        echo "<script src='{$GLOBALS['phpgw'] -> link( '/filemanager/js/handler.js' )}'></script>";
-                        echo "<script src='{$GLOBALS['phpgw'] -> link( '/phpgwapi/js/dftree/dftree.js' )}'></script>";
-
-                        include('load_lang.php');
+                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'dftree', 'dftree' );
+
+                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'global', 'filemanager' );
+                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'load_lang', 'filemanager' );
+                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'main', 'filemanager' );
+                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'common_functions', 'filemanager' );
+                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'connector', 'filemanager' );
+                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'draw_api', 'filemanager' );
+                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'drag_area', 'filemanager' );
+                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'handler', 'filemanager' );
+
+                        //include('load_lang.php');
 
                         # Page to process users
@@ -603 +605 @@
                                 $_SESSION['phpgw_info']['filemanager']['user']['sec_key'] = $key;
                                 $vars['sec_key']='<input type="hidden" id="userKey" value=\''.$key.'\'>';
-                                $vars['script']='<script>initDrawApi();</script>';
-                                
+
+                                $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .=  '<script>'
+                                        . ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) || array_key_exists( 'BackgroundRequest', $_GET ) ) ? 'initDrawApi( )' : 'XEvents.add( window, "onload", initDrawApi )' )
+                                        . ';</script>';
+
                                 $vars['new_button']=$this->toolButton('new','createfile',lang('New...'));
                                 $vars['new_button'].='<input type="hidden" id="newfile_or_dir" name="newfile_or_dir" value="" />';
-                                
+
                                 // reload button with this url
                                 $vars['refresh_button']=$this->toolButton('reload','reload',lang('reload'));