From 5369c74ec0df35aa072a6067837c1d748836b96e Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 18 Jul 2015 10:02:29 -0400
Subject: Add form to create remote user

---
 app/Template/user/create_local.php  | 51 +++++++++++++++++++++++++++++++++
 app/Template/user/create_remote.php | 57 +++++++++++++++++++++++++++++++++++++
 app/Template/user/index.php         |  3 +-
 app/Template/user/layout.php        |  3 +-
 app/Template/user/new.php           | 50 --------------------------------
 5 files changed, 112 insertions(+), 52 deletions(-)
 create mode 100644 app/Template/user/create_local.php
 create mode 100644 app/Template/user/create_remote.php
 delete mode 100644 app/Template/user/new.php

(limited to 'app/Template/user')

diff --git a/app/Template/user/create_local.php b/app/Template/user/create_local.php
new file mode 100644
index 00000000..aeec300f
--- /dev/null
+++ b/app/Template/user/create_local.php
@@ -0,0 +1,51 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
+        </ul>
+    </div>
+    <section>
+    <form method="post" action="<?= $this->url->href('user', 'save') ?>" autocomplete="off">
+
+        <?= $this->form->csrf() ?>
+
+        <div class="form-column">
+            <?= $this->form->label(t('Username'), 'username') ?>
+            <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?><br/>
+
+            <?= $this->form->label(t('Name'), 'name') ?>
+            <?= $this->form->text('name', $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Email'), 'email') ?>
+            <?= $this->form->email('email', $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Password'), 'password') ?>
+            <?= $this->form->password('password', $values, $errors, array('required')) ?><br/>
+
+            <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
+            <?= $this->form->password('confirmation', $values, $errors, array('required')) ?><br/>
+        </div>
+
+        <div class="form-column">
+            <?= $this->form->label(t('Add project member'), 'project_id') ?>
+            <?= $this->form->select('project_id', $projects, $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Timezone'), 'timezone') ?>
+            <?= $this->form->select('timezone', $timezones, $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Language'), 'language') ?>
+            <?= $this->form->select('language', $languages, $values, $errors) ?><br/>
+
+            <?= $this->form->checkbox('notifications_enabled', t('Enable notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
+        </div>
+
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'user', 'index') ?>
+        </div>
+    </form>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/user/create_remote.php b/app/Template/user/create_remote.php
new file mode 100644
index 00000000..52661585
--- /dev/null
+++ b/app/Template/user/create_remote.php
@@ -0,0 +1,57 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
+        </ul>
+    </div>
+    <form method="post" action="<?= $this->url->href('user', 'save') ?>" autocomplete="off">
+
+        <?= $this->form->csrf() ?>
+        <?= $this->form->hidden('is_ldap_user', array('is_ldap_user' => 1)) ?>
+
+        <div class="form-column">
+            <?= $this->form->label(t('Username'), 'username') ?>
+            <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?><br/>
+
+            <?= $this->form->label(t('Name'), 'name') ?>
+            <?= $this->form->text('name', $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Email'), 'email') ?>
+            <?= $this->form->email('email', $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Google Id'), 'google_id') ?>
+            <?= $this->form->password('google_id', $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Github Id'), 'github_id') ?>
+            <?= $this->form->password('github_id', $values, $errors) ?><br/>
+        </div>
+
+        <div class="form-column">
+            <?= $this->form->label(t('Add project member'), 'project_id') ?>
+            <?= $this->form->select('project_id', $projects, $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Timezone'), 'timezone') ?>
+            <?= $this->form->select('timezone', $timezones, $values, $errors) ?><br/>
+
+            <?= $this->form->label(t('Language'), 'language') ?>
+            <?= $this->form->select('language', $languages, $values, $errors) ?><br/>
+
+            <?= $this->form->checkbox('notifications_enabled', t('Enable notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
+            <?= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
+        </div>
+
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <?= t('or') ?>
+            <?= $this->url->link(t('cancel'), 'user', 'index') ?>
+        </div>
+    </form>
+    <div class="alert alert-info">
+        <ul>
+            <li><?= t('Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.') ?></li>
+            <li><?= t('If you check the box "Disallow login form", credentials entered in the login form will be ignored.') ?></li>
+        </ul>
+    </div>
+</section>
\ No newline at end of file
diff --git a/app/Template/user/index.php b/app/Template/user/index.php
index fc575466..edf043a6 100644
--- a/app/Template/user/index.php
+++ b/app/Template/user/index.php
@@ -2,7 +2,8 @@
     <div class="page-header">
         <?php if ($this->user->isAdmin()): ?>
         <ul>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New user'), 'user', 'create') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
         </ul>
         <?php endif ?>
     </div>
diff --git a/app/Template/user/layout.php b/app/Template/user/layout.php
index e60ab77d..a27f359b 100644
--- a/app/Template/user/layout.php
+++ b/app/Template/user/layout.php
@@ -3,7 +3,8 @@
         <?php if ($this->user->isAdmin()): ?>
         <ul>
             <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
-            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New user'), 'user', 'create') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
         </ul>
         <?php endif ?>
     </div>
diff --git a/app/Template/user/new.php b/app/Template/user/new.php
deleted file mode 100644
index 0db1e824..00000000
--- a/app/Template/user/new.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
-        </ul>
-    </div>
-    <section>
-    <form method="post" action="<?= $this->url->href('user', 'save') ?>" autocomplete="off">
-
-        <?= $this->form->csrf() ?>
-
-        <div class="form-column">
-            <?= $this->form->label(t('Username'), 'username') ?>
-            <?= $this->form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?><br/>
-
-            <?= $this->form->label(t('Name'), 'name') ?>
-            <?= $this->form->text('name', $values, $errors) ?><br/>
-
-            <?= $this->form->label(t('Email'), 'email') ?>
-            <?= $this->form->email('email', $values, $errors) ?><br/>
-
-            <?= $this->form->label(t('Password'), 'password') ?>
-            <?= $this->form->password('password', $values, $errors, array('required')) ?><br/>
-
-            <?= $this->form->label(t('Confirmation'), 'confirmation') ?>
-            <?= $this->form->password('confirmation', $values, $errors, array('required')) ?><br/>
-        </div>
-
-        <div class="form-column">
-            <?= $this->form->label(t('Add project member'), 'project_id') ?>
-            <?= $this->form->select('project_id', $projects, $values, $errors) ?><br/>
-
-            <?= $this->form->label(t('Timezone'), 'timezone') ?>
-            <?= $this->form->select('timezone', $timezones, $values, $errors) ?><br/>
-
-            <?= $this->form->label(t('Language'), 'language') ?>
-            <?= $this->form->select('language', $languages, $values, $errors) ?><br/>
-
-            <?= $this->form->checkbox('notifications_enabled', t('Enable notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
-            <?= $this->form->checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
-        </div>
-
-        <div class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-            <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'user', 'index') ?>
-        </div>
-    </form>
-    </section>
-</section>
\ No newline at end of file
-- 
cgit v1.2.3