mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-23 08:06:33 +00:00
Code Issues Projects Releases Wiki Activity

Split up check_setup.php into two files. The new file check_essentials.php takes care of stuff like the PHP version and is executed before the config files are included which are needed by check_setup. This patch addresses issue #773

Browse source
This commit is contained in:
Marc Wilhelm 2014-07-22 11:52:18 +02:00
parent 955fc67438
commit 9c67b1b829
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
check_essentials.php Normal file
View file

@ -0,0 +1,14 @@
<?php
// 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"');
}
}

15
check_setup.php
View file

@ -1,25 +1,12 @@
<?php <?php
// 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"');
}
}
// Check if /cache is writeable // Check if /cache is writeable
if (! is_writable('cache')) { 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 // Check if /db is writeable
if (! is_writable('db')) { if (! is_writable('db') && STORAGE === 'sqlite') {
die('The directory "db" must be writeable by your web server user'); die('The directory "db" must be writeable by your web server user');
} }

3
index.php
View file

@ -9,8 +9,9 @@
*/ */
define ('POCHE', '1.7.1'); define ('POCHE', '1.7.1');
require 'check_setup.php'; require 'check_essentials.php';
require_once 'inc/poche/global.inc.php'; require_once 'inc/poche/global.inc.php';
require 'check_setup.php';
# Set error reporting level # Set error reporting level
if (defined('ERROR_REPORTING')) { if (defined('ERROR_REPORTING')) {