devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #70: if demo mode, fields are filled

This commit is contained in:
Nicolas Lœuillet 2013-07-31 19:37:14 +02:00
parent 70b5d24f72
commit 538cdfa883
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/config.php
View File

@ -8,13 +8,13 @@
* @license http://www.wtfpl.net/ see COPYING file * @license http://www.wtfpl.net/ see COPYING file
*/ */
define ('POCHE_VERSION', '0.2.1'); define ('POCHE_VERSION', '0.3');
if (!is_dir('db/')) { if (!is_dir('db/')) {
@mkdir('db/',0705); @mkdir('db/',0705);
} }
define ('MODE_DEMO', FALSE); define ('MODE_DEMO', TRUE);
define ('ABS_PATH', 'assets/'); define ('ABS_PATH', 'assets/');
define ('CONVERT_LINKS_FOOTNOTES', TRUE); define ('CONVERT_LINKS_FOOTNOTES', TRUE);
define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE); define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE);

4
index.php
View File

@ -54,7 +54,7 @@ elseif (isset($_GET['config'])) {
if (isset($_POST['password']) && isset($_POST['password_repeat'])) { if (isset($_POST['password']) && isset($_POST['password_repeat'])) {
if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") { if ($_POST['password'] == $_POST['password_repeat'] && $_POST['password'] != "") {
logm('password updated'); logm('password updated');
if (!DEMO) { if (!MODE_DEMO) {
$store->updatePassword(encode_string($_POST['password'] . $_SESSION['login'])); $store->updatePassword(encode_string($_POST['password'] . $_SESSION['login']));
$msg->add('s', 'your password has been updated'); $msg->add('s', 'your password has been updated');
} }
@ -79,6 +79,7 @@ $tpl->assign('isLogged', Session::isLogged());
$tpl->assign('referer', $ref); $tpl->assign('referer', $ref);
$tpl->assign('view', $view); $tpl->assign('view', $view);
$tpl->assign('poche_url', myTool::getUrl()); $tpl->assign('poche_url', myTool::getUrl());
$tpl->assign('demo', MODE_DEMO);
$tpl->assign('title', 'poche, a read it later open source system'); $tpl->assign('title', 'poche, a read it later open source system');
if (Session::isLogged()) { if (Session::isLogged()) {
@ -86,5 +87,6 @@ if (Session::isLogged()) {
display_view($view, $id, $full_head); display_view($view, $id, $full_head);
} }
else { else {
$tpl->draw('login'); $tpl->draw('login');
} }

4
tpl/login.html
View File

@ -9,11 +9,11 @@
<h2 class="mbs txtcenter">login to your poche</h2> <h2 class="mbs txtcenter">login to your poche</h2>
<div class="row"> <div class="row">
<label class="col w150p" for="login">Login</label> <label class="col w150p" for="login">Login</label>
<input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus /> <input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus {if="$demo == '1'"}value="poche"{/if} />
</div> </div>
<div class="row"> <div class="row">
<label class="col w150p" for="password">Password</label> <label class="col w150p" for="password">Password</label>
<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2"> <input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2" {if="$demo == '1'"}value="poche"{/if} />
</div> </div>
<div class="row"> <div class="row">
<label class="col w150p">Stay signed in</label> <label class="col w150p">Stay signed in</label>