diff --git a/api/index.php b/api/index.php index 6b00711419491cfdfd9d2b8b9fd37bf9c6dc9b0b..333c6483032e48bf4e5d0f4f4058aca5ebafc29d 100644 --- a/api/index.php +++ b/api/index.php @@ -1,8 +1,6 @@ <?php error_reporting(E_ERROR | E_PARSE); - require_once "../config.php"; - set_include_path(__DIR__ . PATH_SEPARATOR . dirname(__DIR__) . PATH_SEPARATOR . dirname(__DIR__) . "/include" . PATH_SEPARATOR . diff --git a/backend.php b/backend.php index 2237c06b376945ac19944184d153a03043e7f9f6..32eb3f3b9ceed02b3c044d193ffcac259d389d22 100644 --- a/backend.php +++ b/backend.php @@ -26,7 +26,6 @@ require_once "autoload.php"; require_once "sessions.php"; require_once "functions.php"; - require_once "config.php"; require_once "db-prefs.php"; $op = (string)clean($op); diff --git a/include/functions.php b/include/functions.php index 59c824e439815b098611912b924cccc208a768ba..d42306147a3546cba99cd99495973589e14c7474 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1,5 +1,4 @@ <?php - define('EXPECTED_CONFIG_VERSION', 26); define('SCHEMA_VERSION', 140); define('LABEL_BASE_INDEX', -1024); diff --git a/include/sessions.php b/include/sessions.php index d2fbc6a411c7954446cadf5a037e2553861f3c7d..8b7de0ac79569ce62ba5834fa35cdba8d27ac6ba 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -3,7 +3,6 @@ // Original from http://www.daniweb.com/code/snippet43.html - require_once "config.php"; require_once "autoload.php"; require_once "functions.php"; require_once "errorhandler.php"; diff --git a/index.php b/index.php index 73fccc3ea4d5ec579b9ab4ba94fcd27000694ca4..d640c2db9f4db17c2a665808535cbe693df9be3d 100644 --- a/index.php +++ b/index.php @@ -1,11 +1,5 @@ <?php - if (!file_exists("config.php")) { - print "<b>Fatal Error</b>: You forgot to copy - <b>config.php-dist</b> to <b>config.php</b> and edit it.\n"; - exit; - } - // we need a separate check here because functions.php might get parsed // incorrectly before 5.3 because of :: syntax. if (version_compare(PHP_VERSION, '7.0.0', '<')) { @@ -20,7 +14,6 @@ require_once "sessions.php"; require_once "functions.php"; require_once "sanity_check.php"; - require_once "config.php"; require_once "db-prefs.php"; if (!init_plugins()) return; diff --git a/prefs.php b/prefs.php index b6026eb233f581a8f2ee3944f22fde66eab99d22..1411185340664314a1a0e1c81cb0e428a627235c 100644 --- a/prefs.php +++ b/prefs.php @@ -2,17 +2,10 @@ set_include_path(__DIR__ ."/include" . PATH_SEPARATOR . get_include_path()); - if (!file_exists("config.php")) { - print "<b>Fatal Error</b>: You forgot to copy - <b>config.php-dist</b> to <b>config.php</b> and edit it.\n"; - exit; - } - require_once "autoload.php"; require_once "sessions.php"; require_once "functions.php"; require_once "sanity_check.php"; - require_once "config.php"; require_once "db-prefs.php"; if (!init_plugins()) return; diff --git a/public.php b/public.php index 48fe675f8b7f3bf6e0f86f9cd88948c7c453e3bb..8a02387cfa5422cc78b3732dfa7ffc4e346b19b2 100644 --- a/public.php +++ b/public.php @@ -6,7 +6,6 @@ require_once "sessions.php"; require_once "functions.php"; require_once "sanity_check.php"; - require_once "config.php"; require_once "db-prefs.php"; startup_gettext(); diff --git a/update.php b/update.php index 92a087a2ee1b58d0ac8c243c0d013d44caf7804b..af541f51700d99b9ffba9700a7d194dfdc77b588 100755 --- a/update.php +++ b/update.php @@ -9,7 +9,6 @@ require_once "autoload.php"; require_once "functions.php"; - require_once "config.php"; require_once "sanity_check.php"; require_once "db-prefs.php"; diff --git a/update_daemon2.php b/update_daemon2.php index b0314f3e9912b05146a55830779fe350e5c85b58..2743a0fa2b629d96f66208869f40d47c2817e600 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -10,7 +10,6 @@ require_once "autoload.php"; require_once "functions.php"; - require_once "config.php"; require_once "sanity_check.php"; require_once "db-prefs.php";