X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fpoche%2Fconfig.inc.php;h=ecbf1ce6816537785511d4299c688e01154c78f9;hb=4a2912880f0914b456711d695f96ce2ace18c814;hp=ee0f6616455fb756554500dbffcd38772d217086;hpb=6fb3a2a18591a4c79e91a90282d88cd84554f83c;p=github%2Fwallabag%2Fwallabag.git

diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index ee0f6616..ecbf1ce6 100644
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -8,7 +8,15 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE_VERSION', '1.0-beta');
+# storage
+define ('STORAGE','sqlite'); # postgres, mysql, sqlite
+define ('STORAGE_SERVER', 'localhost'); # leave blank for sqlite
+define ('STORAGE_DB', 'poche'); # only for postgres & mysql
+define ('STORAGE_SQLITE', './db/poche.sqlite');
+define ('STORAGE_USER', 'postgres'); # leave blank for sqlite
+define ('STORAGE_PASSWORD', 'postgres'); # leave blank for sqlite
+
+define ('POCHE_VERSION', '1.0-beta2');
 define ('MODE_DEMO', FALSE);
 define ('DEBUG_POCHE', FALSE);
 define ('CONVERT_LINKS_FOOTNOTES', FALSE);
@@ -21,20 +29,23 @@ define ('ABS_PATH', 'assets/');
 define ('TPL', './tpl');
 define ('LOCALE', './locale');
 define ('CACHE', './cache');
-define ('LANG', 'fr_FR.UTF8');
+define ('LANG', 'en_EN.UTF8');
 define ('PAGINATION', '10');
 define ('THEME', 'light');
-$storage_type = 'sqlite'; # sqlite, mysql, (file, not yet)
 
 # /!\ Be careful if you change the lines below /!\
+if (!file_exists('./vendor/autoload.php')) {
+    die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>');
+}
+ 
+require_once './inc/poche/User.class.php';
 require_once './inc/poche/Tools.class.php';
 require_once './inc/poche/Url.class.php';
 require_once './inc/3rdparty/class.messages.php';
 require_once './inc/poche/Poche.class.php';
 require_once './inc/3rdparty/Readability.php';
 require_once './inc/3rdparty/Encoding.php';
-require_once './inc/store/store.class.php';
-require_once './inc/store/' . $storage_type . '.class.php';
+require_once './inc/poche/Database.class.php';
 require_once './vendor/autoload.php';
 require_once './inc/3rdparty/simple_html_dom.php';
 require_once './inc/3rdparty/paginator.php';
@@ -44,8 +55,7 @@ if (DOWNLOAD_PICTURES) {
     require_once './inc/poche/pochePictures.php';
 }
 
-$poche = new Poche($storage_type);
-
+$poche = new Poche();
 #XSRF protection with token
 // if (!empty($_POST)) {
 //     if (!Session::isToken($_POST['token'])) {