D3Public
/
daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #144 from BrandonOCasey/master 

Added error handling for JSON decode returning NULL
This commit is contained in:
Denis Kisselev 2014-05-17 11:05:20 -07:00
parent 8689e89c39 85eb99df03
commit 8681ec1a80
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/functions.php
View File

@ -37,6 +37,10 @@
if (substr($config_file, 0, 1) !== '/') $config_file = $base . '/' . $config_file;
if (file_exists($config_file)) {
$config = json_decode(file_get_contents($config_file), true);
if(!isset($config)) {
echo '<strong>Daux.io Config Error:</strong><br> The config file ' . $config_file . ' that was passed contained invalid JSON. <a href="http://daux.io">Learn More</a>.';
exit;
}
$options = array_merge($options, $config);
}
if (!isset($options['ignore']['files'])) $options['ignore']['files'] = array();
@ -54,7 +58,7 @@
exit;
}
}
if (!ini_get('date.timezone')) date_default_timezone_set('GMT');
if (!ini_get('date.timezone')) date_default_timezone_set('GMT');
return $options;
}