Merge branch 'master' into pro

# Conflicts:
#	composer.lock

chandler/Email/Email.php

@@ -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");
+        if(isset(CHANDLER_ROOT_CONF["email"]["postmark"])) {
-        $transport->setUsername(CHANDLER_ROOT_CONF["email"]["addr"]);
+            return (new PostmarkClient(CHANDLER_ROOT_CONF["email"]["postmark"]["key"]))->sendEmail(
-        $transport->setPassword(CHANDLER_ROOT_CONF["email"]["pass"]);
+                CHANDLER_ROOT_CONF["email"]["postmark"]["user"],
-        
+                $to,
-        $message = new Swift_Message($subject);
+                $subject,
-        $message->getHeaders()->addTextHeader("Sensitivity", "Company-Confidential");
+                $html,
-        $message->setFrom(CHANDLER_ROOT_CONF["email"]["addr"]);
+                strip_tags($html),
-        $message->setTo($to);
+                NULL,
-        $message->setBody($html, "text/html");
+                true,
-        
+                NULL,
-        $mailer = new Swift_Mailer($transport);
+                NULL,
-        return $mailer->send($message);
+                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);
+        }
     }
-}
+}

chandler/MVC/Routing/Router.php

@@ -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();

composer.json

@@ -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"