Changeset 508

Timestamp:

10/07/08 14:57:50 (16 years ago)

Author:

niltonneto

Message:

Melhorado função rename_user.
As mensagens de erro estão mais claras e agora é possível
renomear contas com a quota estourada sem problemas.

File:

• trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)

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

@@ -128 +128 @@
                 {
                         $result['status'] = false;
-                        $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->delete_user.\n" . $this->functions->lang('Server returns') . ': ' . imap_last_error();
+                        $result['msg'] = $this->functions->lang('it was not possible to delete users mailbox') . ".\n";
+                        $result['msg'] .= $this->functions->lang('Server returns') . ': ' . imap_last_error();
                 }
                 
@@ -136 +137 @@
         function rename_mailbox($old_mailbox, $new_mailbox)
         {
-                $quota = @imap_get_quotaroot($this->imap, '{'.$this->imap_server.':'.$this->imap_port.'}user' . $this->imapDelimiter . $old_mailbox);
+                $result['status'] = true;
+
+                if (!$quota = @imap_get_quotaroot($this->imap, 'user' . $this->imapDelimiter . $old_mailbox))
+                {
+                                $result['status'] = false;
+                                $result['msg'] = $this->functions->lang("Error getting user quota. Process aborted.\n") . $this->functions->lang('Server returns') . ': ' . imap_last_error();
+                                return $result;
+                }
                 $limit = $quota['STORAGE']['limit'];
-                
-                @imap_set_quota($this->imap, '{'.$this->imap_server.':'.$this->imap_port.'}user' . $this->imapDelimiter . $old_mailbox, -1);
-                        
-                $result_rename = @imap_renamemailbox($this->imap,
+                $usage = $quota['STORAGE']['usage'];
+                
+                if ($usage >= $limit)
+                {
+                        if (! @imap_set_quota($this->imap, 'user' . $this->imapDelimiter . $old_mailbox, (int)($usage+10240)) )
+                        {
+                                $result['status'] = false;
+                                $result['msg'] = $this->functions->lang("Error increasing user quota. Process aborted.\n") . $this->functions->lang('Server returns') . ': ' . imap_last_error();
+                                return $result;
+                        }
+                }
+
+                
+                if (! @imap_renamemailbox($this->imap,
                                                 '{'.$this->imap_server.':'.$this->imap_port.'}user' . $this->imapDelimiter . $old_mailbox,
-                                                '{'.$this->imap_server.':'.$this->imap_port.'}user' . $this->imapDelimiter . $new_mailbox);
-                
-                @imap_set_quota($this->imap, '{'.$this->imap_server.':'.$this->imap_port.'}user' . $this->imapDelimiter . $new_mailbox, $limit);
-                
-                if (!$result_rename)
-                {
-                        $result['status'] = false;
-                        $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->rename_mailbox.\n" . $this->functions->lang('Server returns') . ': ' . imap_last_error();
-                }
-                else
-                {
-                        $result['status'] = true;
-                }
-                
+                                                '{'.$this->imap_server.':'.$this->imap_port.'}user' . $this->imapDelimiter . $new_mailbox) )
+                {
+                        $result['status'] = false;
+                        $result['msg'] = $this->functions->lang('Server returns') . ': ' . imap_last_error();
+
+                }
+
+
+                if ($usage >= $limit)
+                {
+                        if (! @imap_set_quota($this->imap, 'user' . $this->imapDelimiter . $new_mailbox, (int)($limit)) )
+                        {
+                                $result['status'] = false;
+                                $result['msg'] .= $this->functions->lang("Error returning user quota.\n") . $this->functions->lang('Server returns') . ': ' . imap_last_error();
+                                
+                                @imap_renamemailbox($this->imap,
+                                        '{'.$this->imap_server.':'.$this->imap_port.'}user' . $this->imapDelimiter . $new_mailbox,
+                                        '{'.$this->imap_server.':'.$this->imap_port.'}user' . $this->imapDelimiter . $old_mailbox);
+                        }
+                }
+
                 return $result;
         }