Changeset 8232 for branches/2.5/expressoAdmin1_2/inc
- Timestamp:
- 10/08/13 16:20:46 (11 years ago)
- Location:
- branches/2.5/expressoAdmin1_2/inc
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.5/expressoAdmin1_2/inc/class.db_functions.inc.php
r7769 r8232 539 539 { 540 540 // AGENDA 541 $this->db->query('SELECT cal _id FROM phpgw_cal WHERE owner ='.$user_info['uidnumber']);541 $this->db->query('SELECT calendar_id FROM calendar_signature WHERE user_uidnumber ='.$user_info['uidnumber'] . ' AND is_owner = 1' ); 542 542 while($this->db->next_record()) 543 543 { 544 544 $ids[] = $this->db->row(); 545 545 } 546 546 547 if (count($ids)) 547 548 { 548 549 foreach($ids as $i => $id) 549 { 550 $this->db->query('DELETE FROM phpgw_cal WHERE cal_id='.$id['cal_id']); 551 $this->db->query('DELETE FROM phpgw_cal_user WHERE cal_id='.$id['cal_id']); 552 $this->db->query('DELETE FROM phpgw_cal_repeats WHERE cal_id='.$id['cal_id']); 553 $this->db->query('DELETE FROM phpgw_cal_extra WHERE cal_id='.$id['cal_id']); 554 } 550 $this->db->query('DELETE FROM calendar WHERE id = '.$id['calendar_id']); 555 551 } 556 552 -
branches/2.5/expressoAdmin1_2/inc/class.imap_functions.inc.php
r7769 r8232 278 278 function getaclfrombox($params) 279 279 { 280 $boxacl = $params['uid'];281 282 $return = array(); 280 $boxacl = imap_utf7_encode($params['uid']); 281 282 $return = array(); 283 283 284 284 $mbox_acl = imap_getacl($this->imap, "user" . $this->imapDelimiter . $boxacl); -
branches/2.5/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r8179 r8232 138 138 } 139 139 140 if (empty($params['desc'])) 141 { 142 $result['status'] = false; 143 $result['msg'] = $this->functions->lang('DESCRIPTION field is empty') . '.'; 144 return $result; 145 } 146 140 147 $uid = 'institutional_account_' . $params['mail']; 141 148 $dn = "uid=$uid," . $params['context']; -
branches/2.5/expressoAdmin1_2/inc/class.uishared_accounts.inc.php
r5907 r8232 107 107 'disabled_empty_inbox' => $this->functions->check_acl($account_lid,'empty_shared_accounts_inbox') ? '' : 'disabled', 108 108 'display_quota_used' => 'none', 109 'aclExpressoCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'expressoCalendar')) ? '' : 'none',110 'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' :'none',111 'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' :'ExpressoCalendar',109 'aclExpressoCalendar' => '' , 110 'aclCalendar' => 'none', 111 'calendarName' => 'ExpressoCalendar', 112 112 'sharedAccountsLocation' => isset($davicalConf['sharedAccountsLocation']) ? $davicalConf['sharedAccountsLocation'] : '' 113 113 );
Note: See TracChangeset
for help on using the changeset viewer.