Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #269 from virtualtam/fix/read-config

Browse source 
Fix: data/config.php was not imported
This commit is contained in:
VirtualTam 2015-07-11 12:48:24 +02:00
commit 1b73f35ebf
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
index.php
View file

@ -63,6 +63,11 @@
error_reporting(E_ALL^E_WARNING); // See all error except warnings. error_reporting(E_ALL^E_WARNING); // See all error except warnings.
//error_reporting(-1); // See all errors (for debugging only) //error_reporting(-1); // See all errors (for debugging only)
// User configuration
if (is_file($GLOBALS['config']['CONFIG_FILE'])) {
require_once $GLOBALS['config']['CONFIG_FILE'];
}
// Shaarli library // Shaarli library
require_once 'application/LinkDB.php'; require_once 'application/LinkDB.php';
require_once 'application/Utils.php'; require_once 'application/Utils.php';
@ -103,9 +108,10 @@ function stripslashes_deep($value) { $value = is_array($value) ? array_map('stri
// I really need to rewrite Shaarli with a proper configuation manager. // I really need to rewrite Shaarli with a proper configuation manager.
// Run config screen if first run: // Run config screen if first run:
if (!is_file($GLOBALS['config']['CONFIG_FILE'])) install(); if (! is_file($GLOBALS['config']['CONFIG_FILE'])) {
install();
}
require $GLOBALS['config']['CONFIG_FILE']; // Read login/password hash into $GLOBALS.
$GLOBALS['title'] = !empty($GLOBALS['title']) ? escape($GLOBALS['title']) : ''; $GLOBALS['title'] = !empty($GLOBALS['title']) ? escape($GLOBALS['title']) : '';
$GLOBALS['titleLink'] = !empty($GLOBALS['titleLink']) ? escape($GLOBALS['titleLink']) : ''; $GLOBALS['titleLink'] = !empty($GLOBALS['titleLink']) ? escape($GLOBALS['titleLink']) : '';
$GLOBALS['redirector'] = !empty($GLOBALS['redirector']) ? escape($GLOBALS['redirector']) : ''; $GLOBALS['redirector'] = !empty($GLOBALS['redirector']) ? escape($GLOBALS['redirector']) : '';