From 3ebc007b8d01be0eb1b5da2ec1b0a0998bbe60ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D1=91=D0=B4=D0=BE=D1=80=20=D0=9F=D0=BE=D0=B4=D0=BB?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BD=D0=BE=D0=B2?= <phedor@corp.edu.yar.ru>
Date: Thu, 28 Jul 2016 11:19:47 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83=20=D0=BE?=
 =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/controller/controller.php | 5 +++++
 core/mail.php                  | 6 +++---
 core/validator/validator.php   | 5 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/controller/controller.php b/core/controller/controller.php
index 2f33bac..5eb13a5 100644
--- a/core/controller/controller.php
+++ b/core/controller/controller.php
@@ -332,6 +332,11 @@ class Controller
         $request->session()->clean('page');
         return $result;
     }
+
+    function redirect($action) {
+        header('location: ' . $this->fUrl($action));
+        exit();
+    }
 }
 
 class Controller_Action extends Controller {}
diff --git a/core/mail.php b/core/mail.php
index e377c90..53fa161 100644
--- a/core/mail.php
+++ b/core/mail.php
@@ -193,10 +193,10 @@ class Mail
     function send()
     {
         $result = mail($this->to, $this->getSubject(), $this->getMessage(), $this->getHeader());
-//        $result = false;
         if(! $result) {
-            require_once "core/path.php";
-            file_put_contents(Path::resolveFile("data/email/send.eml"), $this->eml());
+            throw new Exception('Невозможно отправить почту');
+//            require_once "core/path.php";
+//            file_put_contents(Path::resolveFile("data/email/send.eml"), $this->eml());
         }
         return $result;
     }
diff --git a/core/validator/validator.php b/core/validator/validator.php
index 10a30d6..4aa9d7f 100644
--- a/core/validator/validator.php
+++ b/core/validator/validator.php
@@ -41,7 +41,8 @@ class Validator
         // Формат правила  'rule1|rule2,param1=value1|rule3,param1=value1,param2=value2'
         foreach ($input as $value) {
             // Список правил
-            if (! isset($value['validate'])) continue;
+            if (!isset($value['validate']) || $value['validate'] == '') continue;
+
             $rules = explode("|", $value['validate']);
             foreach ($rules as $rule) {
                 // Список параметров правила
@@ -61,7 +62,7 @@ class Validator
                     }
                     $this->addRule($rule);
                 } else {
-                    throw new Exception('Unknown validation rule ' . $name);
+                    throw new Exception('Unknown validation rule "' . $rule . "'");
                 }
             }
         }