From b97bd671e23e97a653656e5186dbcf3457db219f Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 25 Mar 2014 15:19:03 +0200 Subject: [PATCH] remove trailing spaces --- .../Espo/Core/Loaders/EntityManager.php | 124 ++--- application/Espo/Core/Mail/Sender.php | 466 +++++++++--------- 2 files changed, 295 insertions(+), 295 deletions(-) diff --git a/application/Espo/Core/Loaders/EntityManager.php b/application/Espo/Core/Loaders/EntityManager.php index 3f196623e8..1984ddb2bb 100644 --- a/application/Espo/Core/Loaders/EntityManager.php +++ b/application/Espo/Core/Loaders/EntityManager.php @@ -1,63 +1,63 @@ container = $container; - } - - protected function getContainer() - { - return $this->container; - } - - public function load() - { - $config = $this->getContainer()->get('config'); - - $params = array( - 'host' => $config->get('database.host'), - 'dbname' => $config->get('database.dbname'), - 'user' => $config->get('database.user'), - 'password' => $config->get('database.password'), - 'metadata' => $this->getContainer()->get('metadata')->getOrmMetadata(), - 'repositoryFactoryClassName' => '\\Espo\\Core\\ORM\\RepositoryFactory', - ); - - $entityManager = new \Espo\Core\ORM\EntityManager($params); - $entityManager->setEspoMetadata($this->getContainer()->get('metadata')); - $entityManager->setHookManager($this->getContainer()->get('hookManager')); - $entityManager->setContainer($this->getContainer()); - - return $entityManager; - } -} - +/************************************************************************ + * This file is part of EspoCRM. + * + * EspoCRM - Open Source CRM application. + * Copyright (C) 2014 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko + * Website: http://www.espocrm.com + * + * EspoCRM is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * EspoCRM is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with EspoCRM. If not, see http://www.gnu.org/licenses/. + ************************************************************************/ + +namespace Espo\Core\Loaders; + +use Doctrine\ORM\Tools\Setup, + Espo\Core\Doctrine\ORM\Mapping\Driver\EspoPHPDriver; + +class EntityManager +{ + private $container; + + public function __construct(\Espo\Core\Container $container) + { + $this->container = $container; + } + + protected function getContainer() + { + return $this->container; + } + + public function load() + { + $config = $this->getContainer()->get('config'); + + $params = array( + 'host' => $config->get('database.host'), + 'dbname' => $config->get('database.dbname'), + 'user' => $config->get('database.user'), + 'password' => $config->get('database.password'), + 'metadata' => $this->getContainer()->get('metadata')->getOrmMetadata(), + 'repositoryFactoryClassName' => '\\Espo\\Core\\ORM\\RepositoryFactory', + ); + + $entityManager = new \Espo\Core\ORM\EntityManager($params); + $entityManager->setEspoMetadata($this->getContainer()->get('metadata')); + $entityManager->setHookManager($this->getContainer()->get('hookManager')); + $entityManager->setContainer($this->getContainer()); + + return $entityManager; + } +} + diff --git a/application/Espo/Core/Mail/Sender.php b/application/Espo/Core/Mail/Sender.php index 0a991400bd..dd09952f21 100644 --- a/application/Espo/Core/Mail/Sender.php +++ b/application/Espo/Core/Mail/Sender.php @@ -1,234 +1,234 @@ config = $config; - $this->useGlobal(); - } - - public function resetParams() - { - $this->params = array(); - return $this; - } - - public function setParams(array $params = array()) - { - $this->params = array_merge($this->params, $params); - return $this; - } - - public function useSmtp(array $params = array()) - { - $this->isGlobal = false; - $this->params = $params; - - $this->transport = new SmtpTransport(); - - $opts = array( - 'name' => 'admin', - 'host' => $params['server'], - 'port' => $params['port'], - 'connection_config' => array() - ); - if ($params['auth']) { - $opts['connection_class'] = 'login'; - $opts['connection_config']['username'] = $params['username']; - $opts['connection_config']['password'] = $params['password']; - } - if ($params['security']) { - $opts['connection_config']['ssl'] = strtolower($params['security']); - } - - $options = new SmtpOptions($opts); - $this->transport->setOptions($options); - - return $this; - } - - public function useGlobal() - { - $this->params = array(); - if ($this->isGlobal) { - return $this; - } - - $this->transport = new SmtpTransport(); - - $config = $this->config; - - $opts = array( - 'name' => 'admin', - 'host' => $config->get('smtpServer'), - 'port' => $config->get('smtpPort'), - 'connection_config' => array() - ); - if ($config->get('smtpAuth')) { - $opts['connection_class'] = 'login'; - $opts['connection_config']['username'] = $config->get('smtpUsername'); - $opts['connection_config']['password'] = $config->get('smtpPassword'); - } - if ($config->get('smtpSecurity')) { - $opts['connection_config']['ssl'] = strtolower($config->get('smtpSecurity')); - } - - $options = new SmtpOptions($opts); - $this->transport->setOptions($options); - - $this->isGlobal = true; - - return $this; - } - - public function send(Email $email) - { - $message = new Message(); - - $config = $this->config; - - if ($email->get('from')) { - $fromName = null; - if (!empty($this->params['fromName'])) { - $fromName = $this->params['fromName']; - } else { - $fromName = $config->get('outboundEmailFromName'); - } - $message->addFrom(trim($email->get('from')), $fromName); - } else { - if (!empty($this->params['fromAddress'])) { - $fromAddress = $this->params['fromAddress']; - } else { - if (!$config->get('outboundEmailFromAddress')) { - throw new Error('outboundEmailFromAddress is not specified in config.'); - } - $fromAddress = $config->get('outboundEmailFromAddress'); - } - - if (!empty($this->params['fromName'])) { - $fromName = $this->params['fromName']; - } else { - $fromName = $config->get('outboundEmailFromName'); - } - - $message->addFrom($fromAddress, $fromName); - } - - $value = $email->get('to'); - if ($value) { - $arr = explode(';', $value); - if (is_array($arr)) { - foreach ($arr as $address) { - $message->addTo(trim($address)); - } - } - } - - $value = $email->get('cc'); - if ($value) { - $arr = explode(';', $value); - if (is_array($arr)) { - foreach ($arr as $address) { - $message->addCC(trim($address)); - } - } - } - - $value = $email->get('bcc'); - if ($value) { - $arr = explode(';', $value); - if (is_array($arr)) { - foreach ($arr as $address) { - $message->addBCC(trim($address)); - } - } - } - - $message->setSubject($email->get('name')); - - $body = new MimeMessage; - $parts = array(); - - $bodyPart = new MimePart($email->get('body')); - - if ($email->get('isHtml')) { - $bodyPart->type = 'text/html'; - } else { - $bodyPart->type = 'text/plain'; - } - - $parts[] = $bodyPart; - - $aCollection = $email->get('attachments'); - if (!empty($aCollection)) { - foreach ($aCollection as $a) { - $fileName = 'data/upload/' . $a->id; - $attachment = new MimePart(file_get_contents($fileName)); - $attachment->disposition = Mime::DISPOSITION_ATTACHMENT; - $attachment->encoding = Mime::ENCODING_BASE64; - $attachment->filename = $a->get('name'); - if ($a->get('type')) { - $attachment->type = $a->get('type'); - } - $parts[] = $attachment; - } - } - - $body->setParts($parts); - $message->setBody($body); - - try { - $this->transport->send($message); - $email->set('status', 'Sent'); - $email->set('dateSent', date("Y-m-d H:i:s")); - } catch (\Exception $e) { - throw new Error($e->getMessage(), 500); - } - - $this->useGlobal(); - } -} - +/************************************************************************ + * This file is part of EspoCRM. + * + * EspoCRM - Open Source CRM application. + * Copyright (C) 2014 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko + * Website: http://www.espocrm.com + * + * EspoCRM is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * EspoCRM is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with EspoCRM. If not, see http://www.gnu.org/licenses/. + ************************************************************************/ + +namespace Espo\Core\Mail; + +use \Espo\Entities\Email; + +use Zend\Mime\Message as MimeMessage; +use Zend\Mime\Part as MimePart; +use Zend\Mime\Mime as Mime; + +use Zend\Mail\Message; +use Zend\Mail\Transport\Smtp as SmtpTransport; +use Zend\Mail\Transport\SmtpOptions; + +use \Espo\Core\Exceptions\Error; + +class Sender +{ + protected $config; + + protected $transport; + + protected $isGlobal = false; + + protected $params = array(); + + public function __construct($config) + { + $this->config = $config; + $this->useGlobal(); + } + + public function resetParams() + { + $this->params = array(); + return $this; + } + + public function setParams(array $params = array()) + { + $this->params = array_merge($this->params, $params); + return $this; + } + + public function useSmtp(array $params = array()) + { + $this->isGlobal = false; + $this->params = $params; + + $this->transport = new SmtpTransport(); + + $opts = array( + 'name' => 'admin', + 'host' => $params['server'], + 'port' => $params['port'], + 'connection_config' => array() + ); + if ($params['auth']) { + $opts['connection_class'] = 'login'; + $opts['connection_config']['username'] = $params['username']; + $opts['connection_config']['password'] = $params['password']; + } + if ($params['security']) { + $opts['connection_config']['ssl'] = strtolower($params['security']); + } + + $options = new SmtpOptions($opts); + $this->transport->setOptions($options); + + return $this; + } + + public function useGlobal() + { + $this->params = array(); + if ($this->isGlobal) { + return $this; + } + + $this->transport = new SmtpTransport(); + + $config = $this->config; + + $opts = array( + 'name' => 'admin', + 'host' => $config->get('smtpServer'), + 'port' => $config->get('smtpPort'), + 'connection_config' => array() + ); + if ($config->get('smtpAuth')) { + $opts['connection_class'] = 'login'; + $opts['connection_config']['username'] = $config->get('smtpUsername'); + $opts['connection_config']['password'] = $config->get('smtpPassword'); + } + if ($config->get('smtpSecurity')) { + $opts['connection_config']['ssl'] = strtolower($config->get('smtpSecurity')); + } + + $options = new SmtpOptions($opts); + $this->transport->setOptions($options); + + $this->isGlobal = true; + + return $this; + } + + public function send(Email $email) + { + $message = new Message(); + + $config = $this->config; + + if ($email->get('from')) { + $fromName = null; + if (!empty($this->params['fromName'])) { + $fromName = $this->params['fromName']; + } else { + $fromName = $config->get('outboundEmailFromName'); + } + $message->addFrom(trim($email->get('from')), $fromName); + } else { + if (!empty($this->params['fromAddress'])) { + $fromAddress = $this->params['fromAddress']; + } else { + if (!$config->get('outboundEmailFromAddress')) { + throw new Error('outboundEmailFromAddress is not specified in config.'); + } + $fromAddress = $config->get('outboundEmailFromAddress'); + } + + if (!empty($this->params['fromName'])) { + $fromName = $this->params['fromName']; + } else { + $fromName = $config->get('outboundEmailFromName'); + } + + $message->addFrom($fromAddress, $fromName); + } + + $value = $email->get('to'); + if ($value) { + $arr = explode(';', $value); + if (is_array($arr)) { + foreach ($arr as $address) { + $message->addTo(trim($address)); + } + } + } + + $value = $email->get('cc'); + if ($value) { + $arr = explode(';', $value); + if (is_array($arr)) { + foreach ($arr as $address) { + $message->addCC(trim($address)); + } + } + } + + $value = $email->get('bcc'); + if ($value) { + $arr = explode(';', $value); + if (is_array($arr)) { + foreach ($arr as $address) { + $message->addBCC(trim($address)); + } + } + } + + $message->setSubject($email->get('name')); + + $body = new MimeMessage; + $parts = array(); + + $bodyPart = new MimePart($email->get('body')); + + if ($email->get('isHtml')) { + $bodyPart->type = 'text/html'; + } else { + $bodyPart->type = 'text/plain'; + } + + $parts[] = $bodyPart; + + $aCollection = $email->get('attachments'); + if (!empty($aCollection)) { + foreach ($aCollection as $a) { + $fileName = 'data/upload/' . $a->id; + $attachment = new MimePart(file_get_contents($fileName)); + $attachment->disposition = Mime::DISPOSITION_ATTACHMENT; + $attachment->encoding = Mime::ENCODING_BASE64; + $attachment->filename = $a->get('name'); + if ($a->get('type')) { + $attachment->type = $a->get('type'); + } + $parts[] = $attachment; + } + } + + $body->setParts($parts); + $message->setBody($body); + + try { + $this->transport->send($message); + $email->set('status', 'Sent'); + $email->set('dateSent', date("Y-m-d H:i:s")); + } catch (\Exception $e) { + throw new Error($e->getMessage(), 500); + } + + $this->useGlobal(); + } +} +