GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

better type logic 

darcs-hash:20080718202052-84dde-cf788df7bcf76f971229d18041823a9483a164cc.gz
This commit is contained in:
Evan Prodromou 2008-07-18 16:20:52 -04:00
parent 91cac6495c
commit 1f8040ce2f
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
maildaemon.php
View File

@ -123,10 +123,10 @@ class MailerDaemon {
} }
$from = $parsed->headers['from']; $from = $parsed->headers['from'];
$to = $parsed->headers['to']; $to = $parsed->headers['to'];
$type = $parsed->ctype_primary . '/' . $parsed->ctype_secondary;
switch ($parsed->ctype_primary) { if ($parsed->ctype_primary == 'multitype') {
case 'multitype':
# try and find a text/plain in the mix
foreach ($parsed->parts as $part) { foreach ($parsed->parts as $part) {
if ($part->ctype_primary == 'text' && if ($part->ctype_primary == 'text' &&
$part->ctype_secondary == 'plain') { $part->ctype_secondary == 'plain') {
@ -134,16 +134,9 @@ class MailerDaemon {
break; break;
} }
} }
break; } else if ($type == 'text/plain') {
case 'text': $msg = $parsed->body;
switch ($parsed->ctype_secondary) { } else {
case 'plain':
$msg = $parsed->body;
break;
default:
$this->unsupported_type($parsed);
}
default:
$this->unsupported_type($parsed); $this->unsupported_type($parsed);
} }