Changeset 3678

Timestamp:

01/11/11 16:39:34 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1488 - Corrigido o erro ao salvar as preferencias para a visualizacao das caracteristicas dos arquivos.

Location:

branches/2.2/filemanager

Files:

• inc/class.user.inc.php (modified) (1 diff)
• js/common_functions.js (modified) (1 diff)
• js/connector.js (modified) (3 diffs)

branches/2.2/filemanager/inc/class.user.inc.php

@@ -119 +119 @@
                 }
                 function save_preferences(){
-                        unset($_SESSION['phpgw_info']['user']['preferences']['filemanager']);
+
                         $_SESSION['phpgw_info']['user']['preferences']['filemanager'] = unserialize($this->preferences);
                         /* See if preferences exists or not */

branches/2.2/filemanager/js/common_functions.js

@@ -279 +279 @@
                 }
 
-                cExecute_('./index.php?menuaction=filemanager.user.save_preferences&preferences='+base64_encode(serialize(preferences)),function () { toolbar.control('reload'); EditColumns('close'); });
+                cExecute_('./index.php?menuaction=filemanager.user.save_preferences',function () { toolbar.control('reload'); EditColumns('close'); }, 'preferences='+serialize(preferences) );
         }
         else

branches/2.2/filemanager/js/connector.js

@@ -116 +116 @@
 }
 
-function cExecute_(requestURL,handler){
+function cExecute_(requestURL, handler, params){
         if (connector.isVisibleBar == true){
                 setTimeout('cExecute_("'+requestURL+'",'+handler+')',150);
@@ -136 +136 @@
                 }
         }
-        var responseRequest = function (){
-                if (Ajax.readyState == 4)
-                        if (Ajax.status == 200){
-                                handler(Ajax.responseText);
-                                connector.hideProgressBar();
+        
+        var responseRequest = function()
+        {
+                try
+                {
+                        if ( Ajax.readyState == 4 )
+                        {
+                                switch ( Ajax.status )
+                                {
+                                        case 200:
+                                                if (typeof(handler) == 'function')
+                                                {                                                                                                                               
+                                                        connector.hideProgressBar();
+                                                        var data = Ajax.responseText;
+                                                        handler(data);
+                                                }
+
+                                                break;
+
+                                        case 404:
+                                                
+                                                alert(get_lang('Page Not Found!'));
+                                                break;
+
+                                        default:                                                                                                
+                                }
                         }
-                        else
-                                throw("Connection error!");
-        }
-
-
+                }
+                catch (e)
+                {                       
+                        connector.hideProgressBar();
+                        // View Exception in Javascript Console
+                        throw(e);
+                }
+        }
+        
         AjaxRequest();
+        
         if (!Ajax){
                 throw("No connection");
@@ -153 +179 @@
         }
 
-        Ajax.onreadystatechange = responseRequest;
-        if (typeof(method) == 'undefined')
-                method = 'GET';
-        Ajax.open(method, requestURL, true);
-        Ajax.send(null);
+        if( typeof(params) == 'undefined' )
+        {
+                Ajax.open('GET', requestURL, true);
+                Ajax.onreadystatechange = responseRequest;
+                Ajax.send(null);
+        }       
+        else
+        {
+                Ajax.open("POST", requestURL, true);
+                Ajax.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
+                Ajax.onreadystatechange = responseRequest;
+                Ajax.send( params );
+        }
 }