Merge pull request #183 from tuxis-ie/nice-authdb-error

Show a clear message instead of ERROR 500
This commit is contained in:
Tuxis Internet Engineering V.O.F 2018-08-22 16:51:28 +02:00 committed by GitHub
commit c63dbba617
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -59,13 +59,18 @@ if (function_exists('openssl_random_pseudo_bytes') === FALSE) {
$defaults['defaulttype'] = ucfirst(strtolower($defaults['defaulttype'])); $defaults['defaulttype'] = ucfirst(strtolower($defaults['defaulttype']));
if (isset($authdb) && !file_exists($authdb) && class_exists('SQLite3')) { try {
is_dir(dirname($authdb)) || mkdir(dirname($authdb)); if (isset($authdb) && !file_exists($authdb) && class_exists('SQLite3')) {
$db = new SQLite3($authdb, SQLITE3_OPEN_CREATE|SQLITE3_OPEN_READWRITE); is_dir(dirname($authdb)) || mkdir(dirname($authdb));
$createsql = file_get_contents('includes/scheme.sql'); $db = new SQLite3($authdb, SQLITE3_OPEN_CREATE|SQLITE3_OPEN_READWRITE);
$db->exec($createsql); $createsql = file_get_contents('includes/scheme.sql');
$salt = bin2hex(openssl_random_pseudo_bytes(16)); $db->exec($createsql);
$db->exec("INSERT INTO users (emailaddress, password, isadmin) VALUES ('admin', '".crypt("admin", '$6$'.$salt)."', 1)"); $salt = bin2hex(openssl_random_pseudo_bytes(16));
$db->exec("INSERT INTO users (emailaddress, password, isadmin) VALUES ('admin', '".crypt("admin", '$6$'.$salt)."', 1)");
}
} catch (Exception $e) {
print("We have issues getting the authdb working: $e");
$blocklogin = TRUE;
} }
function string_starts_with($string, $prefix) function string_starts_with($string, $prefix)