From 7df055aff1e1056d87bb720531d60cb079805f94 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 11 Apr 2015 18:05:10 -0400
Subject: Add auth controller

---
 app/Template/auth/index.php | 32 ++++++++++++++++++++++++++++++++
 app/Template/layout.php     |  2 +-
 app/Template/user/login.php | 32 --------------------------------
 3 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 app/Template/auth/index.php
 delete mode 100644 app/Template/user/login.php

(limited to 'app/Template')

diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php
new file mode 100644
index 00000000..b35b1253
--- /dev/null
+++ b/app/Template/auth/index.php
@@ -0,0 +1,32 @@
+<div class="form-login">
+
+    <?php if (isset($errors['login'])): ?>
+        <p class="alert alert-error"><?= $this->e($errors['login']) ?></p>
+    <?php endif ?>
+
+    <form method="post" action="<?= $this->u('auth', 'check', array('redirect_query' => $redirect_query)) ?>">
+
+        <?= $this->formCsrf() ?>
+
+        <?= $this->formLabel(t('Username'), 'username') ?>
+        <?= $this->formText('username', $values, $errors, array('autofocus', 'required')) ?><br/>
+
+        <?= $this->formLabel(t('Password'), 'password') ?>
+        <?= $this->formPassword('password', $values, $errors, array('required')) ?>
+
+        <?= $this->formCheckbox('remember_me', t('Remember Me'), 1) ?><br/>
+
+        <?php if (GOOGLE_AUTH): ?>
+            <?= $this->a(t('Login with my Google Account'), 'user', 'google') ?>
+        <?php endif ?>
+
+        <?php if (GITHUB_AUTH): ?>
+            <?= $this->a(t('Login with my GitHub Account'), 'user', 'gitHub') ?>
+        <?php endif ?>
+
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/>
+        </div>
+    </form>
+
+</div>
\ No newline at end of file
diff --git a/app/Template/layout.php b/app/Template/layout.php
index ec9f2288..1cdcc249 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -58,7 +58,7 @@
                     </li>
                     <?php endif ?>
                     <li>
-                        <?= $this->a(t('Logout'), 'user', 'logout', array(), true) ?>
+                        <?= $this->a(t('Logout'), 'auth', 'logout') ?>
                         <span class="username hide-tablet">(<?= $this->a($this->e($this->getFullname()), 'user', 'show', array('user_id' => $this->userSession->getId())) ?>)</span>
                     </li>
                 </ul>
diff --git a/app/Template/user/login.php b/app/Template/user/login.php
deleted file mode 100644
index c2e3914e..00000000
--- a/app/Template/user/login.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="form-login">
-
-    <?php if (isset($errors['login'])): ?>
-        <p class="alert alert-error"><?= $this->e($errors['login']) ?></p>
-    <?php endif ?>
-
-    <form method="post" action="<?= $this->u('user', 'check', array('redirect_query' => urlencode($redirect_query))) ?>">
-
-        <?= $this->formCsrf() ?>
-
-        <?= $this->formLabel(t('Username'), 'username') ?>
-        <?= $this->formText('username', $values, $errors, array('autofocus', 'required')) ?><br/>
-
-        <?= $this->formLabel(t('Password'), 'password') ?>
-        <?= $this->formPassword('password', $values, $errors, array('required')) ?>
-
-        <?= $this->formCheckbox('remember_me', t('Remember Me'), 1) ?><br/>
-
-        <?php if (GOOGLE_AUTH): ?>
-            <?= $this->a(t('Login with my Google Account'), 'user', 'google') ?>
-        <?php endif ?>
-
-        <?php if (GITHUB_AUTH): ?>
-            <?= $this->a(t('Login with my GitHub Account'), 'user', 'gitHub') ?>
-        <?php endif ?>
-
-        <div class="form-actions">
-            <input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/>
-        </div>
-    </form>
-
-</div>
\ No newline at end of file
-- 
cgit v1.2.3