Lanmikeman/chandler
1
1
Fork 0
mirror of https://github.com/openvk/chandler.git synced 2025-04-01 05:54:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into pro

Browse source 
# Conflicts:
#	composer.lock
This commit is contained in:
Ilya Bakhlin 2021-12-28 19:33:30 +01:00
commit b73cd94d54
4 changed files with 456 additions and 2045 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
chandler/Email/Email.php
View file

@ -3,22 +3,43 @@ namespace Chandler\Email;
use Swift_SmtpTransport;
use Swift_Message;
use Swift_Mailer;
use Postmark\PostmarkClient;
class Email
{
static function send(string $to, string $subject, string $html)
{
$transport = new Swift_SmtpTransport(CHANDLER_ROOT_CONF["email"]["host"], CHANDLER_ROOT_CONF["email"]["port"], "ssl");
$transport->setUsername(CHANDLER_ROOT_CONF["email"]["addr"]);
$transport->setPassword(CHANDLER_ROOT_CONF["email"]["pass"]);
$message = new Swift_Message($subject);
$message->getHeaders()->addTextHeader("Sensitivity", "Company-Confidential");
$message->setFrom(CHANDLER_ROOT_CONF["email"]["addr"]);
$message->setTo($to);
$message->setBody($html, "text/html");
$mailer = new Swift_Mailer($transport);
return $mailer->send($message);
if(isset(CHANDLER_ROOT_CONF["email"]["postmark"])) {
return (new PostmarkClient(CHANDLER_ROOT_CONF["email"]["postmark"]["key"]))->sendEmail(
CHANDLER_ROOT_CONF["email"]["postmark"]["user"],
$to,
$subject,
$html,
strip_tags($html),
NULL,
true,
NULL,
NULL,
NULL,
["Sensitivity" => "Company-Confidential"],
NULL,
"None",
NULL,
CHANDLER_ROOT_CONF["email"]["postmark"]["stream"]
);
} else {
$transport = new Swift_SmtpTransport(CHANDLER_ROOT_CONF["email"]["host"], CHANDLER_ROOT_CONF["email"]["port"], "ssl");
$transport->setUsername(CHANDLER_ROOT_CONF["email"]["addr"]);
$transport->setPassword(CHANDLER_ROOT_CONF["email"]["pass"]);
$message = new Swift_Message($subject);
$message->getHeaders()->addTextHeader("Sensitivity", "Company-Confidential");
$message->setFrom(CHANDLER_ROOT_CONF["email"]["addr"]);
$message->setTo($to);
$message->setBody($html, "text/html");
$mailer = new Swift_Mailer($transport);
return $mailer->send($message);
}
}
}
}

5
chandler/MVC/Routing/Router.php
View file

@ -149,6 +149,11 @@ class Router
$tpl = str_replace($dir, $this->scope["_templatePath"], $tpl);
}
if(!file_exists($tpl)) {
trigger_error("Could not open $tpl as template, falling back.", E_USER_NOTICE);
$tpl = "$presenterName/$action.xml";
}
$output = $this->delegateView($tpl, $presenter);
$presenter->onAfterRender();

6
composer.json
View file

@ -23,9 +23,11 @@
"nette/safe-stream": "^2.4",
"nette/tokenizer": "^3.1",
"firebase/php-jwt": "^5.0",
"tracy/tracy": "^2.7",
"symfony/translation": "^5.0",
"symfony/yaml": "^5.3"
"symfony/yaml": "^5.3",
"guzzlehttp/guzzle": "^6.0",
"wildbit/postmark-php": "^4.0",
"tracy/tracy": "2.9"
},
"require-dev": {
"phpunit/phpunit": "^9.5"

2443
composer.lock generated
View file

File diff suppressed because it is too large Load diff