Changeset 6212
- Timestamp:
- 05/16/12 13:37:35 (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r6185 r6212 196 196 { 197 197 $sample = false; 198 if( (isset($this->prefs['preview_msg_subject']) ||($this->prefs['preview_msg_subject'] === '1')) &&199 (isset($this->prefs['preview_msg_tip'] ) ||($this->prefs['preview_msg_tip'] === '1')) )198 if( (isset($this->prefs['preview_msg_subject']) && ($this->prefs['preview_msg_subject'] === '1')) && 199 (isset($this->prefs['preview_msg_tip'] ) && ($this->prefs['preview_msg_tip'] === '1')) ) 200 200 $sample = true; 201 201 … … 2207 2207 if($mbox_stream) 2208 2208 imap_close($mbox_stream, CL_EXPUNGE); 2209 2209 2210 2210 $return['status'] = true; 2211 2211 return $return; … … 2591 2591 } 2592 2592 2593 function send_mail($params) { 2594 2593 function send_mail($params) { 2595 2594 require_once dirname(__FILE__) . '/../../services/class.servicelocator.php'; 2596 2595 require_once dirname(__FILE__) . '/../../prototype/api/controller.php'; -
trunk/prototype/modules/mail/interceptors/Helpers.php
r6171 r6212 350 350 $result = Controller::find(array('concept' => 'message' , 'folder' => $folder), array('messageId'), array('filter' => $criteria['filter'])); 351 351 $idList = array(); 352 foreach ($result as $message) 353 $idList[] = $message['messageId']; 352 if(is_array($result)) 353 foreach ($result as $message) 354 $idList[] = $message['messageId']; 354 355 355 356 $filter = array( 'IN' , 'messageId' , $idList ); -
trunk/prototype/services/ImapServiceAdapter.php
r6171 r6212 65 65 public function find( $URI, $justthese = false, $criteria = false ) 66 66 { 67 67 68 68 $context = isset($justthese['context']) ? $justthese['context'] : '' ; 69 69 … … 94 94 $sord = isset($criteria['sord']) ? $criteria['sord'] : ''; //{desc} get the direction 95 95 96 $filter = $criteria['filter'];96 $filter = isset($criteria['filter']) ? $criteria['filter'] : ''; 97 97 98 98 if( !$sidx ) $sidx = 1; 99 99 100 $folder_name = isset($URI['folder']) ? $URI['folder'] : str_replace( '.', $this->imap_delimiter, $context);100 $folder_name = isset($URI['folder']) ? $URI['folder'] : str_replace( '.', $this->imap_delimiter, isset($context['folder']) ? $context['folder'] : 'INBOX'); 101 101 102 102 $count = imap_num_msg( $this->open_mbox( $folder_name ) ); … … 121 121 if ( $justthese ) 122 122 { 123 if ( $justthese[0] == 'messageId') {123 if (isset($justthese[0]) && $justthese[0] == 'messageId') { 124 124 $map = array( 125 125 'folderName' => array(), … … 284 284 $messagesLabeleds = imap_search($this->mbox, 'UNDELETED KEYWORD "$Label'.$label.'"', SE_UID); 285 285 286 if(is_array($messagesLabeleds)) 286 287 foreach ($messagesLabeleds as $messageLabeled) { 287 288 if (count($map['messageNumber']) > 0 && !in_array($messageLabeled, $map['messageNumber']))
Note: See TracChangeset
for help on using the changeset viewer.