Changeset 8232 for branches/2.5/expressoAdmin1_2/inc

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

Location:

branches/2.5/expressoAdmin1_2/inc

Files:

• class.db_functions.inc.php (modified) (1 diff)
• class.imap_functions.inc.php (modified) (1 diff)
• class.ldap_functions.inc.php (modified) (1 diff)
• class.uishared_accounts.inc.php (modified) (1 diff)

branches/2.5/expressoAdmin1_2/inc/class.db_functions.inc.php

@@ -539 +539 @@
         {
                 // AGENDA
-                $this->db->query('SELECT cal_id FROM phpgw_cal WHERE owner ='.$user_info['uidnumber']);
+                $this->db->query('SELECT calendar_id FROM calendar_signature WHERE user_uidnumber ='.$user_info['uidnumber'] . ' AND is_owner = 1' );
                 while($this->db->next_record())
                 {
                         $ids[] = $this->db->row();
                 }
+
                 if (count($ids))
                 {
                         foreach($ids as $i => $id)
-                        {
-                                $this->db->query('DELETE FROM phpgw_cal WHERE cal_id='.$id['cal_id']);
-                                $this->db->query('DELETE FROM phpgw_cal_user WHERE cal_id='.$id['cal_id']);
-                                $this->db->query('DELETE FROM phpgw_cal_repeats WHERE cal_id='.$id['cal_id']);
-                                $this->db->query('DELETE FROM phpgw_cal_extra WHERE cal_id='.$id['cal_id']);
-                        }
+                $this->db->query('DELETE FROM calendar WHERE id = '.$id['calendar_id']);
                 }
                 

branches/2.5/expressoAdmin1_2/inc/class.imap_functions.inc.php

@@ -278 +278 @@
         function getaclfrombox($params)
         {
-                $boxacl = $params['uid'];
-                
-                $return = array();      
+        $boxacl = imap_utf7_encode($params['uid']);
+
+                $return = array();
                 
                 $mbox_acl = imap_getacl($this->imap, "user" . $this->imapDelimiter . $boxacl);

branches/2.5/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -138 +138 @@
                 }
 
+                if (empty($params['desc']))
+                {
+                        $result['status'] = false;
+                        $result['msg']  = $this->functions->lang('DESCRIPTION field is empty') . '.';
+                        return $result;
+                }
+                
                 $uid = 'institutional_account_' . $params['mail'];
                 $dn = "uid=$uid," . $params['context'];

branches/2.5/expressoAdmin1_2/inc/class.uishared_accounts.inc.php

@@ -107 +107 @@
                             'disabled_empty_inbox' => $this->functions->check_acl($account_lid,'empty_shared_accounts_inbox') ? '' : 'disabled',
                             'display_quota_used' => 'none',
-                            'aclExpressoCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'expressoCalendar')) ? '' : 'none',
-                            'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none',
-                            'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' : 'ExpressoCalendar',
+                            'aclExpressoCalendar' =>  '' ,
+                            'aclCalendar' => 'none',
+                                        'calendarName' => 'ExpressoCalendar',
                             'sharedAccountsLocation' => isset($davicalConf['sharedAccountsLocation']) ? $davicalConf['sharedAccountsLocation'] : ''
                           );