Changeset 520 for trunk

Timestamp:

10/09/08 09:00:10 (16 years ago)

Author:

niltonneto

Message:

Melhorado tratamento das funções sobre a cota do usuário.

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• inc/class.uiaccounts.inc.php (modified) (2 diffs)
• inc/class.user.inc.php (modified) (2 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)

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

@@ -107 +107 @@
                         $quota['mailquota_used'] = round (($get_quota['usage'] / 1024), 2);
                 }
-                        
                 return $quota;
         }
@@ -113 +112 @@
         function change_user_quota($uid, $quota)
         {
-                $set_quota = imap_set_quota($this->imap,"user" . $this->imapDelimiter . $uid, ($quota*1024));
-                return true;
+                $result['status'] = true;
+                
+                if (!imap_set_quota($this->imap,"user" . $this->imapDelimiter . $uid, ($quota*1024)) )
+                {
+                        $result['status'] = false;
+                        $result['msg'] = $this->functions->lang('it was not possible to change users mailbox quota') . ".\n";
+                        $result['msg'] .= $this->functions->lang('Server returns') . ': ' . imap_last_error();
+                }
+                
+                return $result;
         }
         

trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

@@ -538 +538 @@
                         if ($alert_warning != '')
                                 $alert_warning = "alert('". $alert_warning ."')";
+                        
                         $var = Array(
                                 'uidnumber'                                     => $_GET['account_id'],
@@ -598 +599 @@
                                 'input_mailforwardingaddress_fields'=> $input_mailforwardingaddress_fields,
                                 'deliverymode_checked'          => $user_info['deliverymode'] == 'forwardOnly' ? 'CHECKED' : '',
-                                'mailquota'                                     => $user_info['mailquota'],
-                                'mailquota_used'                        => $user_info['mailquota_used'],
+                                'mailquota'                                     => $user_info['mailquota'] == '-1' ? '' : $user_info['mailquota'],
+                                'mailquota_used'                        => $user_info['mailquota_used'] == '-1' ? lang('without quota') : $user_info['mailquota_used'],
 
                                 //Third ABA

trunk/expressoAdmin1_2/inc/class.user.inc.php

@@ -176 +176 @@
                                         $params['corporative_information_cpf'] = ereg_replace("[^0-9]", "", $params['corporative_information_cpf']);
                                         //description
+                                        $params['corporative_information_description'] = utf8_encode($params['corporative_information_description']);
                                         foreach ($params as $atribute=>$value)
                                         {
@@ -677 +678 @@
                                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                                 // MAILQUOTA
-                                if ($diff['mailquota'])
-                                {
-                                        $this->imap_functions->change_user_quota($new_values['uid'], $new_values['mailquota']);
-                                        $this->db_functions->write_log("modified user email quota", $dn);
+                                if ( ($new_values['mailquota'] != $old_values['mailquota']) && (is_numeric($new_values['mailquota'])) )
+                                {
+                                        $result_change_user_quota = $this->imap_functions->change_user_quota($new_values['uid'], $new_values['mailquota']);
+                                        
+                                        if ($result_change_user_quota['status'])
+                                        {
+                                                $this->db_functions->write_log("modified user email quota" , $dn . ':' . $old_values['mailquota'] . '->' . $new_values['mailquota']);
+                                        }
+                                        else
+                                        {
+                                                $return['status'] = false;
+                                                $return['msg'] .= $result_change_user_quota['msg'];
+                                        }
                                 }
                         }