Changeset 1809

Timestamp:

12/11/09 09:34:51 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Tratamento de erros no salvamento de preferencias no filmanager

Location:

sandbox/filemanager

Files:

• inc/class.user.inc.php (modified) (2 diffs)
• js/common_functions.js (modified) (1 diff)
• js/drag_area.js (modified) (1 diff)
• js/draw_api.js (modified) (3 diffs)
• templates/default/images/button_cancel.png (modified) (previous)
• templates/default/main.tpl (modified) (1 diff)

sandbox/filemanager/inc/class.user.inc.php

@@ -102 +102 @@
                 }
                 function save_preferences(){
-                        $string_serial = addslashes($this->preferences);
-                        $query = "update phpgw_preferences set preference_value = '".$string_serial."' where preference_app = 'filemanager'".
-                                " and preference_owner = '".$this->user_id."'";
+                        /* See if preferences exists or not */
+                        $query = "SELECT count(preference_owner) FROm phpgw_preferences WHERE preference_app = 'filemanager' AND preference_owner = 1009 LIMIT 1";
+                        if ($GLOBALS['phpgw']->db->query($query) && $GLOBALS['phpgw']->db->next_record())
+                                $val = $GLOBALS['phpgw']->db->row();
+                        else
+                        {
+                                echo $GLOBALS['phpgw']->db->error;
+                                return false;
+                        }
+
+                        $string_serial = addslashes($this->preferences);
+                        if ($val['count'] == '1')
+                        {
+                                $query = "UPDATE phpgw_preferences set preference_value = '".$string_serial.
+                                        "' where preference_app = 'filemanager'".
+                                        " and preference_owner = '".$this->user_id."'";
                                 if (!$GLOBALS['phpgw']->db->query($query)){
                                         echo $GLOBALS['phpgw']->db->error;
@@ -113 +126 @@
                                         return;
                                 }
+                        }
+                        else
+                        {
+                                /*preferences does not exist*/
+                                $query = "INSERT INTO phpgw_preferences values (".$this->user_id.",'filemanager','".$string_serial."')";
+                                if (!$GLOBALS['phpgw']->db->query($query)){
+                                        echo $GLOBALS['phpgw']->db->error;
+                                        return false;
+                                }
+                                else{
+                                        echo "True";
+                                        return;
+                                }
+
+                        }
                 }
 

sandbox/filemanager/js/common_functions.js

@@ -276 +276 @@
                                 preferences[checkBoxes[i].value] = '0';
                 }
-                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&preferences='+base64_encode(serialize(preferences)),function () { toolbar.control('reload'); EditColumns('close'); });
                 return;
         }

sandbox/filemanager/js/drag_area.js

@@ -21 +21 @@
                 if (elem != null){
                         var _event  = is_ie ? window.event : e;
-                        elem.style.left = (_event.clientX - 80) + "px";
-                        elem.style.top = (_event.clientY) + "px";
+                        elem.style.left = _event.clientX - 80 + "px";
+                        elem.style.top = _event.clientY + "px";
                 }
         }

sandbox/filemanager/js/draw_api.js

@@ -28 +28 @@
         permissions['private']=(permission & ACL_PRIVATE);
         toolbar.load();
-        loadPreferences();
 }
 function close_window(){
@@ -45 +44 @@
                 menu = document.createElement('DIV');
                 menu.id = "dwindow";
-                menu.style.left = DocX - 200;
-                menu.style.width = "auto";
+                menu.style.left = 200;
+                menu.style.width = "400px";
                 menu.style.top = DocY;
                 menu.className = 'menubox';
@@ -146 +145 @@
 
 function initDrawApi(){
+        loadPreferences();
         currentPath = document.getElementById('currentPath').value;
         toolbar.control('reload');

sandbox/filemanager/templates/default/main.tpl

@@ -64 +64 @@
 <div style="visibility: hidden" id="allMessages">{messages}</div>
 </div>
+{preferences}
 {script}
-{preferences}
 <!-- END filemanager_footer -->