1 files changed, 40 insertions, 36 deletions

diff --git a/inc/config.php b/inc/config.php
index 6e3f80b8..7470f0c3 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -9,65 +9,69 @@
  */
 
 define ('POCHE_VERSION', '0.3');
-
-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 ('CONVERT_LINKS_FOOTNOTES', FALSE);
+define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
+define ('DOWNLOAD_PICTURES', FALSE);
 define ('SALT', '464v54gLLw928uz4zUBqkRJeiPY68zCX');
+define ('ABS_PATH', 'assets/');
+define ('TPL', './tpl');
+define ('LOCALE', './locale');
+define ('CACHE', './cache');
 define ('LANG', 'fr_FR.UTF8');
 
-putenv("LC_ALL=".LANG);
-setlocale(LC_ALL, LANG);
-bindtextdomain(LANG, "./locale"); 
-textdomain(LANG); 
-
 $storage_type = 'sqlite'; # sqlite or file
 
-include 'functions.php';
+# /!\ Be careful if you change the lines below /!\
+
+require_once 'pocheCore.php';
 require_once 'Readability.php';
 require_once 'Encoding.php';
-require_once 'rain.tpl.class.php';
-require_once 'MyTool.class.php';
+require_once 'pocheTool.class.php';
 require_once 'Session.class.php';
+require_once 'Twig/Autoloader.php';
 require_once 'store/store.class.php';
-require_once 'store/sqlite.class.php';
-require_once 'store/file.class.php';
-require_once 'class.messages.php';
+require_once 'store/' . $storage_type . '.class.php';
 
-Session::init();
+if (DOWNLOAD_PICTURES) {
+    require_once 'pochePicture.php';
+}
+
+# i18n
+putenv('LC_ALL=' . LANG);
+setlocale(LC_ALL, LANG);
+bindtextdomain(LANG, LOCALE); 
+textdomain(LANG); 
+
+# template engine
+Twig_Autoloader::register();
+$loader = new Twig_Loader_Filesystem(TPL);
+$twig = new Twig_Environment($loader, array(
+    'cache' => CACHE,
+));
+$twig->addExtension(new Twig_Extensions_Extension_I18n());
 
-$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();
+Session::init();
+$store = new $storage_type();
 
+# installation
 if(!$store->isInstalled())
 {
-    logm('poche still not installed');
-    $tpl->draw('install');
+    pocheTool::logm('poche still not installed');
+    echo $twig->render('install.twig', array(
+        'token' => Session::getToken(),
+    ));
     if (isset($_GET['install'])) {
         if (($_POST['password'] == $_POST['password_repeat']) 
             && $_POST['password'] != "" && $_POST['login'] != "") {
+            # let's rock, install poche baby !
             $store->install($_POST['login'], encode_string($_POST['password'] . $_POST['login']));
             Session::logout();
-            MyTool::redirect();
+            pocheTool::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
+$_SESSION['pass']  = (isset ($_SESSION['pass'])) ? $_SESSION['pass'] : $store->getPassword();
\ No newline at end of file