44
55use Illuminate \Container \Container ;
66use Illuminate \Support \Facades \Event ;
7- use Webkul \Core \Eloquent \Repository ;
7+ use Illuminate \Support \Facades \Mail ;
8+ use Webkul \Email \Mails \Email ;
89use Webkul \Email \Helpers \Parser ;
10+ use Webkul \Email \Helpers \Htmlfilter ;
11+ use Webkul \Core \Eloquent \Repository ;
912
1013class EmailRepository extends Repository
1114{
1215 /**
13- * ThreadRepository object
16+ * AttachmentRepository object
1417 *
15- * @var \Webkul\Attribute \Repositories\ThreadRepository
18+ * @var \Webkul\Email \Repositories\AttachmentRepository
1619 */
17- protected $ threadRepository
20+ protected $ attachmentRepository
1821
1922 /**
2023 * Parser object
@@ -23,24 +26,35 @@ class EmailRepository extends Repository
2326 */
2427 protected $ emailParser
2528
29+ /**
30+ * Htmlfilter object
31+ *
32+ * @var \Webkul\Email\Helpers\Htmlfilter
33+ */
34+ protected $ htmlFilter
35+
2636 /**
2737 * Create a new repository instance.
2838 *
29- * @param \Webkul\Attribute \Repositories\ThreadRepository $threadRepository
39+ * @param \Webkul\Email \Repositories\AttachmentRepository $attachmentRepository
3040 * @param \Webkul\Email\Helpers\Parser $emailParser
41+ * @param \Webkul\Email\Helpers\Htmlfilter $htmlFilter
3142 * @param \Illuminate\Container\Container $container
3243 * @return void
3344 */
3445 public function __construct (
35- ThreadRepository $ threadRepository
46+ AttachmentRepository $ attachmentRepository
3647 Parser $ emailParser
48+ Htmlfilter $ htmlFilter
3749 Container $ container
3850 )
3951 {
40- $ this threadRepository = $ threadRepository
52+ $ this attachmentRepository = $ attachmentRepository
4153
4254 $ this emailParser = $ emailParser
4355
56+ $ this htmlFilter = $ htmlFilter
57+
4458 parent ::__construct ($ container
4559 }
4660
@@ -60,15 +74,14 @@ function model()
6074 */
6175 public function create (array $ data
6276 {
63- $ emailparent ::create (array_merge ($ data
77+ $ emailparent ::create (array_merge ($ this sanitizeEmails ($ data
78+ 'unique_id ' => ! isset ($ data'parent_id ' ]) ? time () . '@example.com ' : null ,
6479 'message_id ' => $ data'message_id ' ] ?? time () . '@example.com ' ,
6580 ]));
6681
67- $ thread$ this threadRepository ->create (array_merge ($ data
68- 'type ' => 'create ' ,
69- 'message_id ' => $ emailmessage_id ,
70- 'email_id ' => $ emailid ,
71- ]));
82+ $ this attachmentRepository ->setEmailParser ($ this emailParser )->uploadAttachments ($ email$ data
83+
84+ Mail::send (new Email ($ email
7285
7386 return $ email
7487 }
@@ -81,6 +94,16 @@ public function processInboundParseMail($content)
8194 {
8295 $ this emailParser ->setText ($ content
8396
97+ $ email$ this findOneWhere (['message_id ' => $ this emailParser ->getHeader ('message-id ' )]);
98+
99+ if ($ email
100+ return ;
101+ }
102+
103+ if (! $ fromNamePartsmailparse_rfc822_parse_addresses ($ this emailParser ->getHeader ('from ' ))) {
104+ $ fromNamePartsmailparse_rfc822_parse_addresses ($ this emailParser ->getHeader ('sender ' ));
105+ }
106+
84107 $ headers
85108 'from ' => $ this parseEmailAddress ('from ' ),
86109 'sender ' => $ this parseEmailAddress ('sender ' ),
@@ -89,56 +112,60 @@ public function processInboundParseMail($content)
89112 'bcc ' => $ this parseEmailAddress ('bcc ' ),
90113 'subject ' => $ this emailParser ->getHeader ('subject ' ),
91114 'source ' => 'email ' ,
92- 'name ' => $ headers [ ' from '$ from 0 ]['display ' ]
93- ? current (explode ('@ ' , $ from 0 ]['display ' ]))
94- : $ from 0 ]['display ' ],
115+ 'name ' => $ fromNameParts [ 0 ][ ' display '$ fromNameParts 0 ]['address ' ]
116+ ? current (explode ('@ ' , $ fromNameParts 0 ]['display ' ]))
117+ : $ fromNameParts 0 ]['display ' ],
95118 'user_type ' => 'person ' ,
96119 'message_id ' => $ this emailParser ->getHeader ('message-id ' ) ?? time () . '@example.com ' ,
97120 'reference_ids ' => htmlspecialchars_decode ($ this emailParser ->getHeader ('references ' )),
98121 'in_reply_to ' => htmlspecialchars_decode ($ this emailParser ->getHeader ('in-reply-to ' )),
99122 ];
100123
101- foreach ($ toAdress as $ to
124+ foreach ($ headers [ ' reply_to ' ] as $ to
102125 if ($ email$ this findOneWhere (['message_id ' => $ to
103126 break ;
104127 }
105128 }
106129
107130 if (! isset ($ email$ headers'in_reply_to ' ]) {
108- $ email$ this threadRepository ->findOneWhere ([['reference_ids ' , 'like ' , $ headers'in_reply_to ' ]]]);
131+ $ email$ this findOneWhere (['message_id ' => $ headers'in_reply_to ' ]]);
132+
133+ if (! $ email
134+ $ email$ this findOneWhere ([['reference_ids ' , 'like ' , '% ' . $ headers'in_reply_to ' ] . '% ' ]]);
135+ }
109136 }
110137
111138 if (! isset ($ email$ headers'reference_ids ' ]) {
112139 $ referenceIdsexplode (' ' , $ headers'reference_ids ' ]);
113140
114141 foreach ($ referenceIdsas $ referenceId
115- if ($ email$ this threadRepository -> findOneWhere ([['reference_ids ' , 'like ' , $ referenceId
142+ if ($ email$ this findOneWhere ([['reference_ids ' , 'like ' , ' % ' . $ referenceId . ' % '
116143 break ;
117144 }
118145 }
119146 }
120147
148+ if (! $ reply$ this emailParser ->getMessageBody ('text ' )) {
149+ $ reply$ this emailParser ->getTextMessageBody ();
150+ }
151+
121152 if (! isset ($ email
122153 $ email$ this create (array_merge ($ headers
123- 'reference_ids ' => $ headers'message_id ' ],
124- ]));
125-
126- $ thread$ this threadRepository ->setEmailParser ($ this emailParser )->create (array_merge ($ headers
127- 'type ' => 'create ' ,
154+ 'reply ' => $ this htmlFilter ->HTMLFilter ($ reply'' ),
155+ 'reference_ids ' => [$ headers'message_id ' ]],
128156 'user_type ' => 'person ' ,
129- 'reference_ids ' => $ headers'message_id ' ],
130157 ]));
131158 } else {
132- $ thread$ this threadRepository ->findOneWhere (['message_id ' => $ headers'message_id ' ]]);
133-
134- if ($ thread
135- return ;
136- }
137-
138159 // Create person or admin if both are note exists (Optional)
139160
140- $ this threadRepository ->setEmailParser ($ this emailParser )->create (array_merge ($ headers
141- 'type ' => 'reply ' ,
161+ $ this update ([
162+ 'reference_ids ' => array_merge ($ emailreference_ids ?? [], [$ headers'message_id ' ]]),
163+ ], $ emailid );
164+
165+ $ this create (array_merge ($ headers
166+ 'reply ' => $ this htmlFilter ->HTMLFilter ($ reply'' ),
167+ 'parent_id ' => $ emailid ,
168+ 'user_type ' => 'person ' ,
142169 ]));
143170 }
144171 }
@@ -149,20 +176,35 @@ public function processInboundParseMail($content)
149176 */
150177 public function parseEmailAddress ($ type
151178 {
152- $ addressesmailparse_rfc822_parse_addresses ($ this emailParser ->getHeader ($ type
153-
154- if (count ($ addresses1 ) {
155- return [$ addresses0 ]['address ' ]];
156- }
157-
158179 $ emails
159180
160- foreach ($ addressesas $ address
161- if (filter_var ($ address'address ' ], FILTER_VALIDATE_EMAIL )) {
162- $ emails$ address'address ' ];
181+ $ addressesmailparse_rfc822_parse_addresses ($ this emailParser ->getHeader ($ type
182+
183+ if (count ($ addresses1 ) {
184+ foreach ($ addressesas $ address
185+ if (filter_var ($ address'address ' ], FILTER_VALIDATE_EMAIL )) {
186+ $ emails$ address'address ' ];
187+ }
163188 }
189+ } else if ($ addresses
190+ $ emails$ addresses0 ]['address ' ];
164191 }
165192
166193 return $ emails
167194 }
195+
196+ /**
197+ * @param array $data
198+ * @return array
199+ */
200+ public function sanitizeEmails (array $ data
201+ {
202+ $ data'reply_to ' ] = array_values (array_filter ($ data'reply_to ' ]));
203+
204+ $ data'cc ' ] = array_values (array_filter ($ data'cc ' ]));
205+
206+ $ data'bcc ' ] = array_values (array_filter ($ data'bcc ' ]));
207+
208+ return $ data
209+ }
168210}
0 commit comments