From 92b7dd3335a6572debeacfb5faa82c63a5e67888 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Fri, 8 Jun 2018 20:03:25 +0200
Subject: Some minor fixes

---
 .../Handler/AuthCompromisedExceptionHandler.php    |  68 +++++++-------
 .../Error/Handler/AuthExpiredExceptionHandler.php  | 100 ++++++++++-----------
 .../Error/Handler/ForbiddenExceptionHandler.php    |  62 ++++++-------
 3 files changed, 115 insertions(+), 115 deletions(-)

(limited to 'main/app/sprinkles/account/src/Error')

diff --git a/main/app/sprinkles/account/src/Error/Handler/AuthCompromisedExceptionHandler.php b/main/app/sprinkles/account/src/Error/Handler/AuthCompromisedExceptionHandler.php
index 4c3b100..ccefe72 100644
--- a/main/app/sprinkles/account/src/Error/Handler/AuthCompromisedExceptionHandler.php
+++ b/main/app/sprinkles/account/src/Error/Handler/AuthCompromisedExceptionHandler.php
@@ -1,34 +1,34 @@
-<?php
-/**
- * UserFrosting (http://www.userfrosting.com)
- *
- * @link      https://github.com/userfrosting/UserFrosting
- * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
- */
-
-namespace UserFrosting\Sprinkle\Account\Error\Handler;
-
-use UserFrosting\Sprinkle\Core\Error\Handler\HttpExceptionHandler;
-
-/**
- * Handler for AuthCompromisedExceptions.
- *
- * Warns the user that their account may have been compromised due to a stolen "remember me" cookie.
- * @author Alex Weissman (https://alexanderweissman.com)
- */
-class AuthCompromisedExceptionHandler extends HttpExceptionHandler
-{
-    /**
-     * Render a generic, user-friendly response without sensitive debugging information.
-     *
-     * @return ResponseInterface
-     */
-    public function renderGenericResponse() {
-        $template = $this->ci->view->getEnvironment()->loadTemplate('pages/error/compromised.html.twig');
-
-        return $this->response
-            ->withStatus($this->statusCode)
-            ->withHeader('Content-type', $this->contentType)
-            ->write($template->render());
-    }
-}
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+
+namespace UserFrosting\Sprinkle\Account\Error\Handler;
+
+use UserFrosting\Sprinkle\Core\Error\Handler\HttpExceptionHandler;
+
+/**
+ * Handler for AuthCompromisedExceptions.
+ *
+ * Warns the user that their account may have been compromised due to a stolen "remember me" cookie.
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class AuthCompromisedExceptionHandler extends HttpExceptionHandler
+{
+    /**
+     * Render a generic, user-friendly response without sensitive debugging information.
+     *
+     * @return ResponseInterface
+     */
+    public function renderGenericResponse() {
+        $template = $this->ci->view->getEnvironment()->loadTemplate('pages/error/compromised.html.twig');
+
+        return $this->response
+            ->withStatus($this->statusCode)
+            ->withHeader('Content-type', $this->contentType)
+            ->write($template->render());
+    }
+}
diff --git a/main/app/sprinkles/account/src/Error/Handler/AuthExpiredExceptionHandler.php b/main/app/sprinkles/account/src/Error/Handler/AuthExpiredExceptionHandler.php
index fd3ca1f..fb04bd1 100644
--- a/main/app/sprinkles/account/src/Error/Handler/AuthExpiredExceptionHandler.php
+++ b/main/app/sprinkles/account/src/Error/Handler/AuthExpiredExceptionHandler.php
@@ -1,50 +1,50 @@
-<?php
-/**
- * UserFrosting (http://www.userfrosting.com)
- *
- * @link      https://github.com/userfrosting/UserFrosting
- * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
- */
-
-namespace UserFrosting\Sprinkle\Account\Error\Handler;
-
-use UserFrosting\Sprinkle\Core\Error\Handler\HttpExceptionHandler;
-
-/**
- * Handler for AuthExpiredExceptions.
- *
- * Forwards the user to the login page when their session has expired.
- * @author Alex Weissman (https://alexanderweissman.com)
- */
-class AuthExpiredExceptionHandler extends HttpExceptionHandler
-{
-    /**
-     * Custom handling for requests that did not pass authentication.
-     */
-    public function handle() {
-        // For auth expired exceptions, we always add messages to the alert stream.
-        $this->writeAlerts();
-
-        $response = $this->response;
-
-        // For non-AJAX requests, we forward the user to the login page.
-        if (!$this->request->isXhr()) {
-            $uri = $this->request->getUri();
-            $path = $uri->getPath();
-            $query = $uri->getQuery();
-            $fragment = $uri->getFragment();
-
-            $path = $path
-                . ($query ? '?' . $query : '')
-                . ($fragment ? '#' . $fragment : '');
-
-            $loginPage = $this->ci->router->pathFor('login', [], [
-                'redirect' => $path
-            ]);
-
-            $response = $response->withRedirect($loginPage);
-        }
-
-        return $response;
-    }
-}
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+
+namespace UserFrosting\Sprinkle\Account\Error\Handler;
+
+use UserFrosting\Sprinkle\Core\Error\Handler\HttpExceptionHandler;
+
+/**
+ * Handler for AuthExpiredExceptions.
+ *
+ * Forwards the user to the login page when their session has expired.
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class AuthExpiredExceptionHandler extends HttpExceptionHandler
+{
+    /**
+     * Custom handling for requests that did not pass authentication.
+     */
+    public function handle() {
+        // For auth expired exceptions, we always add messages to the alert stream.
+        $this->writeAlerts();
+
+        $response = $this->response;
+
+        // For non-AJAX requests, we forward the user to the login page.
+        if (!$this->request->isXhr()) {
+            $uri = $this->request->getUri();
+            $path = $uri->getPath();
+            $query = $uri->getQuery();
+            $fragment = $uri->getFragment();
+
+            $path = $path
+                . ($query ? '?' . $query : '')
+                . ($fragment ? '#' . $fragment : '');
+
+            $loginPage = $this->ci->router->pathFor('login', [], [
+                'redirect' => $path
+            ]);
+
+            $response = $response->withRedirect($loginPage);
+        }
+
+        return $response;
+    }
+}
diff --git a/main/app/sprinkles/account/src/Error/Handler/ForbiddenExceptionHandler.php b/main/app/sprinkles/account/src/Error/Handler/ForbiddenExceptionHandler.php
index b418dde..0166d2a 100644
--- a/main/app/sprinkles/account/src/Error/Handler/ForbiddenExceptionHandler.php
+++ b/main/app/sprinkles/account/src/Error/Handler/ForbiddenExceptionHandler.php
@@ -1,31 +1,31 @@
-<?php
-/**
- * UserFrosting (http://www.userfrosting.com)
- *
- * @link      https://github.com/userfrosting/UserFrosting
- * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
- */
-
-namespace UserFrosting\Sprinkle\Account\Error\Handler;
-
-use UserFrosting\Sprinkle\Core\Error\Handler\HttpExceptionHandler;
-use UserFrosting\Support\Message\UserMessage;
-
-/**
- * Handler for ForbiddenExceptions.  Only really needed to override the default error message.
- *
- * @author Alex Weissman (https://alexanderweissman.com)
- */
-class ForbiddenExceptionHandler extends HttpExceptionHandler
-{
-    /**
-     * Resolve a list of error messages to present to the end user.
-     *
-     * @return array
-     */
-    protected function determineUserMessages() {
-        return [
-            new UserMessage("ACCOUNT.ACCESS_DENIED")
-        ];
-    }
-}
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+
+namespace UserFrosting\Sprinkle\Account\Error\Handler;
+
+use UserFrosting\Sprinkle\Core\Error\Handler\HttpExceptionHandler;
+use UserFrosting\Support\Message\UserMessage;
+
+/**
+ * Handler for ForbiddenExceptions.  Only really needed to override the default error message.
+ *
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class ForbiddenExceptionHandler extends HttpExceptionHandler
+{
+    /**
+     * Resolve a list of error messages to present to the end user.
+     *
+     * @return array
+     */
+    protected function determineUserMessages() {
+        return [
+            new UserMessage("ACCOUNT.ACCESS_DENIED")
+        ];
+    }
+}
-- 
cgit v1.2.3