Changeset 7748 for trunk

Timestamp:

01/15/13 08:29:50 (11 years ago)

Author:

cristiano

Message:

Ticket #3292 - Caracter compromete a visualização de mensagens no ExpressoMail?

File:

• trunk/expressoMail1_2/js/connector.js (modified) (7 diffs)

trunk/expressoMail1_2/js/connector.js

@@ -171 +171 @@
         }
 
-                
         //Unserialize Data Method
         cConnector.prototype.unserialize = function(str)
@@ -182 +181 @@
                         do
                         {
-                                nOpen = str.indexOf('{', nClose+1);
-                                nClose = str.indexOf('}', nClose+1);
-
-                                if (nOpen == -1)
-                                {
-                                        return nClose;
-                                }
-                                if (nOpen < nClose )
-                                {
-                                        nClose = matchB(str, nOpen);
-                                }
+                nOpen = str.substr(nClose+1).search(/[0-9]\:\{/ );
+
+                if (nOpen > 0)
+                    nOpen = nOpen + nClose+3;
+
+                nClose = (str.substr(nClose+1) == '}' || str.substr(nClose+1,1) == '}') ? nClose +1 : str.substr(nClose+1).search(/[0-9\"]\;\}/ ) + nClose + 3;
+
+                if (nOpen < 0)
+                {
+                    return nClose;
+                }
+                if (nOpen < nClose )
+                {
+                    nClose = matchB(str, nOpen);
+                }
                         } while (nOpen < nClose);
 
@@ -338 +341 @@
                                                 case 200:
                                                         if (typeof(handler) == 'function')
-                                                        {                                                                                                                               
-                                                                _thisObject.hideProgressBar();                                                                                                                          
+                                                        {
+                                                                _thisObject.hideProgressBar();
                                                                 var data = _thisObject.unserialize(oxmlhttp.responseText);
                                                                 if ( typeof data == 'undefined' )
                                                                         data = oxmlhttp.responseText;
-                                                                // Verify user session 
-                                                                if(data && data.nosession){ 
-                                                                        // If hold session is setted, dont reload the page ... 
-                                                                        if(hold_session) { 
-                                                                                if(typeof(write_msg) == "function" && typeof(get_lang) == "function") 
-                                                                                        write_msg(get_lang("your session could not be verified.")); 
-                                                                                else 
-                                                                                        alert("your session could not be verified."); 
-                                                                        } 
-                                                                        else 
-                                                                                window.location.reload(); 
-
-                                                                        delete _thisObject.requests[id]; 
-                                                                        _thisObject.requests[id] = null; 
-                                                                        return false; 
-                                                                } 
+                                                                // Verify user session
+                                                                if(data && data.nosession){
+                                                                        // If hold session is setted, dont reload the page ...
+                                                                        if(hold_session) {
+                                                                                if(typeof(write_msg) == "function" && typeof(get_lang) == "function")
+                                                                                        write_msg(get_lang("your session could not be verified."));
+                                                                                else
+                                                                                        alert("your session could not be verified.");
+                                                                        }
+                                                                        else
+                                                                                window.location.reload();
+
+                                                                        delete _thisObject.requests[id];
+                                                                        _thisObject.requests[id] = null;
+                                                                        return false;
+                                                                }
                                                                 if(debug_controller) {
                                                                         document.getElementById("debug_controller").innerHTML += oxmlhttp.responseText;
@@ -365 +368 @@
 
                                                                 _thisObject.addToCache(params?id+"&"+params:id,data);
-                                                                delete _thisObject.requests[id];                                                                
+                                                                delete _thisObject.requests[id];
                                                                 _thisObject.requests[id] = null;
                                                                 handler(data);
@@ -373 +376 @@
 
                                                 case 404:
-                                                        
+
                                                         alert(get_lang('Page Not Found!'));
                                                         break;
 
-                                                default:                                                                                                
+                                                default:
                                         }
                                 }
                         }
                         catch (e)
-                        {                       
+                        {
                                 _thisObject.hideProgressBar();
                                 if(debug_controller)
@@ -389 +392 @@
                                 throw(e);
                         }
-                                                
+
                 }
 
                 try
-                { 
+                {
                         if (method == '' || method == 'GET')
                         {                                                               
@@ -417 +420 @@
                 }
                 catch(e)
-                {       
+                {
                         _thisObject.hideProgressBar();
                         if(debug_controller)
                                 alert(e);
-                        // View Exception in Javascript Console  
+                        // View Exception in Javascript Console
                         throw(e);
                 }