X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Fconfig.php;h=bd9287fe143ad0c539b34858d53f11640e56fc71;hb=6499b26ae8e148fa5481db5b7a4e9fc0e55aad94;hp=cf3529cb1e8de4e198e3c7e258f06a6bfeefd135;hpb=4e97e6e8b9b6b02942f506b930b215540cd1f2a1;p=github%2Fwallabag%2Fwallabag.git

diff --git a/inc/config.php b/inc/config.php
index cf3529cb..bd9287fe 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -8,15 +8,18 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE_VERSION', '0.2');
+define ('POCHE_VERSION', '0.2.1');
 
 if (!is_dir('db/')) {
     @mkdir('db/',0705);
 }
 
+define ('MODE_DEMO', FALSE);
 define ('ABS_PATH', 'assets/');
 define ('CONVERT_LINKS_FOOTNOTES', TRUE);
+define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE);
 define ('DOWNLOAD_PICTURES', TRUE);
+define ('SALT', '464v54gLLw928uz4zUBqkRJeiPY68zCX');
 $storage_type = 'sqlite'; # sqlite or file
 
 include 'functions.php';
@@ -28,13 +31,36 @@ require_once 'Session.class.php';
 require_once 'store/store.class.php';
 require_once 'store/sqlite.class.php';
 require_once 'store/file.class.php';
+require_once 'class.messages.php';
 
-$store = new $storage_type();
+Session::init();
 
+$store     = new $storage_type();
 # initialisation de RainTPL
 raintpl::$tpl_dir   = './tpl/';
 raintpl::$cache_dir = './cache/';
 raintpl::$base_url  = get_poche_url();
 raintpl::configure('path_replace', false);
 raintpl::configure('debug', false);
-$tpl = new raintpl();
\ No newline at end of file
+$tpl = new raintpl();
+
+if(!$store->isInstalled())
+{
+    logm('poche still not installed');
+    $tpl->draw('install');
+    if (isset($_GET['install'])) {
+        if (($_POST['password'] == $_POST['password_repeat']) 
+            && $_POST['password'] != "" && $_POST['login'] != "") {
+            $store->install($_POST['login'], encode_string($_POST['password'] . $_POST['login']));
+            Session::logout();
+            MyTool::redirect();
+        }
+    }
+    exit();
+}
+
+$_SESSION['login'] = (isset ($_SESSION['login'])) ? $_SESSION['login'] : $store->getLogin();
+$_SESSION['pass']  = (isset ($_SESSION['pass'])) ? $_SESSION['pass'] : $store->getPassword();
+
+$msg = new Messages();
+$tpl->assign('msg', $msg);
\ No newline at end of file