diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php index 48343237..b14efead 100755 --- a/controllers/enquiries_controller.php +++ b/controllers/enquiries_controller.php @@ -48,7 +48,11 @@ class EnquiriesController extends AppController { $this->set('invoices', $this->Enquiry->Invoice->find('all', array('conditions' => array('Invoice.enquiry_id' => $id)))); -//$this->set('files', $this->Enquiry->EnquiryFile->find('all', array('conditions' => array('EnquiryFile.enquiry_id'=>$id), 'order' => 'EnquiryFile.created ASC'))); + + + + + //$this->set('files', $this->Enquiry->EnquiryFile->find('all', array('conditions' => array('EnquiryFile.enquiry_id'=>$id), 'order' => 'EnquiryFile.created ASC'))); /* Trying to optimise the queries for this part of the view - it's currently getting bogged down checking Email Attachments. * Going to create an array describing whether a particular email ID has an attachment. Trying to avoid checking binary data in a find('all') call diff --git a/vendors/shells/firstpass.php b/vendors/shells/firstpass.php index c0609682..50b39895 100644 --- a/vendors/shells/firstpass.php +++ b/vendors/shells/firstpass.php @@ -72,8 +72,8 @@ class FirstpassShell extends Shell { if($enqID == false) { echo "Deleting msg number: $i\tSubject: ".$message['subject']."\n"; - imap_delete($mbox, $i); - //$discardArray[] = $i; + //imap_delete($mbox, $i); + $discardArray[] = $i; } @@ -84,7 +84,7 @@ class FirstpassShell extends Shell { reset($discardArray); -/* + $numberToDiscard= count($discardArray); @@ -107,7 +107,7 @@ class FirstpassShell extends Shell { } } - */ +