X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=scripts%2Fmaildaemon.php;h=b4e4d9f08df7d5a1610a772eeffb3d9f31c62993;hb=5581143bee602dbd5417f532f2b483e58d0a4269;hp=11ddf06b7502734b3c3b239433e764fc31aca78a;hpb=db587562756483ec285b274adc073df29d4031ae;p=quix0rs-gnu-social.git

diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 11ddf06b75..b4e4d9f08d 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -1,8 +1,8 @@
 #!/usr/bin/env php
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -29,6 +29,7 @@ END_OF_HELP;
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 require_once(INSTALLDIR . '/lib/mail.php');
+require_once(INSTALLDIR . '/lib/mediafile.php');
 require_once('Mail/mimeDecode.php');
 
 # FIXME: we use both Mail_mimeDecode and mailparse
@@ -66,46 +67,32 @@ class MailerDaemon
         }
         $msg = $this->cleanup_msg($msg);
         $msg = common_shorten_links($msg);
-        if (mb_strlen($msg) > 140) {
-            $this->error($from,_('That\'s too long. '.
-                'Max notice size is 140 chars.'));
+        if (Notice::contentTooLong($msg)) {
+            $this->error($from, sprintf(_('That\'s too long. '.
+                                          'Max notice size is %d chars.'),
+                                        Notice::maxContent()));
         }
-        $fileRecords = array();
-        foreach($attachments as $attachment){
-            $mimetype = $this->getUploadedFileType($attachment);
-            $stream  = stream_get_meta_data($attachment);
-            if (!$this->isRespectsQuota($user,filesize($stream['uri']))) {
-                die('error() should trigger an exception before reaching here.');
-            }
-            $filename = $this->saveFile($user, $attachment,$mimetype);
-            
-            fclose($attachment);
-            
-            if (empty($filename)) {
-                $this->error($from,_('Couldn\'t save file.'));
-            }
 
-            $fileRecord = $this->storeFile($filename, $mimetype);
-            $fileRecords[] = $fileRecord;
-            $fileurl = common_local_url('attachment',
-                array('attachment' => $fileRecord->id));
+        $mediafiles = array();
 
-            // not sure this is necessary -- Zach
-            $this->maybeAddRedir($fileRecord->id, $fileurl);
+        foreach($attachments as $attachment){
 
-            $short_fileurl = common_shorten_url($fileurl);
-            $msg .= ' ' . $short_fileurl;
+            $mf = null;
 
-            if (mb_strlen($msg) > 140) {
-                $this->deleteFile($filename);
-                $this->error($from,_('Max notice size is 140 chars, including attachment URL.'));
+            try {
+                $mf = MediaFile::fromFileHandle($attachment, $user);
+            } catch(ClientException $ce) {
+                $this->error($from, $ce->getMessage());
             }
 
-            // Also, not sure this is necessary -- Zach
-            $this->maybeAddRedir($fileRecord->id, $short_fileurl);
+            $msg .= ' ' . $mf->shortUrl();
+
+            array_push($mediafiles, $mf);
+            fclose($attachment);
         }
 
-        $err = $this->add_notice($user, $msg, $fileRecords);
+        $err = $this->add_notice($user, $msg, $mediafiles);
+
         if (is_string($err)) {
             $this->error($from, $err);
             return false;
@@ -114,89 +101,6 @@ class MailerDaemon
         }
     }
 
-    function saveFile($user, $attachment, $mimetype) {
-
-        $filename = File::filename($user->getProfile(), "email", $mimetype);
-
-        $filepath = File::path($filename);
-
-        $stream  = stream_get_meta_data($attachment);
-        if (copy($stream['uri'], $filepath) && chmod($filepath,0664)) {
-            return $filename;
-        } else {   
-            $this->error(null,_('File could not be moved to destination directory.' . $stream['uri'] . ' ' . $filepath));
-        }
-    }
-
-    function storeFile($filename, $mimetype) {
-
-        $file = new File;
-        $file->filename = $filename;
-
-        $file->url = File::url($filename);
-
-        $filepath = File::path($filename);
-
-        $file->size = filesize($filepath);
-        $file->date = time();
-        $file->mimetype = $mimetype;
-
-        $file_id = $file->insert();
-
-        if (!$file_id) {
-            common_log_db_error($file, "INSERT", __FILE__);
-            $this->error(null,_('There was a database error while saving your file. Please try again.'));
-        }
-
-        return $file;
-    }
-
-    function maybeAddRedir($file_id, $url)
-    {   
-        $file_redir = File_redirection::staticGet('url', $url);
-
-        if (empty($file_redir)) {
-            $file_redir = new File_redirection;
-            $file_redir->url = $url;
-            $file_redir->file_id = $file_id;
-
-            $result = $file_redir->insert();
-
-            if (!$result) {
-                common_log_db_error($file_redir, "INSERT", __FILE__);
-                $this->error(null,_('There was a database error while saving your file. Please try again.'));
-            }
-        }
-    }
-
-    function getUploadedFileType($fileHandle) {
-        require_once 'MIME/Type.php';
-
-        $cmd = &PEAR::getStaticProperty('MIME_Type', 'fileCmd');
-        $cmd = common_config('attachments', 'filecommand');
-
-        $stream  = stream_get_meta_data($fileHandle);
-        $filetype = MIME_Type::autoDetect($stream['uri']);
-        if (in_array($filetype, common_config('attachments', 'supported'))) {
-            return $filetype;
-        }
-        $media = MIME_Type::getMedia($filetype);
-        if ('application' !== $media) {
-            $hint = sprintf(_(' Try using another %s format.'), $media);
-        } else {
-            $hint = '';
-        }
-        $this->error(null,sprintf(
-            _('%s is not a supported filetype on this server.'), $filetype) . $hint);
-    }
-
-    function isRespectsQuota($user,$fileSize) {
-        $file = new File;
-        $ret = $file->isRespectsQuota($user,$fileSize);
-        if (true === $ret) return true;
-        $this->error(null,$ret);
-    }
-
     function error($from, $msg)
     {
         file_put_contents("php://stderr", $msg . "\n");
@@ -256,15 +160,16 @@ class MailerDaemon
         common_log($level, 'MailDaemon: '.$msg);
     }
 
-    function add_notice($user, $msg, $fileRecords)
+    function add_notice($user, $msg, $mediafiles)
     {
-        $notice = Notice::saveNew($user->id, $msg, 'mail');
-        if (is_string($notice)) {
-            $this->log(LOG_ERR, $notice);
-            return $notice;
+        try {
+            $notice = Notice::saveNew($user->id, $msg, 'mail');
+        } catch (Exception $e) {
+            $this->log(LOG_ERR, $e->getMessage());
+            return $e->getMessage();
         }
-        foreach($fileRecords as $fileRecord){
-            $this->attachFile($notice, $fileRecord);
+        foreach($mediafiles as $mf){
+            $mf->attachToNotice($notice);
         }
         common_broadcast_notice($notice);
         $this->log(LOG_INFO,
@@ -272,14 +177,6 @@ class MailerDaemon
         return true;
     }
 
-    function attachFile($notice, $filerec)
-    {   
-        File_to_post::processNew($filerec->id, $notice->id);
-
-        $this->maybeAddRedir($filerec->id,
-            common_local_url('file', array('notice' => $notice->id)));
-    }
-
     function parse_message($fname)
     {
         $contents = file_get_contents($fname);
@@ -299,25 +196,43 @@ class MailerDaemon
 
         $attachments = array();
 
+        $this->extract_part($parsed,$msg,$attachments);
+
+        return array($from, $to, $msg, $attachments);
+    }
+
+    function extract_part($parsed,&$msg,&$attachments){
         if ($parsed->ctype_primary == 'multipart') {
-            foreach ($parsed->parts as $part) {
-                if ($part->ctype_primary == 'text' &&
-                    $part->ctype_secondary == 'plain') {
-                    $msg = $part->body;
-                }else{
-                    if ($part->body) {
-			$attachment = tmpfile();
-			fwrite($attachment, $part->body);
-                        $attachments[] = $attachment;
-                    }
+            if($parsed->ctype_secondary == 'alternative'){
+                $altmsg = $this->extract_msg_from_multipart_alternative_part($parsed);
+                if(!empty($altmsg)) $msg = $altmsg;
+            }else{
+                foreach($parsed->parts as $part){
+                    $this->extract_part($part,$msg,$attachments);
                 }
             }
-        } else if ($type == 'text/plain') {
+        } else if ($parsed->ctype_primary == 'text'
+            && $parsed->ctype_secondary=='plain') {
             $msg = $parsed->body;
-        } else {
-            $this->unsupported_type($type);
+            if(strtolower($parsed->ctype_parameters['charset']) != "utf-8"){
+                $msg = utf8_encode($msg);
+            }
+        }else if(!empty($parsed->body)){
+            if(common_config('attachments', 'uploads')){
+                //only save attachments if uploads are enabled
+                $attachment = tmpfile();
+                fwrite($attachment, $parsed->body);
+                $attachments[] = $attachment;
+            }
         }
-        return array($from, $to, $msg, $attachments);
+    }
+
+    function extract_msg_from_multipart_alternative_part($parsed){
+        foreach ($parsed->parts as $part) {
+            $this->extract_part($part,$msg,$attachments);
+        }
+        //we don't want any attachments that are a result of this parsing
+        return $msg;
     }
 
     function unsupported_type($type)
@@ -344,6 +259,10 @@ class MailerDaemon
             if (preg_match('/^\s*Sent via/', $line)) {
                 continue;
             }
+            if (preg_match('/^\s*Sent from my/', $line)) {
+                continue;
+            }
+
             // skip everything after a sig
             if (preg_match('/^\s*--+\s*$/', $line) ||
                 preg_match('/^\s*__+\s*$/', $line))
@@ -367,5 +286,7 @@ class MailerDaemon
     }
 }
 
-$md = new MailerDaemon();
-$md->handle_message('php://stdin');
+if (common_config('emailpost', 'enabled')) {
+    $md = new MailerDaemon();
+    $md->handle_message('php://stdin');
+}