- Timestamp:
- 02/05/13 15:04:27 (11 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r7824 r7856 5196 5196 function searchSieveRule( $params ) 5197 5197 { 5198 5198 5199 5199 $imap = $this->open_mbox( 'INBOX' ); 5200 5200 $msgs = imap_sort( $imap , SORTDATE , 0 , SE_UID); 5201 5201 5202 5202 $rr = array(); 5203 5204 5203 5204 if(isset($params['from'])) $rr['from'] = array(); 5205 if(isset($params['to'])) $rr['to'] = array(); 5206 if(isset($params['subject'])) $rr['subject'] = array(); 5207 if(isset($params['body'])) $rr['body'] = array(); 5208 if(isset($params['size'])) $rr['size'] = array(); 5209 5205 5210 foreach ($msgs as $i => $v) 5206 5211 { … … 5228 5233 5229 5234 if(isset($params['to'])) 5230 { 5235 { 5231 5236 $tos = $msg->to; 5232 5237 $val = ''; … … 5284 5289 $rrr = array(); 5285 5290 $init = true; 5286 5287 5288 5291 foreach ($rr as $i => $v) 5289 { 5292 { 5290 5293 if(count($rrr) == 0 && $init === true) 5291 5294 $rrr = $v; 5292 else if($params['isExact'] == = true)5293 $rrr = array_diff($rrr , $v);5295 else if($params['isExact'] == 'yes') 5296 $rrr = array_intersect($rrr , $v); 5294 5297 else 5295 5298 $rrr = array_unique(array_merge($rrr , $v)); 5296 5297 } 5298 5299 } 5299 5300 5300 5301 // if($params['page'] && $params['rows']) -
trunk/prototype/modules/filters/filters.js
r7753 r7856 491 491 var criterias_ = new Array(); 492 492 493 var isExact = (list_container.find('[name="isExact"]:checked').val() == 'and') ? 'yes' : 'no'; 494 493 495 for (i in criteria_) 494 496 if(criteria_[i] != "") … … 514 516 }); 515 517 516 var data = DataLayer.get( 'message', { filter: criterias_, criteria: { properties: { context: { folder: 'INBOX' } } } }, true );518 var data = DataLayer.get( 'message', { filter: criterias_, criteria: { isExact: isExact , properties: { context: { folder: 'INBOX' } } } }, true ); 517 519 if(DataLayer.criterias['message:jqGrid']){ 518 520 delete DataLayer.criterias['message:jqGrid']; -
trunk/prototype/services/ImapServiceAdapter.php
r7719 r7856 174 174 { 175 175 if( count( $filter[$i] ) === 4 ) 176 $criteria['isExact'] = ( array_shift( $filter[$i] ) === 'AND' );176 array_shift( $filter[$i] ) ; 177 177 178 178 $criteria[ $filter[$i][0] ] = array( 'criteria' => $filter[$i][2], 'filter' => $filter[$i][1] );
Note: See TracChangeset
for help on using the changeset viewer.