Merge remote-tracking branch 'origin/1.0' into HEAD

Author: Sanjeev Papnoi

Console/RefreshMailboxCommand.php

@@ -104,7 +104,7 @@ public function refreshMailbox($server_host, $server_username, $server_password,
                 foreach ($emailCollection as $id => $messageNumber) {
                     $output->writeln("\n <comment> Converting email </comment><info>$counter</info><comment> out of </comment><info>$emailCount</info><comment>.</comment>");
                     $message = imap_fetchbody($imap, $messageNumber, "");
-                    $this->pushMessage($message, $useSecureConnection);
+                    $this->pushMessage($message, $useSecureConnection, $output);
                     if (true == $mailbox['deleted']) {
                         imap_delete($imap, $messageNumber);
                     }
@@ -122,7 +122,7 @@ public function refreshMailbox($server_host, $server_username, $server_password,
         return;
     }
 
-    public function pushMessage($message, bool $secure = false)
+    public function pushMessage($message, bool $secure = false, $output)
     {
         $router = $this->container->get('router');
         $router->getContext()->setHost($this->container->getParameter('uvdesk.site_url'));
@@ -138,9 +138,21 @@ public function pushMessage($message, bool $secure = false)
         curl_setopt($curlHandler, CURLOPT_POSTFIELDS, http_build_query(['email' => $message]));
 
         $curlResponse = curl_exec($curlHandler);
+        if ($curlResponse != 200 ) {
+            $curlResponse = $this->getTagValue($curlResponse, 'title');
+            $output->writeln("\n <comment> Error -> </comment><info>$curlResponse</info><comment></comment>");
+            exit();
+        }
         curl_close($curlHandler);
     }
 
+    function getTagValue($string, $tag)
+    {
+        $pattern = "/<{$tag}>(.*?)<\/{$tag}>/s";
+        preg_match($pattern, $string, $matches);
+        return isset($matches[1]) ? $matches[1] : '';
+    }
+
     protected function isSecureConnectionAvailable()
     {
         $headers = [CURLOPT_NOBODY => true, CURLOPT_HEADER => false];

Controller/MailboxChannelXHR.php

@@ -9,16 +9,31 @@
 use Webkul\UVDesk\MailboxBundle\Utils\MailboxConfiguration;
 use Webkul\UVDesk\MailboxBundle\Services\MailboxService;
 use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 class MailboxChannelXHR extends AbstractController
 {
     private $mailboxService;
     private $translator;
+    private $kernel;
 
-    public function __construct(MailboxService $mailboxService, TranslatorInterface $translator)
+    public function __construct(KernelInterface $kernel, MailboxService $mailboxService, TranslatorInterface $translator)
     {
         $this->mailboxService = $mailboxService;
         $this->translator = $translator;
+        $this->kernel = $kernel;
+    }
+
+    public function processRawContentMail(Request $request)
+    {
+        $rawEmail = file_get_contents($this->kernel->getProjectDir(). "/rawEmailContent.txt");
+
+        if ($rawEmail != false &&  !empty($rawEmail)) {
+           $this->mailboxService->processMail($rawEmail);
+        }else{
+            dump("Empty Text file not allow");
+        } 
+        exit(0);
     }
 
     public function processMailXHR(Request $request)

DependencyInjection/Configuration.php

@@ -9,8 +9,8 @@ class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $treeBuilder->root('uvdesk_mailbox')
+        $treeBuilder = new TreeBuilder('knp_doctrine_behaviors');
+        $treeBuilder->getRootNode('uvdesk_mailbox')
             ->children()
                 ->node('emails', 'array')
                     ->children()

Resources/config/routes/private.yaml

@@ -19,3 +19,7 @@ helpdesk_member_mailbox_remove_configuration_xhr:
     path:     /settings/mailbox/remove/{id}
     controller: Webkul\UVDesk\MailboxBundle\Controller\MailboxChannelXHR::removeMailboxConfiguration
     defaults: { id: ''}
+
+helpdesk_member_mailbox_direct_convert_mail:
+    path:     /processRawEmail
+    controller: Webkul\UVDesk\MailboxBundle\Controller\MailboxChannelXHR::processRawContentMail

Services/MailboxService.php

@@ -384,12 +384,18 @@ public function processMail($rawEmail)
         } else if (false === $ticket->getIsTrashed() && strtolower($ticket->getStatus()->getCode()) != 'spam' && !empty($mailData['inReplyTo'])) {
             $mailData['threadType'] = 'reply';
             $thread = $this->entityManager->getRepository(Thread::class)->findOneByMessageId($mailData['messageId']);
+            $ticketRef = $this->entityManager->getRepository(Ticket::class)->findById($ticket->getId());
+            $referenceIds = explode(' ', $ticketRef[0]->getReferenceIds());
 
             if (!empty($thread)) {
                 // Thread with the same message id exists skip process.
                 return;
             }
 
+            if (in_array($mailData['messageId'], $referenceIds)) {
+                return ;
+            }
+
             if ($ticket->getCustomer() && $ticket->getCustomer()->getEmail() == $mailData['from']) {
                 // Reply from customer
                 $user = $ticket->getCustomer();

composer.json

@@ -10,11 +10,11 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.3 || ^8.0",
         "uvdesk/composer-plugin": "^1.0",
         "uvdesk/core-framework": "^1.0",
         "iamcal/lib_autolink": "^1.7",
-        "php-mime-mail-parser/php-mime-mail-parser": "^3.0"
+        "php-mime-mail-parser/php-mime-mail-parser": "^7.0.0"
     },
     "autoload": {
         "psr-4": { "Webkul\\UVDesk\\MailboxBundle\\": "" }