Merge /media/sdb1/gitRepositories/judo into redesign2018
Conflicts: homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
This commit is contained in:
marko
@@ -33,7 +33,7 @@
|
||||
"Neue Fahrt für eventId " . $_POST['f']['eventId'] . " mit " . $_POST['f']['anzPlaetze'] . " hinzugefügt";
|
||||
|
||||
$userData = getUserData($mysqli, $_SESSION['user']['userId']);
|
||||
$eventData = getEventData($mysqli, $_POST['f']['eventId']);
|
||||
$eventData = getWkEventData($mysqli, $_POST['f']['eventId']);
|
||||
$wkData = getWkData($mysqli, $eventData['wkId']);
|
||||
|
||||
$notificationMail['to'] = $userData['eMail'];
|
||||
@@ -74,7 +74,7 @@
|
||||
$message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error;
|
||||
}
|
||||
|
||||
$eventData = getEventData($mysqli, $_POST['f']['eventId']);
|
||||
$eventData = getWkEventData($mysqli, $_POST['f']['eventId']);
|
||||
$wkData = getWkData($mysqli, $eventData['wkId']);
|
||||
?>
|
||||
<div id="meldungsBox">
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
$message['error'] .= "Datenbankverbindung fehlgeschlagen: ".$mysqlConn->connect_error."<br /";
|
||||
}
|
||||
else{
|
||||
$wkEventData = getEventData($mysqlConn, $_POST['f']['eventId']);
|
||||
$wkEventData = getWkEventData($mysqlConn, $_POST['f']['eventId']);
|
||||
|
||||
if( date("Y-m-d") > $wkEventData['meldefrist']){
|
||||
$message['error'] .= "Die Meldefrist ist bereits abgelaufen!<br />";
|
||||
@@ -56,6 +56,7 @@
|
||||
}
|
||||
}
|
||||
else{
|
||||
// @todo hier müsste das Auslösen der Meldung
|
||||
$userData = getUserData($mysqlConn, $_SESSION['user']['userId']);
|
||||
$starterData = getUserData($mysqlConn, $_POST['f']['userId']);
|
||||
// $wkData = getWkData($mysqlConn, $eventData['wkId']);
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
$message['error'] .= "Datenbankverbindung fehlgeschlagen: ".$mysqlConn->connect_error."<br /";
|
||||
}
|
||||
else{
|
||||
$wkEventData = getEventData($mysqlConn, $_POST['f']['eventId']);
|
||||
$wkEventData = getWkEventData($mysqlConn, $_POST['f']['eventId']);
|
||||
|
||||
if( date("Y-m-d") > $wkEventData['meldefrist']){
|
||||
$message['error'] .= "Die Meldefrist ist bereits abgelaufen!<br />";
|
||||
|
||||
@@ -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']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<?php
|
||||
session_start();
|
||||
session_start([
|
||||
'cookie_lifetime' => 86400, // 86400s sind 24h
|
||||
]);
|
||||
session_regenerate_id();
|
||||
// Falls der serverseitige Logincookie nicht gesetzt ist, leite zur
|
||||
if (empty($_SESSION['login'])) {
|
||||
@@ -12,6 +14,5 @@
|
||||
"Sie sind als <strong>".htmlspecialchars($_SESSION['user']['username'])."</strong> angemeldet.<br />".
|
||||
"<a href=\"./logout.php\">Sitzung beenden</a>".
|
||||
"</div>";
|
||||
//<div style=\"border: 1px solid black\">".var_export($_SESSION, true)."</div>";
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<?php
|
||||
session_start();
|
||||
session_start([
|
||||
'cookie_lifetime' => 86400, // 86400s sind 24h
|
||||
]);
|
||||
session_regenerate_id();
|
||||
// Falls der serverseitige Logincookie nicht gesetzt ist, leite zur
|
||||
if (empty($_SESSION['login'])){
|
||||
|
||||
@@ -205,6 +205,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
|
||||
<?php
|
||||
}
|
||||
else{
|
||||
// var_dump($wkEvents);
|
||||
foreach( $wkEvents as $wk){
|
||||
//print_r($wk);
|
||||
$wkEvent = getWkEventData($mysqlConn, $wk['id'], array('outCharset'=>"UTF-8"));
|
||||
|
||||
@@ -1,9 +1,17 @@
|
||||
<?php
|
||||
|
||||
setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
|
||||
require_once('./local/wkParticipoConf.php.inc');
|
||||
// require_once('./auth.php');
|
||||
require_once('./authLogin.php');
|
||||
require_once('./local/db.php.inc');
|
||||
require_once('./lib/wkParticipoLib.inc.php');
|
||||
|
||||
|
||||
$basePath = "/users/cwsvjudo/www";
|
||||
require_once($basePath."/config/phpcount.config.php");
|
||||
require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
|
||||
|
||||
|
||||
$message = array();
|
||||
$eventData = array();
|
||||
|
||||
@@ -21,8 +29,26 @@
|
||||
$message['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error;
|
||||
}
|
||||
else{
|
||||
$eventData = getEventData($mysqli, $_GET['eventId']);
|
||||
$eventData = getWkEventData($mysqli, $_GET['eventId']);
|
||||
if( empty($eventData) ) $message['error'] .= 'Fehler: keine Eventdaten zurückgeliefert!';
|
||||
else{
|
||||
if(!empty($eventData['bemerkungen'])){
|
||||
$tmpJson = json_decode( $eventData['bemerkungen'], true);
|
||||
if($tmpJson){
|
||||
$eventData['Datum'] = $tmpJson['Datum'];
|
||||
$eventData['Veranstaltung'] = $tmpJson['Veranstaltung'];
|
||||
$eventData['Altersklassen'] = $tmpJson['Altersklassen'];
|
||||
$eventData['Routenplaner'] = $tmpJson['Routenplaner'];
|
||||
$eventData['Ausschreibung'] = $tmpJson['Ausschreibung'];
|
||||
$eventData['bemerkungen'] = $tmpJson['bemerkungen'];
|
||||
}
|
||||
}
|
||||
PHPCount::AddHit(
|
||||
"Wettkampfplaner ".
|
||||
($_SESSION['user']['username']?("(".htmlspecialchars($_SESSION['user']['username']).") "):"").
|
||||
"- ".$eventData['Veranstaltung']
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
else $message['error'] .= "Fehler: eventId ist kein Int (".$_GET['eventId'].")";
|
||||
@@ -34,7 +60,7 @@
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Wettkampfplanung - Wettkampfdetails<?php echo (empty($eventData) ? "" : " ".mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1'));?></title>
|
||||
<title>Wettkampfplanung - Wettkampfdetails<?php echo( empty($eventData) ? "" : " ".$eventData['Veranstaltung'] );?></title>
|
||||
<link rel="stylesheet" href="./style.css">
|
||||
</head>
|
||||
<body>
|
||||
@@ -55,15 +81,15 @@
|
||||
}
|
||||
else{
|
||||
?>
|
||||
<h1><?php echo (empty($eventData) ? "" : " ".mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1'));?></h1>
|
||||
<h1><?php echo (empty($eventData) ? "" : " ".$eventData['Veranstaltung']);?></h1>
|
||||
|
||||
<h2>Wettkampfdaten</h2>
|
||||
<ul>
|
||||
<li>Wettkampfname: <?php echo mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?></li>
|
||||
<li>Datum: <time datetime="<?php echo mb_convert_encoding($eventData['Datum'], 'UTF-8', 'ISO-8859-1');?>"><?php echo mb_convert_encoding($eventData['Datum'], 'UTF-8', 'ISO-8859-1');?></time></li>
|
||||
<li>Frist zum Einschreiben: <time datetime="<?php echo mb_convert_encoding($eventData['meldefrist'], 'UTF-8', 'ISO-8859-1');?>"><?php echo mb_convert_encoding($eventData['meldefrist'], 'UTF-8', 'ISO-8859-1');?></time> <a class="touchLink" href ="<?php echo(addToGcalUrl(mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1'), mb_convert_encoding($eventData['meldefrist'], 'UTF-8', 'ISO-8859-1') ));?>">Einschreibefrist in den Google Calendar übernehmen</a></li>
|
||||
<li>Altersklassen: <?php echo mb_convert_encoding($eventData['Altersklassen'], 'UTF-8', 'ISO-8859-1');?></li>
|
||||
<li>Ort: <a class="touchLink" href="<?php echo $eventData['Routenplaner'];?>"><?php echo mb_convert_encoding($eventData['Ort'], 'UTF-8', 'ISO-8859-1');?></a></li>
|
||||
<li>Wettkampfname: <?php echo $eventData['Veranstaltung'];?></li>
|
||||
<li>Datum: <time datetime="<?php echo $eventData['Datum'];?>"><?php echo $eventData['Datum'];?></time></li>
|
||||
<li>Frist zum Einschreiben: <time datetime="<?php echo $eventData['meldefrist'];?>"><?php echo $eventData['meldefrist'];?></time> <a class="touchLink" href ="<?php echo(addToGcalUrl($eventData['Veranstaltung'], $eventData['meldefrist']));?>">Einschreibefrist in den Google Calendar übernehmen</a></li>
|
||||
<li>Altersklassen: <?php echo $eventData['Altersklassen'];?></li>
|
||||
<li>Ort: <a class="touchLink" href="<?php echo $eventData['Routenplaner'];?>"><?php echo $eventData['Ort'];?></a></li>
|
||||
<li>Bemerkungen: <?php echo $eventData['bemerkungen'];?></li>
|
||||
</ul>
|
||||
|
||||
@@ -85,7 +111,7 @@
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href ="<?php echo(addToGcalUrl(mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1'), mb_convert_encoding($eventData['Datum'], 'UTF-8', 'ISO-8859-1') ));?>">
|
||||
<a href ="<?php echo(addToGcalUrl($eventData['Veranstaltung'], $eventData['Datum'] ));?>">
|
||||
<div>Termin in den Google Calendar übernehmen</div>
|
||||
</a>
|
||||
</li>
|
||||
@@ -179,7 +205,7 @@
|
||||
echo "<button class=\"touchButton\" type=\"submit\" disabled>Die Frist zum Einschreiben (".$eventData['meldefrist'].") ist bereits abgelaufen!</button>";
|
||||
|
||||
if (!empty($_SESSION['login'])){
|
||||
echo( "<p>Frist für das Einschreiben verpasst? Für ein nachträgliches Eintragen mit dem Admin verständigen (<a href=\"mailto:cwsvjudo@arcor.de?Subject=".rawurlencode("Meldefrist ".mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1'))."\" target=\"_top\">Email an cwsvjudo@arcor.de</a>).</p>" );
|
||||
echo( "<p>Frist für das Einschreiben verpasst? Für ein nachträgliches Eintragen mit dem Admin verständigen (<a href=\"mailto:cwsvjudo@arcor.de?Subject=".rawurlencode("Meldefrist ".$eventData['Veranstaltung'])."\" target=\"_top\">Email an cwsvjudo@arcor.de</a>).</p>" );
|
||||
}
|
||||
}
|
||||
else{
|
||||
@@ -232,13 +258,6 @@
|
||||
}
|
||||
}
|
||||
if($mysqli) $mysqli->close();
|
||||
?>
|
||||
<!--Beginn der Einbindung des Counters-->
|
||||
<?php
|
||||
$chCounter_page_title = "Wettkampfplaner -- Eventansicht -- ".mb_convert_encoding($eventData['Veranstaltung'], 'UTF-8', 'ISO-8859-1');
|
||||
$chCounter_page_url = $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
|
||||
$chCounter_visible =0 ;
|
||||
// include( $_SERVER['DOCUMENT_ROOT'].'/expCounter/counter.php');
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user