mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-23 17:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #814 from wallabag/fix-issue813

Browse source 
vendor dir is not accessible before install, sqlite db dir write check moved into db class
This commit is contained in:
tcitworld 2014-08-21 16:28:16 +02:00
commit a9bbe11169
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
check_setup.php Normal file → Executable file
View file

@ -5,11 +5,6 @@ if (! is_writable('cache')) {
die('The directory "cache" must be writeable by your web server user'); die('The directory "cache" must be writeable by your web server user');
} }
// Check if /db is writeable
if (! is_writable('db') && STORAGE === 'sqlite') {
die('The directory "db" must be writeable by your web server user');
}
// install folder still present, need to install wallabag // install folder still present, need to install wallabag
if (is_dir('install')) { if (is_dir('install')) {
require('install/index.php'); require('install/index.php');

4
inc/poche/Database.class.php
View file

@ -23,6 +23,10 @@ class Database {
{ {
switch (STORAGE) { switch (STORAGE) {
case 'sqlite': case 'sqlite':
// Check if /db is writeable
if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) {
die('An error occured: "db" directory must be writeable for your web server user!');
}
$db_path = 'sqlite:' . STORAGE_SQLITE; $db_path = 'sqlite:' . STORAGE_SQLITE;
$this->handle = new PDO($db_path); $this->handle = new PDO($db_path);
break; break;

2
index.php
View file

@ -10,8 +10,8 @@
define ('POCHE', '1.8.0'); define ('POCHE', '1.8.0');
require 'check_essentials.php'; require 'check_essentials.php';
require_once 'inc/poche/global.inc.php';
require 'check_setup.php'; require 'check_setup.php';
require_once 'inc/poche/global.inc.php';
// Start session // Start session
Session::$sessionName = 'wallabag'; Session::$sessionName = 'wallabag';