Merge pull request #6 from iridos/main

Merge pull request #5 from iridos/develop
This commit is contained in:
Florian Pesth 2024-01-14 11:23:10 +01:00 committed by GitHub
commit 708e79daff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 284 additions and 321 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
*.pdf bengelsystem_konfiguration.php

View File

@ -0,0 +1,29 @@
<?php
define('MYSQL_HOST', 'localhost');
define('MYSQL_BENUTZER', 'bengel'); // database user name
define('MYSQL_KENNWORT', '');
define('MYSQL_DATENBANK', 'bengelsystem');
define('LOGFILE', "/var/log/jonglierconvention/meinetollejonglierconvention.log");
define('EVENTNAME', "Meine tolle Jonglierconvention");
define('INFORMATIONS_URL', "https://meine-tolle-jonglierconvention.de");
define('SECRET_KEY', "irgendwasZufaelliges"); // emails, see below
define('SECRET_VERIFICATION', "irgendwasanderes,egalwas"); // emails, see below
define('URLPREFIX', "https://https://meine-tolle-jonglierconvention.de/Bengelsystem/"); // our servername
define('TAGE_DAUER', 4);
date_default_timezone_set('Europe/Berlin');
setlocale(LC_TIME, "de_DE.UTF-8");
$start_date = new DateTimeImmutable("2023-05-18");
// Geheimer Schlüssel für die Verschlüsselung von Tokens
// das ist das Passwort, mit dem sich aus den Tokens auch wieder der Username/Email extrahieren lässt
$secret_key = SECRET_KEY;
// Geheimes Wort, das an die Email angehaengt wird, um zu ueberpruefen, dass die Addresse nicht abgeschnitten ist
// das Wort darf kein "|" enthalten, das wird als Trenner verwendet
$secret_verification = SECRET_VERIFICATION;
// urlprefix: https Addresse des php Scripts, das die Tokens empfaengt und einen Account anlegt
$urlprefix = URLPREFIX;
?>

View File

