From 0d152a689a3cb5bc1a00aea73a9bd3fb2f52cf79 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Mon, 15 Jan 2018 16:38:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Controller/Front.php | 11 ++++++++++- src/UserMessageException.php | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/UserMessageException.php diff --git a/src/Controller/Front.php b/src/Controller/Front.php index d317e2a..af064ad 100644 --- a/src/Controller/Front.php +++ b/src/Controller/Front.php @@ -101,6 +101,15 @@ class Controller_Front extends Controller_Action } else { $controller = false; } - return $this->loadModule($name[0], $request, $controller); + try{ + return $this->loadModule($name[0], $request, $controller); + } catch (UserMessageException $ex) { //Исключение с понятным пользователю сообщением + $mode = $request->get('mode'); + if($mode == 'ajax' || $mode == 'json'){ + return json_encode(['result'=>'fail', 'message'=> $ex->userMessage]); + } else { + return $ex->userMessage; + } + } } } diff --git a/src/UserMessageException.php b/src/UserMessageException.php new file mode 100644 index 0000000..88286de --- /dev/null +++ b/src/UserMessageException.php @@ -0,0 +1,17 @@ +userMessage = $message; + } +} \ No newline at end of file