Task Plugin 86 87 89 97 also done

Author: poojabaghelsendinblue

Controller/Adminhtml/index/Ajax.php

@@ -460,7 +460,9 @@ public function loadContact()
                 } else {
                     $imgSendinBlue = '<img src="'.$blockObj->getViewFileUrl('Sendinblue_Sendinblue::images/disabled.gif').'" id="ajax_contact_status_'.$i.'" title="'.$title2.'" >';
                 }
-
+                $imgMagento = str_replace('_view','Magento/backend', $imgMagento);
+                $imgSendinBlue = str_replace('_view','Magento/backend', $imgSendinBlue);
+                $imgSms = str_replace('_view','Magento/backend', $imgSms);
                 $message .= '<tr  class="even pointer"><td class="a-left">'.$email.'</td><td class="a-left">'.$client.'</td><td class="a-left">'.$phone.'</td><td class="a-left">'.$imgMagento.'</td>
                     <td class="a-left"><a status="'.$showStatus.'" email="'.$email.'" class="ajax_contacts_href" href="javascript:void(0)">
             '.$imgSendinBlue.'</a></td><td class="a-left last">

Model/SendinblueSib.php

@@ -1227,6 +1227,7 @@ public function smtpSendMail($userEmail, $title, $tempName, $paramVal)
             $lang = $this->getDbData('sendin_config_lang');
 
             $path = $this->_blocktemp->getViewFileUrl('Sendinblue_Sendinblue::email_temp/'.strtolower($lang).'/'.$tempName.'.html');
+            $path = str_replace('_view','Magento/backend', $path);
             $bodyContent = file_get_contents($path);
             if (!empty($paramVal)) {
                 foreach($paramVal as $key=>$replaceVal) {

Model/Transport.php

@@ -13,7 +13,10 @@
 class Transport
 {
     /** @var MessageInterface */
-    protected $_message;
+	protected $_message;
+
+	protected $_scopeConfig;
+	
 
     /** @var Smtp|\Zend_Mail_Transport_Smtp **/
     protected $transport;
@@ -25,8 +28,9 @@ class Transport
      * @throws \InvalidArgumentException
      */
     public function __construct(MessageInterface $message, ScopeConfigInterface $scopeConfig ){
-		$this->_message = $message;
-		
+			$this->_message = $message;
+			$this->_scopeConfig = $scopeConfig;
+
 		$relaySib = $scopeConfig->getValue('sendinblue/relay_data_status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
 		if ($relaySib == 'enabled') {
 			$smtpHost = "smtp-relay.sendinblue.com";
@@ -56,8 +60,8 @@ public function __construct(MessageInterface $message, ScopeConfigInterface $sco
 					],
 				]));
 			}
-		}  
-    }
+		} 
+	}
 
     /**
      * Send a mail using this transport
@@ -66,17 +70,23 @@ public function __construct(MessageInterface $message, ScopeConfigInterface $sco
      */
     public function sendMessage()
     {
-		if(null !== $this->transport){
+		if ($this->_scopeConfig->isSetFlag('system/smtp/disable',\Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+				return false;
+		}
+		if(null !== $this->transport) {
 			try {
 				if ($this->_message instanceof \Zend_mail) {
 					$this->transport->send($this->_message);
 				} elseif ($this->_message instanceof MessageInterface) {
-					$this->transport->send(Message::fromString($this->_message->getRawMessage()));
+					$zend_mail = Message::fromString($this->_message->getRawMessage());
+					$subject = $zend_mail->getSubject();
+					$zend_mail->setSubject(htmlspecialchars_decode((string)$subject, ENT_QUOTES));
+					$this->transport->send($zend_mail);
 				}
 			} catch (\Exception $e) {
 				throw new \Magento\Framework\Exception\MailException(new \Magento\Framework\Phrase($e->getMessage()), $e);
 			}
-        }
+        } 
     }
 
     /**