Changeset 2691

Timestamp:

05/03/10 14:51:33 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Corrigindo com loop infinito no 'redirect'.

Location:

trunk

Files:

• admin/inc/class.uiapplications.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• phpgwapi/js/tools/xlink.js (modified) (3 diffs)

trunk/admin/inc/class.uiapplications.inc.php

@@ -389 +389 @@
                         $GLOBALS['phpgw']->template->pparse('phpgw_body','body');
                 }
-                
-                function register_all_hooks()
-                {
-                        if ($GLOBALS['phpgw']->acl->check('applications_access',16,'admin'))
-                        {
-                                $GLOBALS['phpgw']->redirect_link('/');
-                        }
-                        if (!is_object($GLOBALS['phpgw']->hooks))
-                        {
-                                $GLOBALS['phpgw']->hooks = CreateObject('phpgwapi.hooks');
-                        }
-                        $GLOBALS['phpgw']->hooks->register_all_hooks();
-                        
-                        $GLOBALS['phpgw']->redirect_link('/admin/');
+
+                function register_all_hooks( )
+                {
+                        if ( ! $GLOBALS[ 'phpgw' ] -> acl -> check( 'applications_access', 16, 'admin' ) )
+                        {
+                                if ( ! is_object( $GLOBALS[ 'phpgw' ] -> hooks ) )
+                                        $GLOBALS[ 'phpgw' ] -> hooks = CreateObject( 'phpgwapi.hooks' );
+
+                                $GLOBALS[ 'phpgw' ] -> hooks -> register_all_hooks( );
+                        }
+
+                        $GLOBALS[ 'phpgw' ] -> redirect_link( '/' );
                 }
         }

trunk/index.php

@@ -70 +70 @@
                         $target = $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] . '/index.php';
 
-                $target = '( function( ){ var target = window.location.hash; target = ( ( ! arguments.length ) && ( target && target.length > 1 ) ? URL_SERVER + target.substr( 1 ) : "'
-                        . $GLOBALS[ 'phpgw' ] -> link( $target ). '" ); XLink( target ); } )';
+                $target = '( function( ){ var target = window.location.hash; target = ('
+                        . '( arguments.length && ( target && target.length > 1 ) ) ?'
+                        . 'URL_SERVER + target.substr( 1 ) : "' . $GLOBALS[ 'phpgw' ] -> link( $target ). '" ); XLink( target ); } )';
 
                 if ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) || array_key_exists( 'BackgroundRequest', $_GET ) )
-                        $target = "{$target}( true );";
+                        $target = "{$target}( );";
                 else
                         $target = "XEvents.add( window, 'onload', {$target} );";

trunk/phpgwapi/js/tools/xlink.js

@@ -9 +9 @@
         _loading.src = URL_SERVER + 'phpgwapi/images/loading.gif';
 
+        var _last_request = null;
+
         function _click( _action, _cache )
         {
@@ -14 +16 @@
                         _action = window.location.protocol + '//' + window.location.host + _action;
 
-                _divAppboxHeader.innerHTML = '';
+                if ( _action == _last_request )
+                        return false;
 
-                var _center = document.createElement( 'center' );
-                _center.appendChild( _loading );
+                if ( _divAppboxHeader )
+                        _divAppboxHeader.innerHTML = '';
 
-                _container.innerHTML = '';
-                _container.appendChild( _center );
+                if ( _container )
+                {
+                        var _center = document.createElement( 'center' );
+                        _center.appendChild( _loading );
+
+                        _container.innerHTML = '';
+                        _container.appendChild( _center );
+                }
 
                 _connector.go(
@@ -28 +37 @@
                         'handler' : _handler
                 } );
+
+                _last_request = _action;
 
                 window.location = '#' + (