@ -15,7 +15,7 @@ if ($AdminStatus != 1) {
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Admin Drop am See</title> <title>Admin <?php echo EVENTNAME ?></title>
<link rel="stylesheet" href="css/style_common.css"/> <link rel="stylesheet" href="css/style_common.css"/>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
@ -57,7 +57,7 @@ while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
<button name="BackHelferdaten" value="1" onclick="window.location.href = 'index.php';"> <button name="BackHelferdaten" value="1" onclick="window.location.href = 'index.php';">
<b>&larrhk;</b> <b>&larrhk;</b>
</button> &nbsp; </button> &nbsp;
<b>Admin HelferDB</b> <b>Admin HelferDB <?php echo EVENTNAME; ?></b>
</th> </th>
<tr> <tr>
@ -81,7 +81,7 @@ while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
<td> <td>
<a class="fallbacklink" href='AdminHelferUebersicht.php'> <a class="fallbacklink" href='AdminHelferUebersicht.php'>
<img src="Bilder/PfeilRechts.jpeg" style="width:30px;height:30px;"> <img src="Bilder/PfeilRechts.jpeg" style="width:30px;height:30px;">
<b>Helfer als Admin &auml;ndern</b> <b>Helferübersicht und als Admin &auml;ndern</b>
</a> </a>
</td> </td>
</tr> </tr>

View File

@ -15,8 +15,7 @@ if ($AdminStatus != 1) {
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Helfer Drop am See Alle Schichten</title> <title>Helfer <?php echo EVENTNAME ?> Alle Schichten</title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
<meta name="viewport" content="width=480" /> <meta name="viewport" content="width=480" />
@ -27,7 +26,8 @@ if ($AdminStatus != 1) {
</script> </script>
</head> </head>
<body> <body>
<button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> <button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button>
<?php echo "<b>" . EVENTNAME . "</b>"; ?>
<div style="width: 100%;"> <div style="width: 100%;">
<?php <?php

View File

@ -15,7 +15,7 @@ if ($AdminStatus != 1) {
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Admin Drop am See</title> <title>Admin <?php echo EVENTNAME ?></title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
@ -126,7 +126,7 @@ if (isset($_POST['DienstSearch'])) {
?> ?>
<button class=back name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> <button class=back name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button>
<form method="post"> <form method="post">
<table border="0" id='customers'> <table border="0" class='commontable'>
<tr><th> Dienst</th><th><select name="DienstSearch" id="DienstSearch" onchange="submit()"> <tr><th> Dienst</th><th><select name="DienstSearch" id="DienstSearch" onchange="submit()">
<?php <?php
@ -168,25 +168,25 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
<table border="0" id="customers"> <table border="0" class="commontable">
<tr> <tr>
<td style="border: 0px solid black;">Was</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Was</td></tr><tr><td style="border: 0px solid black;">
<input name="Dienst-Was" type="text" value="<?php echo htmlspecialchars($Was ?? '')?>"> <input name="Dienst-Was" type="text" value="<?php echo htmlspecialchars($Was ?? '')?>">
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="border: 0px solid black;">Wo</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Wo</td></tr><tr><td style="border: 0px solid black;">
<input name="Dienst-Wo" type="text " value="<?php echo htmlspecialchars($Wo ?? '')?>"> <input name="Dienst-Wo" type="text " value="<?php echo htmlspecialchars($Wo ?? '')?>">
</td> </td>
</tr> </tr>
</tr> </tr>
<td style="border: 0px solid black;">Info</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Info</td></tr><tr><td style="border: 0px solid black;">
<input name="Dienst-Info" type="text" value="<?php echo htmlspecialchars($Info ?? '')?>" > <input name="Dienst-Info" type="text" value="<?php echo htmlspecialchars($Info ?? '')?>" >
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="border: 0px solid black;">Leiter</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Leiter</td></tr><tr><td style="border: 0px solid black;">
<!-- <input name="Dienst-Leiter" type="text" value="<?php echo htmlspecialchars($Leiter ?? '')?>" > --> <!-- <input name="Dienst-Leiter" type="text" value="<?php echo htmlspecialchars($Leiter ?? '')?>" > -->
<?php <?php
echo "<select name='Dienst-Leiter'>"; echo "<select name='Dienst-Leiter'>";
@ -200,10 +200,10 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
} }
echo "</select>"; echo "</select>";
?> ?>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="border: 0px solid black;">Gruppe</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Gruppe</td></tr><tr><td style="border: 0px solid black;">
<?php <?php
//echo "#####".$Gruppe."#####"; //echo "#####".$Gruppe."#####";
@ -219,7 +219,7 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
echo "</select>"; echo "</select>";
?> ?>
</td> </td>
</td> </td>
</tr> </tr>
<tr><td style="border: 0px solid black;">HelferLevel</td></tr> <tr><td style="border: 0px solid black;">HelferLevel</td></tr>
<tr><td style="border: 0px solid black;"> <tr><td style="border: 0px solid black;">
@ -243,7 +243,7 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
<form method="post"> <form method="post">
<table border="0" id='customers'"> <table border="0" class='commontable'">
<tr><th>Schicht</th><th><select name="SchichtSearch" id="SchichtSearch" onchange="submit()"> <tr><th>Schicht</th><th><select name="SchichtSearch" id="SchichtSearch" onchange="submit()">
@ -277,19 +277,19 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
<!-- <table border="0" style="border: 0px solid black;"> --> <!-- <table border="0" style="border: 0px solid black;"> -->
<table border="0" id='customers'"> <table border="0" class='commontable'">
<tr> <tr>
<td style="border: 0px solid black;">Von</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Von</td></tr><tr><td style="border: 0px solid black;">
<input name="Schicht-Von" type="datetime-local" value="<?php echo htmlspecialchars($Von ?? '')?>" required> <input name="Schicht-Von" type="datetime-local" value="<?php echo htmlspecialchars($Von ?? '')?>" required>
</td> </td>
<tr> <tr>
</tr> </tr>
<td style="border: 0px solid black;">Bis</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Bis</td></tr><tr><td style="border: 0px solid black;">
<input name="Schicht-Bis" type="datetime-local" value="<?php echo htmlspecialchars($Bis ?? '')?>" required> <input name="Schicht-Bis" type="datetime-local" value="<?php echo htmlspecialchars($Bis ?? '')?>" required>
</td> </td>
<tr> <tr>
</tr> </tr>
<td style="border: 0px solid black;">Soll</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Soll</td></tr><tr><td style="border: 0px solid black;">
<input name="Schicht-Soll" type="number" min=1 value="<?php echo htmlspecialchars((int)$Soll ?? '')?>" required> <input name="Schicht-Soll" type="number" min=1 value="<?php echo htmlspecialchars((int)$Soll ?? '')?>" required>
</td> </td>
<tr> <tr>

View File

@ -15,7 +15,7 @@ if ($AdminStatus != 1) {
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Admin Drop am See</title> <title>Admin <?php echo EVENTNAME ?></title>
<link rel="stylesheet" href="css/style_common.css"/> <link rel="stylesheet" href="css/style_common.css"/>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
@ -68,7 +68,7 @@ if (isset($_POST['DienstSearch'])) {
echo "<br><br><table class='commontable' style='page-break-before:always'>"; echo "<br><br><table class='commontable' style='page-break-before:always'>";
?> ?>
<tr class="header"> <tr class="header">
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> &nbsp; <b>&Uuml;bersicht Helfer und Ihre Schichten</b></th> <th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> &nbsp; <b>&Uuml;bersicht Helfer und Ihre Schichten (Helfer ohne Schichten werden momentan noch nicht angezeigt)</b></th>
</tr> </tr>
</table> </table>
<table class="commontable collapsible"> <table class="commontable collapsible">
@ -76,38 +76,45 @@ echo "<br><br><table class='commontable' style='page-break-before:always'>";
$db_erg = AlleHelferSchichtenUebersicht($db_link); $db_erg = AlleHelferSchichtenUebersicht($db_link);
$dauer = 0; $dauer = 0;
$i = 0; $i = 0;
$OldHelferName = ""; $OldAliasHelferID = "-1";
$EinzelDienstStunden = ""; $EinzelDienstStundenZeile = ""; // Tabellenzeile mit EinzelDienstStunden
$HelferUeberschrift = ""; $HelferUeberschrift = "";
// Function to output helper information
function outputHelperInformation($HelferUeberschrift, $OldAliasHelferID, $dauer, $EinzelDienstStundenZeile)
{
echo "$HelferUeberschrift </th><th> <img style='vertical-align:middle;width:30px;height:30px;' src='Bilder/PfeilRechts.jpeg'> $dauer Stunden</th>";
echo "<th ><div style='display:table'><form style='display:table-cell' action='AdminAlleSchichten.php' method='post'>";
echo "<button width='120px' name='AliasHelferID' value='" . $OldAliasHelferID . "'>+</button></form>\n";
echo "&nbsp;&nbsp;";
echo "<form style='display:table-cell' action='AdminMeineSchichten.php' method='post'>";
echo "<button width='120px' name='AliasHelferID' value='" . $OldAliasHelferID . "'>&ndash;</button></form>";
echo "</div></th>";
echo "$EinzelDienstStundenZeile</td></tr>\n ";
}
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) { while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
$HelferName = $zeile["Name"]; $HelferName = $zeile["Name"];
$AliasHelferID = $zeile["AliasHelferID"]; $AliasHelferID = $zeile["AliasHelferID"];
//echo $HelferName." ".$AliasHelferID."<br>"; if ($AliasHelferID != $OldAliasHelferID) {
if ($HelferName != $OldHelferName) { if ($EinzelDienstStundenZeile != "") {
if ($EinzelDienstStunden != "") { outputHelperInformation($HelferUeberschrift, $OldAliasHelferID, $dauer, $EinzelDienstStundenZeile);
// Neue Ueberschrift mit Helfernamen + Stunden
echo "$HelferUeberschrift </th><th> <img style='vertical-align:middle;width:30px;height:30px;' src='Bilder/PfeilRechts.jpeg'> $dauer Stunden</th>";
echo "<th ><div style='display:table'><form style='display:table-cell' action='AdminAlleSchichten.php' method='post'>";
echo "<button width='120px' name='AliasHelferID' value='" . $OldAliasHelferID . "'>+</button></form>\n";
echo "&nbsp;&nbsp;";
echo "<form style='display:table-cell' action='AdminMeineSchichten.php' method='post'>";
echo "<button width='120px' name='AliasHelferID' value='" . $OldAliasHelferID . "'>&ndash;</button></form>";
echo "</div></th>";
$dauer = 0;
echo "$EinzelDienstStunden</td></tr>\n ";
} }
$EinzelDienstStunden = ""; $dauer = 0;
$EinzelDienstStundenZeile = "";
$HelferUeberschrift = " <tr class='header'> <th width='15%'> <form id='form_" . $AliasHelferID . "' method='post' action='AdminUserdaten.php'><input type='hidden' name='AliasHelferID' value='" . $AliasHelferID . "'/><div onclick=\"document.getElementById('form_" . $AliasHelferID . "').submit();\"/><img style='vertical-align:middle;width:30px;height:30px;' src='Bilder/PfeilRechts.jpeg'> " . $HelferName . "</div></form>"; $HelferUeberschrift = " <tr class='header'> <th width='15%'> <form id='form_" . $AliasHelferID . "' method='post' action='AdminUserdaten.php'><input type='hidden' name='AliasHelferID' value='" . $AliasHelferID . "'/><div onclick=\"document.getElementById('form_" . $AliasHelferID . "').submit();\"/><img style='vertical-align:middle;width:30px;height:30px;' src='Bilder/PfeilRechts.jpeg'> " . $HelferName . "</div></form>";
$OldHelferName = $HelferName; $OldHelferName = $HelferName;
$OldAliasHelferID = $AliasHelferID; $OldAliasHelferID = $AliasHelferID;
$i += 1; $i += 1;
} }
$EinzelDienstStunden .= "<tr><td style='width:100px'> " . (int)$zeile["Dauer"] . "</td><td>"; $EinzelDienstStundenZeile .= "<tr><td style='width:100px'> " . (int)$zeile["Dauer"] . "</td><td>";
$EinzelDienstStunden .= $zeile["Was"]; $EinzelDienstStundenZeile .= $zeile["Was"];
$EinzelDienstStunden .= "</td></tr>"; $EinzelDienstStundenZeile .= "</td></tr>";
$dauer = $dauer + (int)$zeile["Dauer"]; $dauer = $dauer + (int)$zeile["Dauer"];
} }
echo "$EinzelDienstStunden"; if ($EinzelDienstStundenZeile != "") {
outputHelperInformation($HelferUeberschrift, $OldAliasHelferID, $dauer, $EinzelDienstStundenZeile);
}
echo "</table>"; echo "</table>";

View File

@ -15,7 +15,7 @@ if ($AdminStatus != 1) {
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Admin Drop am See - Schichten editieren</title> <title>Admin <?php echo EVENTNAME ?> - Schichten editieren</title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
@ -23,7 +23,9 @@ if ($AdminStatus != 1) {
<meta name="viewport" content="width=480" /> <meta name="viewport" content="width=480" />
</head> </head>
<body> <body>
<div><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> <h4 style="display: inline;">Admin: Schichten editieren</h4> <div><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> <h4 style="display: inline;">Admin: Schichten editieren -
<?php echo "<b>" . EVENTNAME . "</b>"; ?>
</h4>
<div style="width: 100%;"> <div style="width: 100%;">
<?php <?php
@ -212,7 +214,7 @@ if (! $db_erg) {
$iSQLCount = mysqli_num_rows($db_erg); $iSQLCount = mysqli_num_rows($db_erg);
//$iSQLCount = 3; //$iSQLCount = 3;
echo '<table id="customers">'; echo '<table class="commontable">';
echo "<thead>"; echo "<thead>";
echo "<tr>"; echo "<tr>";
@ -243,7 +245,7 @@ echo "<br><br>";
$iAlleSchichtenCount = AlleSchichtenCount($db_link); $iAlleSchichtenCount = AlleSchichtenCount($db_link);
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link); $iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
echo '<table id="customers" onclick="window.location.href=\'AdminAlleSchichten.php\'">'; echo '<table class="commontable" onclick="window.location.href=\'AdminAlleSchichten.php\'">';
echo "<tr>"; echo "<tr>";
echo "<th>" . "Alle Schichten der Con (" . $iBelegteSchichtenCount . "/" . $iAlleSchichtenCount . ")</th>"; echo "<th>" . "Alle Schichten der Con (" . $iBelegteSchichtenCount . "/" . $iAlleSchichtenCount . ")</th>";
echo "</tr>"; echo "</tr>";

View File

@ -39,16 +39,14 @@ HelferAuswahlButton($db_link, $AliasHelferID);
$_SESSION["AliasHelferID"] = $AliasHelferID; $_SESSION["AliasHelferID"] = $AliasHelferID;
$AdminID = $_SESSION["AdminID"]; $AdminID = $_SESSION["AdminID"];
echo "Admin=$AdminID<br>"; //debug output: echo "Admin=$AdminID<br>"; echo "Helfer=$HelferID<br>"; echo "Alias=$AliasHelferID<br>";
echo "Helfer=$HelferID<br>";
echo "Alias=$AliasHelferID<br>";
?> ?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Drop am See Helferdaten ändern</title> <title><?php echo EVENTNAME ?> Helferdaten ändern</title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
@ -126,10 +124,10 @@ while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
<table id="customers"> <table class="commontable">
<tr> <tr>
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> Helferdaten</th> <th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> Helferdaten</th>
</tr> <?php echo "<b>" . EVENTNAME . "</b>"; ?>
<form method="post"> <form method="post">
<tr> <tr>
<td>Name</td></tr><tr><td> <td>Name</td></tr><tr><td>
@ -159,7 +157,7 @@ while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
</table> </table>
<table id="customers"> <table class="commontable">
<col style="width:20px"> <col style="width:20px">
<tr> <tr>
<td><input type="checkbox" name="IsAdmin" value=1 align="right" <?php if ($HelferIsAdmin == 1) { <td><input type="checkbox" name="IsAdmin" value=1 align="right" <?php if ($HelferIsAdmin == 1) {

View File

@ -1,8 +1,15 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Helfer Drop am See Alle Schichten</title> <title>Helfer <?php echo EVENTNAME ?> Alle Schichten</title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
<meta name="viewport" content="width=480" /> <meta name="viewport" content="width=480" />
@ -14,27 +21,12 @@
</head> </head>
<body> <body>
<button name="BackHelferdaten" value="1" onclick="window.location.href = 'index.php';"><b>&larrhk;</b></button> <button name="BackHelferdaten" value="1" onclick="window.location.href = 'index.php';"><b>&larrhk;</b></button>
<?php echo "<b>" . EVENTNAME . "</b>"; ?>
<h1> Alle Schichten / Schichten hinzuf&uuml;gen </h1> <h1> Alle Schichten / Schichten hinzuf&uuml;gen </h1>
<div style="width: 100%;"> <div style="width: 100%;">
<?php <?php
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = mysqli_connect(
MYSQL_HOST,
MYSQL_BENUTZER,
MYSQL_KENNWORT,
MYSQL_DATENBANK
);
require '_login.php';
/// Detailinformation zu ausgewaehlten Schicht Holen /// Detailinformation zu ausgewaehlten Schicht Holen
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
if (isset($_POST['CloseInfo'])) { if (isset($_POST['CloseInfo'])) {

View File

@ -1,7 +1,16 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Admin Drop am See</title> <title>Admin <?php echo EVENTNAME ?></title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
@ -14,36 +23,15 @@
<div style="width: 100%;"> <div style="width: 100%;">
<?php <table class="commontable" >
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = mysqli_connect(
MYSQL_HOST,
MYSQL_BENUTZER,
MYSQL_KENNWORT,
MYSQL_DATENBANK
);
DatenbankAufDeutsch($db_link);
require '_login.php';
?>
<table id="customers" >
<tr> <tr>
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> &nbsp; <b>Übersicht Dienst DAS 2023</b></th> <th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> &nbsp; <b>Übersicht Dienst DAS 2023</b></th>
</tr> </tr>
</table> </table>
<?php <?php
echo '<table id="customers" >'; echo '<table class="commontable" >';
$db_erg = GetDiensteChilds($db_link, 0); $db_erg = GetDiensteChilds($db_link, 0);
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) { while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
@ -67,7 +55,7 @@ echo "</table>";
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00"); $db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00");
$OldWas = ""; $OldWas = "";
echo "<br><br><table id='customers' style='page-break-before:always'>"; echo "<br><br><table class='commontable' style='page-break-before:always'>";
?> ?>
<tr> <tr>
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> &nbsp; <b>Übersicht Schichten der Dienste DAS 2023</b></th> <th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> &nbsp; <b>Übersicht Schichten der Dienste DAS 2023</b></th>
@ -78,8 +66,8 @@ while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
if ($Was != $OldWas) { if ($Was != $OldWas) {
echo "</table>"; echo "</table>";
//echo '<table id="customers" style="page-break-before:always">'; //echo '<table class="commontable" style="page-break-before:always">';
echo '<table id="customers">'; echo '<table class="commontable">';
echo "<tr><th colspan=3>"; echo "<tr><th colspan=3>";
echo $Was; echo $Was;
echo "</th></tr>"; echo "</th></tr>";
@ -106,7 +94,7 @@ echo "</table>";
$OldHelferName = ""; $OldHelferName = "";
echo "<br><br><table id='customers' style='page-break-before:always'>"; echo "<br><br><table class='commontable' style='page-break-before:always'>";
?> ?>
<tr> <tr>
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> &nbsp; <b>Übersicht Helfer und Ihre Schichten DAS 2023</b></th> <th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>&larrhk;</b></button> &nbsp; <b>Übersicht Helfer und Ihre Schichten DAS 2023</b></th>
@ -118,8 +106,8 @@ while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
if ($HelferName != $OldHelferName) { if ($HelferName != $OldHelferName) {
echo "</table>"; echo "</table>";
//echo '<table id="customers" style="page-break-before:always">'; //echo '<table class="commontable" style="page-break-before:always">';
echo '<table id="customers">'; echo '<table class="commontable">';
echo "<tr><th colspan=3>"; echo "<tr><th colspan=3>";
echo $HelferName; echo $HelferName;
echo "</th></tr>"; echo "</th></tr>";

View File

@ -15,7 +15,7 @@ if ($AdminStatus != 1) {
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Admin Drop am See</title> <title>Admin <?php echo EVENTNAME ?></title>
<link rel="stylesheet" href="css/style_common.css"/> <link rel="stylesheet" href="css/style_common.css"/>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
@ -28,8 +28,6 @@ if ($AdminStatus != 1) {
<?php <?php
DatenbankAufDeutsch($db_link);
$AliasHelferID = 0; $AliasHelferID = 0;
if (isset($_SESSION["AliasHelferID"])) { if (isset($_SESSION["AliasHelferID"])) {

View File

@ -1,3 +1,12 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
@ -12,18 +21,6 @@
<body> <body>
<?php <?php
SESSION_START();
//$HelferID = $_SESSION["HelferId"];
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = mysqli_connect(
MYSQL_HOST,
MYSQL_BENUTZER,
MYSQL_KENNWORT,
MYSQL_DATENBANK
);
if (isset($_POST['sent'])) { if (isset($_POST['sent'])) {
$messages = []; $messages = [];
@ -101,7 +98,7 @@ if (isset($_POST['sent'])) {
<p>Hier k&ouml;nnen Sie sich selbst einen Account als Helfer anlegen.</p> <p>Hier k&ouml;nnen Sie sich selbst einen Account als Helfer anlegen.</p>
<form method="post"> <form method="post">
<table id="customers"> <table class="commontable">
<tr> <tr>
<th>Helferdaten</th> <th>Helferdaten</th>
</tr> </tr>

View File

@ -1,10 +1,15 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
?>
<!doctype html> <!doctype html>
<html> <html>
<head></head> <head></head>
<body> <body>
<?php <?php
require_once 'konfiguration.php';
if (isset($_GET['token'])) { if (isset($_GET['token'])) {
// E-Mail-Adresse des Nutzers // E-Mail-Adresse des Nutzers

View File

@ -1,7 +1,16 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Helfer Drop am See</title> <title>Helfer <?php echo EVENTNAME ?></title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
@ -9,35 +18,9 @@
<meta name="viewport" content="width=480" /> <meta name="viewport" content="width=480" />
</head> </head>
<body> <body>
<?php
//<button name="BackHelferdaten" value="1" onclick="window.location.href = 'index.php';"><b>&larrhk;</b></button><br>
?>
<div style="width: 100%;"> <div style="width: 100%;">
<?php <?php
SESSION_START();
require_once('konfiguration.php');
//require_once ('SQL.php');
include 'SQL.php';
$db_link = mysqli_connect(
MYSQL_HOST,
MYSQL_BENUTZER,
MYSQL_KENNWORT,
MYSQL_DATENBANK
);
/// Detailinformation zu ausgewaehlten Schicht Holen /// Detailinformation zu ausgewaehlten Schicht Holen
////////////////////////////////////////////////////////
if (isset($_GET['InfoAlleSchichtID'])) { if (isset($_GET['InfoAlleSchichtID'])) {
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID']; $InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
@ -122,7 +105,7 @@ $_SESSION["HelferID"] = $HelferID;
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
echo '<table id="customers">'; echo '<table class="commontable">';

View File

@ -47,7 +47,7 @@ if (isset($_POST['helfer-status'])) {
// nicht sicher, wo so ein default-text herkommen sollte // nicht sicher, wo so ein default-text herkommen sollte
// oder ob es tatsächlich einen geben sollte // oder ob es tatsächlich einen geben sollte
$email_subject = "Drop am See beginnt bald!"; $email_subject = EVENTNAME . " beginnt bald!";
if (isset($_POST['email-subject'])) { if (isset($_POST['email-subject'])) {
$email_subject = $_POST['email-subject']; $email_subject = $_POST['email-subject'];
} }
@ -68,7 +68,7 @@ XXtokenXX
Du kannst dich auch später wieder über den Link einloggen und die Schicht ändern. Du kannst dich auch später wieder über den Link einloggen und die Schicht ändern.
Viele Grüße, Viele Grüße,
dein Drop am See Team dein " . EVENTNAME . " Team
"; ";
if (isset($_POST['email-text'])) { if (isset($_POST['email-text'])) {
@ -84,7 +84,7 @@ if (isset($_POST['sendmail'])) {
?> ?>
<!doctype html> <!doctype html>
<head> <head>
<title>Helfer Drop am See: Email Tokens generieren</title> <title>Helfer <?php echo EVENTNAME ?>: Email Tokens generieren</title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>

View File

@ -1,11 +1,16 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Helfer Drop am See Home</title> <title>Helfer <?php echo EVENTNAME ?> Home</title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
<meta http-equiv="Refresh" content="0; url=<?php require_once 'konfiguration.php'; <meta http-equiv="Refresh" content="0; url=<?php echo INFORMATIONS_URL;?>" />
echo INFORMATIONS_URL;?>" />
<meta name="viewport" content="width=480" /> <meta name="viewport" content="width=480" />
</head> </head>
<body> <body>

View File

@ -1,3 +1,13 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@ -38,7 +48,6 @@
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
} }
</style-->
</head> </head>
<body> <body>
@ -170,10 +179,10 @@ function colorize (e){ //KS
}; };
scheduler.config.all_timed = "short"; // night events arent multi-day - events under 24h are shown scheduler.config.all_timed = "short"; // night events arent multi-day - events under 24h are shown
scheduler.config.lightbox.sections=[ scheduler.config.lightbox.sections=[
{name:"description", height:130, map_to:"text", type:"textarea" , focus:true}, {name:"description", height:130, map_to:"text", type:"textarea" , focus:true},
{name:"Dienstbeschreibung", height:90, type:"textarea", map_to:"Info" }, {name:"Dienstbeschreibung", height:90, type:"textarea", map_to:"Info" },
{name:"Konakt", height:200, type:"textarea", map_to:"Kontakt" }, {name:"Konakt", height:200, type:"textarea", map_to:"Kontakt" },
{name:"time", height:72, type:"time", map_to:"auto"} {name:"time", height:72, type:"time", map_to:"auto"}
]; ];

View File

@ -1,35 +1,27 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Admin Drop am See</title> <title>Meine Schichten <?php echo EVENTNAME ?></title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
<meta name="viewport" content="width=480" /> <meta name="viewport" content="width=480" />
</head> </head>
<body> <body>
<button name="BackHelferdaten" value="1" onclick="window.location.href = 'index.php';"><b>&larrhk;</b></button> <button name="BackHelferdaten" value="1" onclick="window.location.href = 'index.php';"><b>&larrhk;</b></button>
<?php echo "<b>" . EVENTNAME . "</b>"; ?>
<div style="width: 100%;"> <div style="width: 100%;">
<?php <?php
SESSION_START();
require_once 'konfiguration.php';
//require_once ('SQL.php');
require 'SQL.php';
$db_link = mysqli_connect(
MYSQL_HOST,
MYSQL_BENUTZER,
MYSQL_KENNWORT,
MYSQL_DATENBANK
);
/// Detailinformation zu ausgewaehlten Schicht Holen /// Detailinformation zu ausgewaehlten Schicht Holen
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
if (isset($_POST['CloseInfo'])) { if (isset($_POST['CloseInfo'])) {
@ -271,13 +263,13 @@ if (! $db_erg) {
$iSQLCount = mysqli_num_rows($db_erg); $iSQLCount = mysqli_num_rows($db_erg);
//$iSQLCount = 3; //$iSQLCount = 3;
echo '<table id="customers">'; echo '<table class="commontable">';
echo "<thead>"; echo "<thead>";
echo "<tr>"; echo "<tr>";
echo "<th colspan=4>" . "Meine Schichten (" . $iSQLCount . " Schichten)</th>"; echo "<th colspan=4>" . "Meine Schichten (" . $iSQLCount . " Schichten) - " . EVENTNAME . "</th>";
echo "</tr><tr>"; echo "</tr><tr>";
echo "<th></th>"; echo "<th>Dienst</th>";
echo "<th style='width:180px'>" . "Von" . "</th>"; echo "<th style='width:180px'>" . "Von" . "</th>";
echo "<th style='width:180px'>" . "Bis" . "</th>"; echo "<th style='width:180px'>" . "Bis" . "</th>";
echo "<th style='width:90px'>" . "Del" . "</th>"; echo "<th style='width:90px'>" . "Del" . "</th>";
@ -302,7 +294,7 @@ echo "<br><br>";
$iAlleSchichtenCount = AlleSchichtenCount($db_link); $iAlleSchichtenCount = AlleSchichtenCount($db_link);
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link); $iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
echo '<table id="customers" onclick="window.location.href=\'AlleSchichten.php\'">'; echo '<table class="commontable" onclick="window.location.href=\'AlleSchichten.php\'">';
echo "<tr>"; echo "<tr>";
echo "<th>" . '<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">' . " Alle Schichten der Con (" . $iBelegteSchichtenCount . "/" . $iAlleSchichtenCount . ")</th>"; echo "<th>" . '<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">' . " Alle Schichten der Con (" . $iBelegteSchichtenCount . "/" . $iAlleSchichtenCount . ")</th>";
echo "</tr>"; echo "</tr>";

View File

@ -1,3 +1,12 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
@ -7,21 +16,14 @@
<!--meta name="viewport" content="width=480" /--> <!--meta name="viewport" content="width=480" /-->
<?php <?php
require_once 'konfiguration.php';
SESSION_START();
// if we are not logged in, we redirect in the header back to the main page
if (!isset($_SESSION["HelferID"]) || ! $_SESSION["HelferID"] > 0) {
echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />
';
}
// print top of page if we are logged in and not redirecting // print top of page if we are logged in and not redirecting
echo " </head> \n <body> \n"; echo " </head> \n <body> \n";
echo '<button name="BackHelferdaten" value="1" onclick="window.location.href = \'index.php\';"><b>&larrhk;</b></button><br>' . "\n"; echo '<button name="BackHelferdaten" value="1" onclick="window.location.href = \'index.php\';"><b>&larrhk;</b></button>' . "\n";
echo "<b>" . EVENTNAME . "</b><br>";
echo '<H1> Helferdaten - Log </H1>'; echo '<H1> Helferdaten - Log </H1>';
echo '<p>Hier werden alle Aktionen, die einen Helfer betreffen aufgelistet</p>'; echo '<p>Hier werden alle Aktionen, die einen Helfer betreffen aufgelistet</p>';
echo '<table id="customers">' . "\n"; echo '<table class="commontable">' . "\n";
//check for admin status //check for admin status
$HelferID = $_SESSION["HelferID"]; $HelferID = $_SESSION["HelferID"];

View File

@ -1,4 +1,3 @@
<?php <?php
require_once 'konfiguration.php'; require_once 'konfiguration.php';
@ -11,6 +10,7 @@ function ConnectDB()
MYSQL_KENNWORT, MYSQL_KENNWORT,
MYSQL_DATENBANK MYSQL_DATENBANK
); );
DatenbankAufDeutsch($db_link);
return $db_link; return $db_link;
} }
@ -328,7 +328,8 @@ function AlleSchichtenEinesHelfersVonJetzt($db_link, $HelferID)
$HelferID = mysqli_real_escape_string($db_link, $HelferID); $HelferID = mysqli_real_escape_string($db_link, $HelferID);
// TODO: fix GETDATE() array to string conversion // TODO: fix GETDATE() array to string conversion
$sql = "select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=" . $HelferID . " and Bis>'" . GETDATE() . "' order by Von"; $sql = "select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=" . $HelferID . " and Bis>'" . date("Y-m-d H:i:s") . "' order by Von";
//$sql = "select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=".$HelferID." and Bis>'2023-05-20' order by Von"; //$sql = "select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=".$HelferID." and Bis>'2023-05-20' order by Von";
@ -725,6 +726,8 @@ function DeleteSchicht($db_link, $SchichtID, $Rekursiv)
function AlleHelferSchichtenUebersicht($db_link) function AlleHelferSchichtenUebersicht($db_link)
{ {
$sql = "select Helfer.HelferID as AliasHelferID,Name,Email,Handy,Was,SUM(Dauer)/10000 as Dauer from Helfer,EinzelSchicht INNER JOIN Schicht INNER JOIN Dienst where Helfer.HelferID=EinzelSchicht.HelferID and EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID=Dienst.DienstID group by Helfer.HelferID,Was"; $sql = "select Helfer.HelferID as AliasHelferID,Name,Email,Handy,Was,SUM(Dauer)/10000 as Dauer from Helfer,EinzelSchicht INNER JOIN Schicht INNER JOIN Dienst where Helfer.HelferID=EinzelSchicht.HelferID and EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID=Dienst.DienstID group by Helfer.HelferID,Was";
$sql = $sql . " UNION ALL ";
$sql = $sql . "select Helfer.HelferID as AliasHelferID,Name,Email,Handy,'-' as Was,0 as Dauer from Helfer,EinzelSchicht where not exists(select 1 from EinzelSchicht where Helfer.HelferID=EinzelSchicht.HelferID)";
$db_erg = mysqli_query($db_link, $sql); $db_erg = mysqli_query($db_link, $sql);
if (! $db_erg) { if (! $db_erg) {
echo "AlleHelferSchichtenUebersicht ungueltige Abfrage"; echo "AlleHelferSchichtenUebersicht ungueltige Abfrage";

View File

@ -1,3 +1,17 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
if ($AdminStatus != 1) {
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
exit;
}
?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
@ -12,19 +26,6 @@
<!--h1> Alle Schichten Ausdruck</h1--> <!--h1> Alle Schichten Ausdruck</h1-->
<div style="width: 100%;"> <div style="width: 100%;">
<?php <?php
SESSION_START();
require_once('konfiguration.php');
include 'SQL.php';
$db_link = mysqli_connect(
MYSQL_HOST,
MYSQL_BENUTZER,
MYSQL_KENNWORT,
MYSQL_DATENBANK
);
include '_login.php';
/// Detailinformation zu ausgewaehlten Schicht Holen /// Detailinformation zu ausgewaehlten Schicht Holen
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////

View File

@ -1,5 +1,5 @@
<?php <?php
SESSION_START(); SESSION_START();
require_once 'konfiguration.php'; require_once 'konfiguration.php';
@ -10,13 +10,8 @@ require '_crypt.php';
$head = "<!doctype html> $head = "<!doctype html>
<head></head> <body> "; <head></head> <body> ";
$foot = "</body></html>"; $foot = "</body></html>";
$db_link = ConnectDB();
$db_link = mysqli_connect(
MYSQL_HOST,
MYSQL_BENUTZER,
MYSQL_KENNWORT,
MYSQL_DATENBANK
);
// ist jetzt in _crypt.php, aber aus der anderen Datei, deshalb hier erst // ist jetzt in _crypt.php, aber aus der anderen Datei, deshalb hier erst
// nur auskommentiert // nur auskommentiert
// function Entschluessle($encrypted_data,$secret_verification,$secret_key){ // function Entschluessle($encrypted_data,$secret_verification,$secret_key){

View File

@ -1,7 +1,16 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
?>
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Drop am See Helferdaten ändern</title> <title><?php echo EVENTNAME ?> Helferdaten ändern</title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
@ -11,24 +20,10 @@
<?php <?php
SESSION_START();
$HelferID = $_SESSION["HelferID"]; $HelferID = $_SESSION["HelferID"];
$AdminID = $_SESSION["AdminID"]; $AdminID = $_SESSION["AdminID"];
require_once 'konfiguration.php';
//require_once ('SQL.php');
require 'SQL.php';
$db_link = mysqli_connect(
MYSQL_HOST,
MYSQL_BENUTZER,
MYSQL_KENNWORT,
MYSQL_DATENBANK
);
/// Helferdaten Aendern /// Helferdaten Aendern
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
@ -115,9 +110,9 @@ if (isset($_POST['login'])) {
<table id="customers"> <table class="commontable">
<tr> <tr>
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'index.php';"><b>&larrhk;</b></button> Helferdaten</th> <th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'index.php';"><b>&larrhk;</b></button> Helferdaten <?php echo EVENTNAME; ?></th>
</tr> </tr>
<form method="post"> <form method="post">
<tr> <tr>

View File

@ -1,4 +1,7 @@
<?php <?php
require_once 'konfiguration.php';
require_once 'SQL.php';
/// Logout /// Logout
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
if (isset($_GET['logout']) || isset($_POST['logout'])) { if (isset($_GET['logout']) || isset($_POST['logout'])) {
@ -39,6 +42,16 @@ if (isset($_POST['login'])) {
if (!isset($_SESSION["HelferID"])) { if (!isset($_SESSION["HelferID"])) {
?> ?>
<!doctype html>
<html lang=de>
<head>
<title>Helfer <?php echo EVENTNAME ?> Home</title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
<meta name="viewport" content="width=480" />
<meta charset="utf-8">
</head>
<body>
<form method="post" action="#Info"> <form method="post" action="#Info">
<fieldset> <fieldset>
@ -67,6 +80,8 @@ if (!isset($_SESSION["HelferID"])) {
</form> </form>
</body>
</html>
<?php <?php
exit; exit;
} }

View File

@ -1,7 +1,15 @@
<?php
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = ConnectDB();
require '_login.php';
?>
<!doctype html> <!doctype html>
<html lang=de> <html lang=de>
<head> <head>
<title>Helfer Drop am See Home</title> <title>Helfer <?php echo EVENTNAME ?> Home</title>
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/> <link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/> <link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
<script src=js/helferdb.js></script> <script src=js/helferdb.js></script>
@ -9,40 +17,11 @@
<meta charset="utf-8"> <meta charset="utf-8">
</head> </head>
<body> <body>
<?php
SESSION_START();
require_once 'konfiguration.php';
require 'SQL.php';
$db_link = mysqli_connect(
MYSQL_HOST,
MYSQL_BENUTZER,
MYSQL_KENNWORT,
MYSQL_DATENBANK
);
DatenbankAufDeutsch($db_link);
require '_login.php';
// wird von _login.php miterledigt
// TODO: hier wird HelferIsAdmin verwendet, woanders ist es AdminStatus
//$db_erg = Helferdaten($db_link,$HelferID);
//while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
//{
// $HelferName=$zeile['Name'];
// $HelferIsAdmin=$zeile['Admin'];
//}
?>
<div style="width: 100%;"> <div style="width: 100%;">
<table id="customers" > <table class="commontable" >
<tr onclick="window.location.href='Info.php';"> <tr onclick="window.location.href='Info.php';">
<th><img src="Bilder/Info.jpeg" style="width:30px;height:30px;"> &nbsp; <b>Drop am See 2023</b></th> <th><img src="Bilder/Info.jpeg" style="width:30px;height:30px;"> &nbsp; <b><?php echo EVENTNAME ?></b></th>
</tr> </tr>
<tr onclick="window.location.href='Userdaten.php';"> <tr onclick="window.location.href='Userdaten.php';">
<td > <img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"> <td > <img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;">
@ -55,11 +34,21 @@ if ($HelferIsAdmin) {
?> ?>
</b> </td> </b> </td>
</tr> </tr>
<?php
if ($HelferIsAdmin) {
?>
<tr onclick="window.location.href='Admin.php';">
<td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Admin Menü</b></td>
</tr>
<?php
}
?>
<tr onclick="window.location.href='MeineSchichten.php';"> <tr onclick="window.location.href='MeineSchichten.php';">
<td> <td>
<img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"> <b>Nächste Helferschichten:</b> <img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"> <b>Nächste Helferschichten:</b>
<ul style="display: block; list-style-type: none; margin-left: 20px;margin-top: 0px;margin-bottom: 0px"> <ul style="display: block; list-style-type: none; margin-left: 20px;margin-top: 0px;margin-bottom: 0px">
<?php <?php
//<li>Fr 08:00 Leitung Halle</li> //<li>Fr 08:00 Leitung Halle</li>
//<li>So 12:00 Abbau</li> //<li>So 12:00 Abbau</li>
@ -82,7 +71,7 @@ while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC) and $iCount < 3) {
?> ?>
</ul> </ul>
</td> </td>
</tr> </tr>
@ -91,31 +80,31 @@ while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC) and $iCount < 3) {
<tr onclick="window.location.href='Ereignisse.php';"> <tr onclick="window.location.href='Ereignisse.php';">
<td> <td>
<img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"> <b>Nächste Ereignisse:</b> <img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"> <b>Nächste Ereignisse:</b>
<ul style="display: block; list-style-type: none; margin-left: 20px;margin-top: 0px;margin-bottom: 0px"> <ul style="display: block; list-style-type: none; margin-left: 20px;margin-top: 0px;margin-bottom: 0px">
<li>Sa 20:00 Show im Milchwerk</li> <li>Sa 20:00 Show im Milchwerk</li>
<li>So 15:00 Gaukelgames</li> <li>So 15:00 Gaukelgames</li>
</ul> </ul>
</td> </td>
</tr> </tr>
<tr onclick="window.location.href='Workshop.php';"> <tr onclick="window.location.href='Workshop.php';">
<td> <td>
<img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"> <b>Nächste Workshops:</b> <img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"> <b>Nächste Workshops:</b>
<ul style="display: block; list-style-type: none; margin-left: 20px;margin-top: 0px;margin-bottom: 0px"> <ul style="display: block; list-style-type: none; margin-left: 20px;margin-top: 0px;margin-bottom: 0px">
<li>Sa 14:00 8 Bälle für Anfänger</li> <li>Sa 14:00 8 Bälle für Anfänger</li>
<li>Sa 15:00 Devilstick Hubschrauber beidseitig</li> <li>Sa 15:00 Devilstick Hubschrauber beidseitig</li>
</ul> </ul>
</td> </td>
</tr> </tr>
<tr onclick="window.location.href='Wichtig.php';"> <tr onclick="window.location.href='Wichtig.php';">
<td> <td>
<img src="Bilder/PfeilRunter.jpeg" style="width:30px;height:30px;"> <b>Wichtig:</b> <img src="Bilder/PfeilRunter.jpeg" style="width:30px;height:30px;"> <b>Wichtig:</b>
<ul style="display: block; list-style-type: none; margin-left: 20px;margin-top: 0px;margin-bottom: 0px"> <ul style="display: block; list-style-type: none; margin-left: 20px;margin-top: 0px;margin-bottom: 0px">
<li>Warnung vor Sturm ab 21 Uhr</li> <li>Warnung vor Sturm ab 21 Uhr</li>
</ul> </ul>
</td> </td>
</tr> </tr>
@ -133,23 +122,12 @@ while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC) and $iCount < 3) {
<td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Logs</b></td> <td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Logs</b></td>
</tr> </tr>
<?php
if ($HelferIsAdmin) {
?>
<tr onclick="window.location.href='Admin.php';">
<td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Admin</b></td>
</tr>
<?php
}
?>
</tr> </tr>
<tr onclick="window.location.href='index.php?logout=1';"> <tr onclick="window.location.href='index.php?logout=1';">
<td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Logout</b></td> <td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Logout</b></td>
</tr> </tr>
</table> </table>
</body> </body>

View File

@ -1 +0,0 @@
alert("jquery-3.7.1.min.js is missing from the js directory");

View File

@ -1,37 +1,7 @@
<?php <?php
// datenbank-defines extern // create the file below from the template:
require_once '/etc/helferdb_konfiguration.php'; require_once '../bengelsystem_konfiguration.php';
// die folgenden Zeilen ohne Kommentarzeichen nach /etc/helferdb_konfiguration.php
// kopieren und an die eigene Datenbank anpassen
// define( 'MYSQL_HOST', 'localhost' );
// define( 'MYSQL_BENUTZER', 'benutzername_der_datenbank' );
// define( 'MYSQL_KENNWORT', 'passwort_des_db_nutzers' );
// define( 'MYSQL_DATENBANK', 'name_der_datenbank' );
// define( 'LOGFILE', "/pfad/zu/einer/www-schreibbaren/datei");
// define( VERANSTALTUNGSNAME, "dubbelcon");
// define( INFORMATIONS_URL, "http://drop-am-see.de/Gelaende");
date_default_timezone_set('Europe/Berlin');
setlocale(LC_TIME, "de_DE.UTF-8");
$start_date = new DateTimeImmutable("2023-05-18");
define('TAGE_DAUER', 4);
// Geheimer Schlüssel für die Verschlüsselung von Tokens
// das ist das Passwort, mit dem sich aus den Tokens auch wieder der Username/Email extrahieren lässt
// $secret_key = "irgendwasZufaelliges";
// Geheimes Wort, das an die Email angehaengt wird, um zu ueberpruefen, dass die Addresse nicht abgeschnitten ist
// das Wort darf kein "|" enthalten, das wird als Trenner verwendet
// $secret_verification = "irgendwasanderes,istegalwas";
// urlprefix: https Addresse des php Scripts, das die Tokens empfaengt und einen Account anlegt
// volle URL, da sie u.a. per Email ersetzt wird
// $urlprefix="https://meinserver.de/2023dev/UrlLogin.php";
// muss nicht angepasst werden // no changes needed // muss nicht angepasst werden // no changes needed
// Zeitbereich: -1 davor, 0 kein Limit, 1-N Tag N der Con, 1000: nach der Con // Zeitbereich: -1 davor, 0 kein Limit, 1-N Tag N der Con, 1000: nach der Con