自动回复 把邮件从垃圾箱移到收件箱

@@ -89,20 +89,30 @@ class fob_ai_mail_auto_reply {
                     // 不是屏蔽的
                     // 不是屏蔽的
                     $body = getBodyHtml(getMailBody($data['id']));
                     $body = getBodyHtml(getMailBody($data['id']));
                     if(isAiAutoMail($data['from'],$data['subject'],$body)===0){
                     if(isAiAutoMail($data['from'],$data['subject'],$body)===0){
+
+
                         // 检查是否是垃圾箱
                         // 检查是否是垃圾箱
                         $folder = $this->db->cache(3600)->value(folderSql::first($data['folder_id']));
                         $folder = $this->db->cache(3600)->value(folderSql::first($data['folder_id']));
                         if($folder['folder'] == '垃圾箱'){
                         if($folder['folder'] == '垃圾箱'){
                             $email = $this->db->throw()->cache(3600)->first(\Model\emailSql::first($data['email_id']));
                             $email = $this->db->throw()->cache(3600)->first(\Model\emailSql::first($data['email_id']));
-                            $email['password'] = base64_decode($email['password']);
-                            $email['host'] = $email['imap'];
-                            $mailInstance = \Lib\Imap\ImapPool::get((new \Lib\Imap\ImapConfig($email)));
-                            $msg = $mailInstance->folder($folder['origin_folder'])->msg()->uid($data['uid']);
-                            if(!$msg->move('INBOX')){
-                                if(!$msg->copy('INBOX')){
-                                    @file_put_contents(__DIR__."/move_log.log",'移动邮件失败'.json_encode($data,JSON_UNESCAPED_UNICODE)."\n",FILE_APPEND);
+
+                            // 检查 是否开启了自动回复
+                            list($postid,$source) = $this->getPostid($data['email_id']);
+                            // 配置
+                            $replySetting = $this->getAutoReplySettingJunk($postid,$email['email']);
+                            if($replySetting){
+                                $email['password'] = base64_decode($email['password']);
+                                $email['host'] = $email['imap'];
+                                $mailInstance = \Lib\Imap\ImapPool::get((new \Lib\Imap\ImapConfig($email)));
+                                $msg = $mailInstance->folder($folder['origin_folder'])->msg()->uid($data['uid']);
+                                if(!$msg->move('INBOX')){
+                                    if(!$msg->copy('INBOX')){
+                                        @file_put_contents(__DIR__."/move_log.log",'移动邮件失败'.json_encode($data,JSON_UNESCAPED_UNICODE)."\n",FILE_APPEND);
+                                    }
                                 }
                                 }
+                                $mailInstance = null;
                             }
                             }
-                            $mailInstance = null;
+
                             continue;
                             continue;
                         }
                         }
 
 
@@ -207,6 +217,27 @@ class fob_ai_mail_auto_reply {
         return false;
         return false;
     }
     }
 
 
+    public function getAutoReplySettingJunk($postid,$email){
+        $sets = $this->fob_db->throw()->all("select * from `ai_mail_auto_reply_setting` where ".dbWhere([
+                'postid'    =>  $postid
+            ]));
+        if(!$sets){
+            return false;
+        }
+
+        foreach ($sets as $set){
+            $set['emails'] = @json_decode($set['emails'],true);
+            // 是否开启了
+            if($set['emails']&&(in_array($email,$set['emails'])||in_array('所有邮箱',$set['emails']))){
+                if($set['junk_to_inbox']){
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
 
 
     /**
     /**
      * 项目id
      * 项目id