Typo, rename referrer to referer

thomas-krenn · Oct 8, 2013 · 02c3963 · 02c3963
1 parent c8f714f
commit 02c3963
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/lib/tkmon/TKMON/Action/Expose/System/Login.php b/lib/tkmon/TKMON/Action/Expose/System/Login.php
@@ -58,7 +58,7 @@ public function actionIndex(ArrayObject $params)
         $validator = new ArrayObjectValidator();
         $validator->addValidatorObject(
             ValidatorObject::create(
-                'referrer',
+                'referer',
                 'Referrer URL',
                 ValidatorObject::VALIDATE_ANYTHING,
                 null,
@@ -71,7 +71,7 @@ public function actionIndex(ArrayObject $params)
 
         $output = new TwigTemplate($this->container['template']);
         $output->setTemplateName('forms/login.twig');
-        $output['referrer'] = $params->get('referrer');
+        $output['referer'] = $params->get('referer');
         return $output;
     }
 

diff --git a/lib/tkmon/TKMON/Mvc/Dispatcher.php b/lib/tkmon/TKMON/Mvc/Dispatcher.php
@@ -256,7 +256,7 @@ public function dispatchRequest()
                 if ($e->getCode() === \TKMON\Exception\DispatcherException::TYPE_UNAUTHORIZED) {
                     $response = new \TKMON\Mvc\Output\TwigTemplate($this->container['template']);
                     $response->setTemplateName('views/Common/SessionExpired.twig');
-                    $response['referrer'] = $this->uri;
+                    $response['referer'] = $this->uri;
                     return $this->renderTemplate($response->toString());
                 }
             }

diff --git a/share/tkmon/templates/forms/login.twig b/share/tkmon/templates/forms/login.twig
@@ -1,6 +1,6 @@
 {% set link_home = web_link("Index/Index") %}
-{% if referrer is empty %}
-{% set referrer = web_link("Index/Index") %}
+{% if referer is empty %}
+{% set referer = web_link("Index/Index") %}
 {% endif %}
 
 <div id="login-container">
@@ -44,16 +44,16 @@
             <i class="icon-key"></i> {% trans "Login" %}
         </button>
 
-        <input type="hidden" name="referrer" value="{{ referrer }}" />
+        <input type="hidden" name="referer" value="{{ referer }}" />
     </form>
 </div>
 
 <script>
     require(['jquery'], function($) {
         window.redirectToTarget = function() {
-            var referrer = $('form#login input[name="referrer"]').val();
+            var referer = $('form#login input[name="referer"]').val();
             setTimeout(function() {
-                window.location.href = referrer;
+                window.location.href = referer;
             }, 1000);
         };
     });

diff --git a/share/tkmon/templates/views/Common/SessionExpired.twig b/share/tkmon/templates/views/Common/SessionExpired.twig
@@ -1,7 +1,7 @@
 {% set link_login = web_link('System/Login/Index') %}
-{% set url_referrer = web_link(referrer) %}
-{% if url_referrer %}
-{% set link_login = link_login ~ '?referrer=' ~ url_referrer %}
+{% set url_referer = web_link(referer) %}
+{% if url_referer %}
+{% set link_login = link_login ~ '?referer=' ~ url_referer %}
 {% endif %}
 <div class="page-header">
     <h2>{% trans "Session expired" %}</h2>

diff --git a/test/NETWAYS/Tests/Chain/DummyHandler1.php b/test/NETWAYS/Tests/Chain/DummyHandler1.php
@@ -2,7 +2,9 @@
 
 namespace NETWAYS\Tests\Chain;
 
-class DummyHandler1 implements \NETWAYS\Chain\Interfaces\HandlerInterface
+use NETWAYS\Chain\Interfaces\HandlerInterface;
+
+class DummyHandler1 implements HandlerInterface
 {
 
     private $doThrow=false;