Changeset 2700

Timestamp:

05/04/10 11:40:21 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Forçando que a URL esteja sempre na raiz.

Location:

trunk

Files:

• expressoAdmin1_2/index.php (modified) (1 diff)
• phpgwapi/js/tools/xlink.js (modified) (1 diff)

trunk/expressoAdmin1_2/index.php

@@ -52 +52 @@
 
         $url = $GLOBALS[ 'phpgw' ] -> link( '/' );
-        if ( strpos( $url, '/' ) == strlen( $url ) - 1 )
+        if ( strrpos( $url, '/' ) == strlen( $url ) - 1 )
                 $url = substr( $url, 0, -1 );
 

trunk/phpgwapi/js/tools/xlink.js

@@ -1 +1 @@
 ( function( )
 {
+        if ( window.location.protocol + '//' + window.location.host + window.location.pathname != URL_SERVER )
+                window.location.href = URL_SERVER + (
+                        ( window.location.hash ) ?
+                                window.location.hash : '#' + String( window.location.protocol + '//' + window.location.host + window.location.pathname ).substr( URL_SERVER.length )
+                );
+
         var _connector = new XConnector;
         var _script = null;