diff --git a/app/vendors/shells/vault.php b/app/vendors/shells/vault.php index d837da1b..278fab1b 100755 --- a/app/vendors/shells/vault.php +++ b/app/vendors/shells/vault.php @@ -144,12 +144,8 @@ class VaultShell extends Shell { if(!isset($headers->subject)) { //Emails without a subject are not welcome. Skip it. echo "No Subject Found. Ignoring this email\n"; $this->move($email_filename, $vault_dir, $processed_dir); - } - else { - continue; - } - } + $subjDecoded = imap_mime_header_decode($headers->subject); @@ -362,36 +358,19 @@ class VaultShell extends Shell { echo "email will not be saved. Subject: ".$subjDecoded[0]->text."\n"; } - if($this->move($email_filename, $vault_dir, $processed_dir)) { - echo "Created Symlink Sucessfully. Email has been processed\n"; - } - else { - echo "Unable to create Symlink for {$email_filename}. Critical Error! \n"; - } - + $this->move($email_filename, $vault_dir, $processed_dir); if(!unlink($lockfile)) { die("FATAL ERROR: Unable to remove vault.lock. No further Vault instances can run!"); } - } - - - - function isEmlFile($vault_dir, $filename) { - $info = pathinfo($vault_dir."/".$filename); - - if($info['extension'] == 'eml') { - return true; - } - else { - return false; - } - - } + } //end email loop + + } + function move($email_filename, $vault_dir, $processed_dir) { $old = $vault_dir."/".$email_filename; $new = $processed_dir."/".$email_filename.":S";