nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-01 16:11:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove database connection check before $c is available (closes #36)

Browse Source 
My browser hides the error message behind the menu bar, that's why I'm
also adding a line break in the do_error() handler.
This commit is contained in:
Florian Schlichting 2016-01-01 23:54:01 +01:00
parent c35704cc4b
commit ffdc13183f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/setup.php
View File

@ -171,14 +171,13 @@ $loaded_extensions = array_flip(get_loaded_extensions());
function do_error( $errormessage ) { function do_error( $errormessage ) {
// We can't translate this because we're testing these things even before // We can't translate this because we're testing these things even before
// the translation interface is available... // the translation interface is available...
printf("<p class='error'>%s</p>", $errormessage ); printf("<p class='error'><br/>%s</p>", $errormessage );
} }
if ( !check_gettext()->getOK() ) do_error("The GNU 'gettext' extension for PHP is not available."); if ( !check_gettext()->getOK() ) do_error("The GNU 'gettext' extension for PHP is not available.");
if ( !check_pgsql()->getOK() ) do_error("PHP 'pgsql' functions are not available"); if ( !check_pgsql()->getOK() ) do_error("PHP 'pgsql' functions are not available");
if ( !check_pdo()->getOK() ) do_error("PHP 'PDO' module is not available"); if ( !check_pdo()->getOK() ) do_error("PHP 'PDO' module is not available");
if ( !check_pdo_pgsql()->getOK() ) do_error("The PDO drivers for PostgreSQL are not available"); if ( !check_pdo_pgsql()->getOK() ) do_error("The PDO drivers for PostgreSQL are not available");
if ( !check_database_connection()->getOK() ) do_error("Unable to connect to database");
if ( !check_iconv()->getOK() ) do_error("The 'iconv' extension for PHP is not available"); if ( !check_iconv()->getOK() ) do_error("The 'iconv' extension for PHP is not available");
function get_phpinfo() { function get_phpinfo() {