From 75e042097a481dec5a0f4e2d85a24c8f9dd59262 Mon Sep 17 00:00:00 2001 From: Tim Repke <repketim@informatik.hu-berlin.de> Date: Mon, 22 Sep 2014 23:54:26 +0100 Subject: [PATCH] date and encoding settings moved to config - that makes it global --- registration-system/admin/index.php | 8 -------- registration-system/admin/pages_overview.php | 1 + registration-system/config.inc.php | 8 ++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/registration-system/admin/index.php b/registration-system/admin/index.php index f91df20..876221c 100644 --- a/registration-system/admin/index.php +++ b/registration-system/admin/index.php @@ -8,14 +8,6 @@ session_start(); -mb_internal_encoding('UTF-8'); -mb_http_output('UTF-8'); -mb_http_input('UTF-8'); -mb_language('uni'); -mb_regex_encoding('UTF-8'); -ob_start('mb_output_handler'); -date_default_timezone_set("Europe/Berlin"); - require_once("commons_admin.php"); require_once("pages.php"); require_once("../config.inc.php"); diff --git a/registration-system/admin/pages_overview.php b/registration-system/admin/pages_overview.php index b55e687..88f7fb3 100644 --- a/registration-system/admin/pages_overview.php +++ b/registration-system/admin/pages_overview.php @@ -19,6 +19,7 @@ $mitfahrer['gesaa'] = $admin_db->count("bachelor", ["fahrt_id" => $config_cur $antag = $admin_db->query("SELECT date_format(von, '%j') as von FROM fahrten WHERE fahrt_id=$config_current_fahrt_id")->fetchAll()[0]['von']; $abtag = $admin_db->query("SELECT date_format(bis, '%j') as von FROM fahrten WHERE fahrt_id=$config_current_fahrt_id")->fetchAll()[0]['bis']; +$tmp = $admin_db->query("SELECT date_format(antag, '%j') as antag, SELECT date_format(abtag, '%j') as abtag FROM bachelor WHERE fahrt_id=$config_current_fahrt_id")->fetchAll()[0]['bis']; $mitfahrer['erste'] = $admin_db->count("bachelor", ["AND"=> ["backstepped" => NULL, "fahrt_id" => $config_current_fahrt_id, diff --git a/registration-system/config.inc.php b/registration-system/config.inc.php index 0c4e3c3..fdba340 100644 --- a/registration-system/config.inc.php +++ b/registration-system/config.inc.php @@ -2,6 +2,14 @@ // https://repke.eu:8443 // passwort manu:kuzerPenis666! +mb_internal_encoding('UTF-8'); +mb_http_output('UTF-8'); +mb_http_input('UTF-8'); +mb_language('uni'); +mb_regex_encoding('UTF-8'); +ob_start('mb_output_handler'); +date_default_timezone_set("Europe/Berlin"); + $config_verbose_level = 3; // 0 = nothing, 1 = important, 2 = somewhat important, 3 = detailed verbose, 4 = with sql $config_admin_verbose_level = 3; -- GitLab