Merge /media/sdb1/gitRepositories/judo into redesign2018

Conflicts:
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
This commit is contained in:
marko
2018-12-03 17:40:44 +01:00
14 changed files with 259 additions and 48 deletions

View File

@@ -16,19 +16,20 @@
}
else{
if( (string)(int)$_POST['f']['eventId'] == $_POST['f']['eventId'] ){
$mysqli = @new mysqli($db_server, $db_user, $db_password, $db_name);
if ($mysqli->connect_error) {
$message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error;
$mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name);
if ($mysqlConn->connect_error) {
$sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error;
}
else{
// Abfrage der Eventdaten
$eventData = getWkEventData($mysqli, $_POST['f']['eventId']);
$eventData = getWkEventData($mysqlConn, $_POST['f']['eventId'], array('outCharset'=>"UTF-8"));
if( empty($eventData) ) $message['error'] = 'Fehler: keine Eventdaten zurückgeliefert!';
else{
// Abfrage der Starterdaten des Events
$starterData = getStarterForEvent($mysqli, $eventData['id']);
// Abfrage der Fahrtdaten des Events
$fahrten = getFahrtenForEvent($mysqli, $eventData['id']);
// Abfrage der Starterdaten des Events
$starterData = getStarterForEvent($mysqlConn, $eventData['id']);
// Abfrage der Fahrtdaten des Events
$fahrten = getFahrtenForEvent($mysqlConn, $eventData['id']);
}
}
}