From 19875ef0dad9999f91e6f8d780756e402b5e6722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Wed, 21 Jan 2015 14:45:39 +0100
Subject: add install script after composer install

---
 app/check_essentials.php  |   6 +++---
 app/check_setup.php       |   9 ---------
 app/config/global.inc.php |   6 +++---
 app/db/.htaccess          |   2 --
 app/db/poche.sqlite       | Bin 491520 -> 0 bytes
 app/db/poche.sqlite3      | Bin 491520 -> 0 bytes
 6 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100755 app/check_setup.php
 delete mode 100644 app/db/.htaccess
 delete mode 100755 app/db/poche.sqlite
 delete mode 100755 app/db/poche.sqlite3

(limited to 'app')

diff --git a/app/check_essentials.php b/app/check_essentials.php
index a47cd5a8..073b6032 100644
--- a/app/check_essentials.php
+++ b/app/check_essentials.php
@@ -1,13 +1,13 @@
 <?php
+if (!file_exists(__DIR__ . '/config/config.inc.php')) {
+    die('wallabag seems to be not installed. Please execute ./bin/install before.');
+}
 
-// PHP 5.3 minimum
 if (version_compare(PHP_VERSION, '5.3.3', '<')) {
     die('This software require PHP 5.3.3 minimum');
 }
 
-// Short tags must be enabled for PHP < 5.4
 if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-
     if (! ini_get('short_open_tag')) {
         die('This software require to have short tags enabled, check your php.ini => "short_open_tag = On"');
     }
diff --git a/app/check_setup.php b/app/check_setup.php
deleted file mode 100755
index 57495f2c..00000000
--- a/app/check_setup.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-
-
-// install folder still present, need to install wallabag
-// if (is_dir('install')) {
-//     require('install/index.php');
-//     exit;
-// }
\ No newline at end of file
diff --git a/app/config/global.inc.php b/app/config/global.inc.php
index 4df68ea9..59db5aa1 100755
--- a/app/config/global.inc.php
+++ b/app/config/global.inc.php
@@ -12,9 +12,9 @@ define('ROOT', dirname(__FILE__) . '/../..');
 
 require_once ROOT . '/vendor/autoload.php';
 
-# system configuration; database credentials et caetera
-require_once dirname(__FILE__) . '/config.inc.php';
-require_once dirname(__FILE__) . '/config.inc.default.php';
+# system configuration
+require_once __DIR__ . '/config.inc.php';
+require_once __DIR__ . '/config.inc.default.php';
 
 if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
     date_default_timezone_set('UTC');
diff --git a/app/db/.htaccess b/app/db/.htaccess
deleted file mode 100644
index 93169e4e..00000000
--- a/app/db/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all
diff --git a/app/db/poche.sqlite b/app/db/poche.sqlite
deleted file mode 100755
index 9e9e52cb..00000000
Binary files a/app/db/poche.sqlite and /dev/null differ
diff --git a/app/db/poche.sqlite3 b/app/db/poche.sqlite3
deleted file mode 100755
index 3c80dc22..00000000
Binary files a/app/db/poche.sqlite3 and /dev/null differ
-- 
cgit v1.2.3