summaryrefslogtreecommitdiff
path: root/maildaemon.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-07-21 00:23:33 -0400
committerEvan Prodromou <evan@prodromou.name>2008-07-21 00:23:33 -0400
commit184425796be8a39333b210c872e1ab29e5359409 (patch)
tree6f469391bb9cc5bba88b898eb2fe47cb4723450e /maildaemon.php
parentc2aaa22ffb0c38a8601418f207babaf4c2867f3b (diff)
trim mail and maildaemon
darcs-hash:20080721042333-84dde-f3331569171b33f16322bd6b2999a21cefb718c0.gz
Diffstat (limited to 'maildaemon.php')
-rwxr-xr-xmaildaemon.php30
1 files changed, 15 insertions, 15 deletions
diff --git a/maildaemon.php b/maildaemon.php
index 4c03b151d..d55ecde75 100755
--- a/maildaemon.php
+++ b/maildaemon.php
@@ -35,10 +35,10 @@ require_once('Mail/mimeDecode.php');
# Need to move everything to mailparse
class MailerDaemon {
-
+
function __construct() {
}
-
+
function handle_message($fname='php://stdin') {
list($from, $to, $msg) = $this->parse_message($fname);
if (!$from || !$to || !$msg) {
@@ -96,11 +96,11 @@ class MailerDaemon {
}
return false;
}
-
+
function handle_command($user, $msg) {
return false;
}
-
+
function respond($from, $to, $response) {
$headers['From'] = $to;
@@ -109,11 +109,11 @@ class MailerDaemon {
return mail_send(array($from), $headers, $response);
}
-
+
function log($level, $msg) {
common_log($level, 'MailDaemon: '.$msg);
}
-
+
function add_notice($user, $msg) {
$notice = new Notice();
$notice->profile_id = $user->id;
@@ -142,12 +142,12 @@ class MailerDaemon {
return;
}
$notice->query('COMMIT');
- common_save_replies($notice);
+ common_save_replies($notice);
common_real_broadcast($notice);
$this->log(LOG_INFO,
'Added notice ' . $notice->id . ' from user ' . $user->nickname);
}
-
+
function parse_message($fname) {
$contents = file_get_contents($fname);
$parsed = Mail_mimeDecode::decode(array('input' => $contents,
@@ -157,13 +157,13 @@ class MailerDaemon {
if (!$parsed) {
return NULL;
}
-
+
$from = $parsed->headers['from'];
-
+
$to = $parsed->headers['to'];
$type = $parsed->ctype_primary . '/' . $parsed->ctype_secondary;
-
+
if ($parsed->ctype_primary == 'multitype') {
foreach ($parsed->parts as $part) {
if ($part->ctype_primary == 'text' &&
@@ -177,17 +177,17 @@ class MailerDaemon {
} else {
$this->unsupported_type($type);
}
-
+
return array($from, $to, $msg);
}
-
+
function unsupported_type($type) {
$this->error(NULL, "Unsupported message type: " . $type);
}
-
+
function cleanup_msg($msg) {
# XXX: signatures
- # XXX: quoting
+ # XXX: quoting
preg_replace('/\s+/', ' ', $msg);
return $msg;
}