Changeset 1983 for trunk/expressoAdmin1_2/inc

Timestamp:

02/05/10 09:58:26 (14 years ago)

Author:

valmir.sena

Message:

Ticket #882 - Falha ao tentar criar uma conta compartilhada no IE

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.imap_functions.inc.php (modified) (2 diffs)
• class.shared_accounts.inc.php (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php

@@ -345 +345 @@
             $owners_acl_old = $this->getaclfrombox($params);
             //new settings
-            $owners_acl_new = unserialize($params['owners_acl']);
+            //necessario devido a um bug do serialize do javascript do connector zera uma string
+            //serializada "N;", diferente da serializada do php "a:0:{}"
+            
+            if( $params['owners_acl'] != "N;" ){
+                $owners_acl_new = unserialize($params['owners_acl']);
+            } else {
+                $owners_acl_new = Array();            
+            }
 
             $owners_to_remove = array_diff_assoc($owners_acl_old,$owners_acl_new);
             $owners_to_add = array_diff_assoc($owners_acl_new,$owners_acl_old);
-
+                        
             //Find modified users
             $tmp_update = array_diff_assoc($owners_acl_old,$owners_to_remove);
@@ -363 +370 @@
             if( (count($owners_to_remove) > 0 || count($owners_to_add) > 0 || count($owners_to_update) > 0) && !$this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_shared_accounts_acl') ){
                 $result['status'] = false;
-                $result['msg'] = $this->functions->lang('You do not have access to edit an shared account inbox acl');
-                return $result;
-            }
-            
+                                $result['msg'] = $this->functions->lang('You do not have access to edit an shared account inbox acl');
+                                return $result;
+            }
+            file_put_contents("/tmp/saida", "old ".print_r($owners_acl_old, true)."remove ".print_r($owners_to_remove, true)."add ".print_r($owners_to_add, true)."update ".print_r($owners_to_update, true));
             if( is_array($owners_acl_new)){
                 foreach($owners_to_remove as $user => $acl){
                     $params['user'] = $user;
-                    $params['acl'] = "none";
-                    $user = $params['user'];
-                    $result = $this->setaclfrombox($user,"none",$params['uid']);
+                    $params['acl'] = "";
+                    $user = $params['user'];                  
+                    $result = $this->setaclfrombox($user,"",$params['uid']);
                 }
                 //add new users

trunk/expressoAdmin1_2/inc/class.shared_accounts.inc.php

@@ -108 +108 @@
                         $return['display_empty_inbox'] = $this->functions->check_acl($_SESSION['phpgw_session']['session_lid'],'empty_shared_accounts_inbox') ? 'block' : 'none';
                         $return['allow_edit_shared_account_acl'] = $this->functions->check_acl($_SESSION['phpgw_session']['session_lid'],'edit_shared_accounts_acl');
-                        $return['mailquota_used'] = $quota['mailquota_used'];
-                        //print_r(      $owners_acl);
+                        $return['mailquota_used'] = $quota['mailquota_used'];                        
                         $i = 0;
-                        foreach($owners_acl as $key => $value)
-                        {
-                                $cn = $this->ldap_functions->uid2cn($key);
-                                $return['owners_options'] .= '<option value='. $key .'>' . $cn . '</option>';
-                                $return['owners'][$i] .= $key;
-                                $return['owners_acl'][$i] .= $value;
-                                $i++;
-                        }
+                        if( is_array($owners_acl) ){
+                                foreach($owners_acl as $key => $value)
+                                {
+                                        $cn = $this->ldap_functions->uid2cn($key);
+                                        $return['owners_options'] .= '<option value='. $key .'>' . $cn . '</option>';
+                                        $return['owners'][$i] .= $key;
+                                        $return['owners_acl'][$i] .= $value;
+                                        $i++;
+                                }
+                        } else {
+                                $return['owners_options'] = false;
+                                $return['owners'] = false;
+                                $return['owners_acl'] = false;
+                        }                        
                         return $return;
                 }