From 6a9e4bfc901439d5b4791b229acc872d43461f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 11 Aug 2013 21:04:04 +0200 Subject: version number --- inc/poche/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche/config.inc.php') diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php index 321784d7..ba8a9fa0 100644 --- a/inc/poche/config.inc.php +++ b/inc/poche/config.inc.php @@ -16,7 +16,7 @@ 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-beta1'); +define ('POCHE_VERSION', '1.0-beta2'); define ('MODE_DEMO', FALSE); define ('DEBUG_POCHE', FALSE); define ('CONVERT_LINKS_FOOTNOTES', FALSE); -- cgit v1.2.3 From 4a2912880f0914b456711d695f96ce2ace18c814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 15 Aug 2013 10:54:14 +0200 Subject: more verif while installing --- inc/poche/config.inc.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'inc/poche/config.inc.php') diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php index ba8a9fa0..ecbf1ce6 100644 --- a/inc/poche/config.inc.php +++ b/inc/poche/config.inc.php @@ -34,6 +34,10 @@ define ('PAGINATION', '10'); define ('THEME', 'light'); # /!\ Be careful if you change the lines below /!\ +if (!file_exists('./vendor/autoload.php')) { + die('Twig does not seem installed. Have a look at the documentation.'); +} + require_once './inc/poche/User.class.php'; require_once './inc/poche/Tools.class.php'; require_once './inc/poche/Url.class.php'; -- cgit v1.2.3 From bb5a7d9ede48558c6f096dc3c8e267f12513ec4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 16 Aug 2013 20:19:31 +0200 Subject: updating script --- inc/poche/config.inc.php | 57 +++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 39 deletions(-) mode change 100644 => 100755 inc/poche/config.inc.php (limited to 'inc/poche/config.inc.php') diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php old mode 100644 new mode 100755 index ecbf1ce6..4122ff10 --- a/inc/poche/config.inc.php +++ b/inc/poche/config.inc.php @@ -8,51 +8,30 @@ * @license http://www.wtfpl.net/ see COPYING file */ -# 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); -define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE); -define ('DOWNLOAD_PICTURES', FALSE); -define ('SHARE_TWITTER', TRUE); -define ('SHARE_MAIL', TRUE); -define ('SALT', '464v54gLLw928uz4zUBqkRJeiPY68zCX'); -define ('ABS_PATH', 'assets/'); -define ('TPL', './tpl'); -define ('LOCALE', './locale'); -define ('CACHE', './cache'); -define ('LANG', 'en_EN.UTF8'); -define ('PAGINATION', '10'); -define ('THEME', 'light'); +require_once __DIR__ . '/../../inc/poche/define.inc.php'; # /!\ Be careful if you change the lines below /!\ -if (!file_exists('./vendor/autoload.php')) { +if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) { die('Twig does not seem installed. Have a look at the documentation.'); } - -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/poche/Database.class.php'; -require_once './vendor/autoload.php'; -require_once './inc/3rdparty/simple_html_dom.php'; -require_once './inc/3rdparty/paginator.php'; -require_once './inc/3rdparty/Session.class.php'; + +if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) { + require_once __DIR__ . '/../../inc/poche/myconfig.inc.php'; +} +require_once __DIR__ . '/../../inc/poche/User.class.php'; +require_once __DIR__ . '/../../inc/poche/Url.class.php'; +require_once __DIR__ . '/../../inc/3rdparty/class.messages.php'; +require_once __DIR__ . '/../../inc/poche/Poche.class.php'; +require_once __DIR__ . '/../../inc/3rdparty/Readability.php'; +require_once __DIR__ . '/../../inc/3rdparty/Encoding.php'; +require_once __DIR__ . '/../../inc/poche/Database.class.php'; +require_once __DIR__ . '/../../vendor/autoload.php'; +require_once __DIR__ . '/../../inc/3rdparty/simple_html_dom.php'; +require_once __DIR__ . '/../../inc/3rdparty/paginator.php'; +require_once __DIR__ . '/../../inc/3rdparty/Session.class.php'; if (DOWNLOAD_PICTURES) { - require_once './inc/poche/pochePictures.php'; + require_once __DIR__ . '/../../inc/poche/pochePictures.php'; } $poche = new Poche(); -- cgit v1.2.3