messages d'erreur si pas possible d'ajouter ou de supprimer un lien

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

diff --git a/inc/config.php b/inc/config.php
index 386fd0360fb941f193b86ef39aef04a9d8e1410e..8bafd5950b5d2ab1cd493a4b12e3372d49735419 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -8,48 +8,38 @@
  * @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 ('ABS_PATH', 'assets/');
 define ('CONVERT_LINKS_FOOTNOTES', TRUE);
 define ('DOWNLOAD_PICTURES', TRUE);
+$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';
+
+Session::init();
 
-$db = new db(DB_PATH);
+$store         = new $storage_type();
+$msg   = new Messages();
 
-# Initialisation de RainTPL
+# 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();
-
-# 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();
-}
-
-# 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'] : '';
-
-if ($action != '') {
-    action_to_do($action, $url, $token, $id);
-}
+$tpl->assign('msg', $msg);
\ No newline at end of file