Merge branch 'dev' into register

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 8ade91b4852900e8b20da18666d02bfb60d2a1d8..cd7578e3401ad4966e6f74ac013b9714c8717f5b 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -76,6 +76,7 @@ class Poche
      */
     public function createNewUser($username, $password, $email = "", $internalRegistration = false)
     {
+        Tools::logm('Trying to create a new user...');
         if (!empty($username) && !empty($password)){
             $newUsername = filter_var($username, FILTER_SANITIZE_STRING);
             $email = filter_var($email, FILTER_SANITIZE_STRING);
@@ -130,6 +131,9 @@ class Poche
                 Tools::redirect();
             }
         }
+        else {
+            Tools::logm('Password or username were empty');
+        }
     }
 
     /**

diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index 82ff20d67b3ff2318638dd25e768c0c8a373fb87..e9b67771791c59ce1ffd0f4616da489b491a8e13 100755 (executable)
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -68,6 +68,12 @@ class Routing
             $this->wallabag->action($this->action, $this->url, $this->id, FALSE, $this->autoclose);
             $tplFile = Tools::getTplFile($this->view);
             $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
+        } elseif(ALLOW_REGISTER && isset($_GET['registerform'])) {
+            Tools::logm('register');
+            $tplFile = Tools::getTplFile('register');
+        } elseif (ALLOW_REGISTER && isset($_GET['register'])){
+            $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
+            Tools::redirect();
         } elseif(isset($_SERVER['PHP_AUTH_USER'])) {
             if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
                 $this->wallabag->login($this->referer);
@@ -105,7 +111,9 @@ class Routing
             $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
             $limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 0);
             $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type'], $limit);
-        }
+        } //elseif (ALLOW_REGISTER && isset($_GET['register'])) {
+            //$this->wallabag->register
+        //}
         
         //allowed ONLY to logged in user
         if (\Session::isLogged() === true) 

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 7ccfc069b16bb5094be623003198f5f7ecbabd10..d0b31d4f15648dbe70e9f507c921b3f0cc493183 100755 (executable)
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -117,7 +117,7 @@ final class Tools
     {
         $views = array(
             'install', 'import', 'export', 'config', 'tags',
-            'edit-tags', 'view', 'login', 'error', 'about'
+            'edit-tags', 'view', 'login', 'error', 'about', 'register'
             );
 
         return (in_array($view, $views) ? $view . '.twig' : 'home.twig');

diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index 0fd9bc0e513008c16e491d139c5bb60147038c62..e569dddd692c8c34e28f556fab120f50bf3309a4 100755 (executable)
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -33,6 +33,8 @@
 @define ('MODE_DEMO', FALSE);
 @define ('DEBUG_POCHE', FALSE);
 
+@define ('ALLOW_REGISTER', TRUE);
+
 //default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL.
 @define ('ERROR_REPORTING', E_ALL & ~E_NOTICE);
 

diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index 58290e9c646cf68dcbea0dd44c29ffd57e59efa5..7906cc203ac69549aa178c6fc81e4e4331afa990 100644 (file)
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -31,4 +31,9 @@
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
     {% endif %}
+    {% if constant('ALLOW_REGISTER') == 1 %}
+       <div class="register">
+               <a href="?registerform">{% trans "Register" %}</a>
+       </div>
+    {% endif %}
 {% endblock %}

diff --git a/themes/baggy/register.twig b/themes/baggy/register.twig
new file mode 100644 (file)
index 0000000..5744a48
--- /dev/null
+++ b/themes/baggy/register.twig
@@ -0,0 +1,25 @@
+{% extends "layout-login.twig" %}
+{% block content %}
+
+<h2>{% trans 'Add user' %}</h2>
+    <form method="post" action="?register">
+        <fieldset class="w500p">
+        <div class="row">
+            <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
+            <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
+            <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="newuseremail">{% trans 'Email' %}</label>
+            <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
+        </div>
+        <div class="row mts txtcenter">
+            <button type="submit">{% trans "Register" %}</button>
+        </div>
+        </fieldset>
+    </form>
+
+{% endblock %}
\ No newline at end of file

diff --git a/themes/default/login.twig b/themes/default/login.twig
index b9f8b497cccc7c3125656e619ca3037698ab9af9..d4f440196d47f09a09e2d12690fc718fe208679e 100644 (file)
--- a/themes/default/login.twig
+++ b/themes/default/login.twig
@@ -31,4 +31,9 @@
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
     {% endif %}
+    {% if constant('ALLOW_REGISTER') == 1 %}
+       <div class="registerform">
+               <a href="?register">{% trans "Register" %}</a>
+       </div>
+    {% endif %}
 {% endblock %}

diff --git a/themes/default/register.twig b/themes/default/register.twig
new file mode 100644 (file)
index 0000000..755ae13
--- /dev/null
+++ b/themes/default/register.twig
@@ -0,0 +1,20 @@
+<h2>{% trans 'Add user' %}</h2>
+    <form method="post" action="?newuser">
+        <fieldset class="w500p">
+        <div class="row">
+            <label class="col w150p" for="newusername">{% trans 'Login' %}</label>
+            <input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
+            <input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
+        </div>
+        <div class="row">
+            <label class="col w150p" for="newuseremail">{% trans 'Email' %}</label>
+            <input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
+        </div>
+        <div class="row mts txtcenter">
+            <button type="submit">{% trans "Register" %}</button>
+        </div>
+        </fieldset>
+    </form>
\ No newline at end of file