Changeset 2630 for trunk/phpgwapi

Timestamp:

04/27/10 09:54:22 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Mitigando problema com escopo do dominio.

Location:

trunk/phpgwapi

Files:

• inc/class.common.inc.php (modified) (1 diff)
• js/expressoAjax/dom.js (modified) (1 diff)
• js/expressoAjax/expressoAjax.js (modified) (3 diffs)
• js/tools/xlink.js (modified) (3 diffs)
• js/tools/xscript.js (modified) (1 diff)

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

@@ -386 +386 @@
                                                 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = '';
 
+                                        $webserver_url = ( ! empty( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] ) ) ?
+                                                $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] : '/';
+
+                                        if ( strpos( $webserver_url, '/' ) != ( strlen( $webserver_url ) - 1 ) )
+                                                $webserver_url .= '/';
+
                                         $GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= '<script type="text/javascript">'
-                                                . 'var URL_SERVER = "' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] . '";'
+                                                . 'var URL_SERVER = "' . $webserver_url . '";'
                                                 . 'var template = "' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ] . '";</script>';
 

trunk/phpgwapi/js/expressoAjax/dom.js

@@ -244 +244 @@
         extra = document.getElementById("extraButton");
         extra.style.visibility = "hidden";
-        but.innerHTML='<a title="' +title + '" onClick="javascript:changeBar()"><img src="' + URL_SERVER + '/phpgwapi/templates/default/images/up.button.png"></a>';
+        but.innerHTML='<a title="' +title + '" onClick="javascript:changeBar()"><img src="' + URL_SERVER + 'phpgwapi/templates/default/images/up.button.png"></a>';
         var neverExpires = new Date("January 01, 2100 00:00:00");
         document.cookie = "showHeader=true"+

trunk/phpgwapi/js/expressoAjax/expressoAjax.js

@@ -337 +337 @@
                 if(is_ie) {
 
-                        this.oxmlhttp.open("GET", URL_SERVER + "/expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion, false);
+                        this.oxmlhttp.open("GET", URL_SERVER + "expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion, false);
                         this.oxmlhttp.setRequestHeader('Content-Type','text/plain');
                         this.oxmlhttp.send(null);
@@ -345 +345 @@
                 }
                 else {
-                        script.src =  URL_SERVER + "/expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion;
+                        script.src =  URL_SERVER + "expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion;
                 }
 
@@ -353 +353 @@
 //------------------------------------  END: Functions for Progress Bar  -------------------------------------------------//
         // Default Controller File
-        var URL_DEFAULT = URL_SERVER + "/controller.php?menuaction=";
+        var URL_DEFAULT = URL_SERVER + "controller.php?menuaction=";
         // connector object
         var _onmouseup = document.onmouseup;

trunk/phpgwapi/js/tools/xlink.js

@@ -7 +7 @@
         var _divAppboxHeader = null;
         var _loading = new Image( );
-        _loading.src = URL_SERVER + '/phpgwapi/images/loading.gif';
+        _loading.src = URL_SERVER + 'phpgwapi/images/loading.gif';
 
         function handler( pLink )
@@ -68 +68 @@
                                                         else
                                                                 _script.add( _new_scripts[ i ][ 2 ].substr(
-                                                                        URL_SERVER.length,
-                                                                        _new_scripts[ i ][ 2 ].indexOf( '?' ) - URL_SERVER.length
+                                                                        URL_SERVER.length - 1,
+                                                                        _new_scripts[ i ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1
                                                                 ) );
 
@@ -94 +94 @@
                         if ( _scripts.item( i ).getAttribute( 'src' ) != null )
                                 _loaded[ _loaded.length ] = _scripts.item( i ).getAttribute( 'src' ).substr(
-                                        URL_SERVER.length,
-                                        _scripts.item( i ).getAttribute( 'src' ).indexOf( '?' ) - URL_SERVER.length
+                                        URL_SERVER.length - 1,
+                                        _scripts.item( i ).getAttribute( 'src' ).indexOf( '?' ) - URL_SERVER.length + 1
                                 );
 

trunk/phpgwapi/js/tools/xscript.js

@@ -26 +26 @@
 
                 _connector.go( {
-                        "access" : URL_SERVER + '/controller.php?action=phpgwapi.javascript.get_source&source=' + _new.join( ';' ),
+                        "access" : URL_SERVER + 'controller.php?action=phpgwapi.javascript.get_source&source=' + _new.join( ';' ),
                         "handler" : function( data )
                         {