Merge branch 'dev'

[github/wallabag/wallabag.git] / inc / config.php

diff --git a/inc/config.php b/inc/config.php
index 386fd0360fb941f193b86ef39aef04a9d8e1410e..bd9287fe143ad0c539b34858d53f11640e56fc71 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -8,24 +8,35 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
+define ('POCHE_VERSION', '0.2.1');
+
 if (!is_dir('db/')) {
     @mkdir('db/',0705);
 }
 
-define ('DB_PATH', 'sqlite:./db/poche.sqlite');
+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 'db.php';
 include 'functions.php';
 require_once 'Readability.php';
 require_once 'Encoding.php';
 require_once 'rain.tpl.class.php';
+require_once 'MyTool.class.php';
+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';
 
-$db = new db(DB_PATH);
+Session::init();
 
-# Initialisation de RainTPL
+$store     = new $storage_type();
+# initialisation de RainTPL
 raintpl::$tpl_dir   = './tpl/';
 raintpl::$cache_dir = './cache/';
 raintpl::$base_url  = get_poche_url();
@@ -33,23 +44,23 @@ raintpl::configure('path_replace', false);
 raintpl::configure('debug', false);
 $tpl = new raintpl();
 
-# Démarrage session et initialisation du jeton de sécurité
-session_start();
-
-if (!isset($_SESSION['token_poche'])) {
-    $token = md5(uniqid(rand(), TRUE));
-    $_SESSION['token_poche'] = $token;
-    $_SESSION['token_time_poche'] = time();
+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();
 }
 
-# Traitement des paramètres et déclenchement des actions
-$view               = (isset ($_REQUEST['view'])) ? htmlentities($_REQUEST['view']) : 'index';
-$action             = (isset ($_REQUEST['action'])) ? htmlentities($_REQUEST['action']) : '';
-$_SESSION['sort']   = (isset ($_REQUEST['sort'])) ? htmlentities($_REQUEST['sort']) : 'id';
-$id                 = (isset ($_REQUEST['id'])) ? htmlspecialchars($_REQUEST['id']) : '';
-$url                = (isset ($_GET['url'])) ? $_GET['url'] : '';
-$token              = (isset ($_REQUEST['token'])) ? $_REQUEST['token'] : '';
+$_SESSION['login'] = (isset ($_SESSION['login'])) ? $_SESSION['login'] : $store->getLogin();
+$_SESSION['pass']  = (isset ($_SESSION['pass'])) ? $_SESSION['pass'] : $store->getPassword();
 
-if ($action != '') {
-    action_to_do($action, $url, $token, $id);
-}
+$msg = new Messages();
+$tpl->assign('msg', $msg);
\ No newline at end of file