Changeset 2686 for trunk/phpgwapi

Timestamp:

05/03/10 10:43:25 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Removendo reload de alguns itens do 'admin'.

Location:

trunk/phpgwapi

Files:

• inc/class.phpgw.inc.php (modified) (1 diff)
• inc/class.sessions.inc.php (modified) (1 diff)
• js/tools/xlink.js (modified) (1 diff)

trunk/phpgwapi/inc/class.phpgw.inc.php

@@ -166 +166 @@
                         else
                         {
-                                Header("Location: $url");
+                                Header("Location: {$url}");
                                 print("\n\n");
                                 exit;

trunk/phpgwapi/inc/class.sessions.inc.php

@@ -1176 +1176 @@
                         {
                                 $webserver_url_count = strlen($GLOBALS['phpgw_info']['server']['webserver_url'])-1;
-                                if(substr($GLOBALS['phpgw_info']['server']['webserver_url'] ,$webserver_url_count,1) != '/' && $url_firstchar != '/')
-                                {
-                                        $url = $GLOBALS['phpgw_info']['server']['webserver_url'] .'/'. $url;
-                                }
-                                else
-                                {
-                                        $url = $GLOBALS['phpgw_info']['server']['webserver_url'] . $url;
-                                }
+                                if ( ! ( substr($GLOBALS['phpgw_info']['server']['webserver_url'] ,$webserver_url_count,1) != '/' && $url_firstchar != '/' ) )
+                                        $url = substr( $url, 1 );
+
+                                $url = "{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$url}";
                         }
 

trunk/phpgwapi/js/tools/xlink.js

@@ -11 +11 @@
         function _click( _action, _cache )
         {
-
                 if ( _action.indexOf( window.location.host ) < 0 )
                         _action = window.location.protocol + '//' + window.location.host + _action;