PSR12 code standard with code sniffer
This commit is contained in:
parent
58d6aead69
commit
4d9abda0ef
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
|
|
@ -31,28 +31,24 @@ DatenbankAufDeutsch($db_link);
|
|||
$AliasHelferID = 0;
|
||||
|
||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||
if(isset($_SESSION["AliasHelferID"]))
|
||||
{
|
||||
if (isset($_SESSION["AliasHelferID"])) {
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
}
|
||||
|
||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||
|
||||
if(isset($_POST["AliasHelfer"]))
|
||||
{
|
||||
if (isset($_POST["AliasHelfer"])) {
|
||||
$AliasHelferID = $_POST["AliasHelfer"];
|
||||
//echo "post<br>";
|
||||
}
|
||||
|
||||
if($AliasHelferID!=0)
|
||||
{
|
||||
if ($AliasHelferID != 0) {
|
||||
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||
}
|
||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
}
|
||||
|
|
@ -88,14 +84,10 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
<th><b>Helfer als Admin ändern:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;font-size:20" name="AliasHelfer" id="AliasHelfer" onchange="submit()">
|
||||
<?php
|
||||
$db_erg = HelferListe($db_link);
|
||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($AliasHelferID != $zeile['HelferID']) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
|
|
@ -33,15 +33,13 @@ if($AdminStatus != 1) {
|
|||
|
||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['CloseInfo']))
|
||||
{
|
||||
UNSET($InfoMeineSchichtID);
|
||||
UNSET($InfoAlleSchichtID);
|
||||
if (isset($_POST['CloseInfo'])) {
|
||||
unset($InfoMeineSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
}
|
||||
if(isset($_POST['InfoMeineSchichtID']))
|
||||
{
|
||||
if (isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
|
@ -53,14 +51,12 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
if (isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
|
@ -81,37 +77,28 @@ if(isset($_GET['InfoAlleSchichtID']))
|
|||
|
||||
$x = 0;
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$MitHelferID[$x] = $zeile['HelferID'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(isset($_GET['ZeitBereich']))
|
||||
{
|
||||
if (isset($_GET['ZeitBereich'])) {
|
||||
$ZeitBereich = $_GET['ZeitBereich'];
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$ZeitBereich = 1;
|
||||
}
|
||||
|
||||
function HelferAuswahlButton($db_link,$AliasHelferID){
|
||||
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||
{
|
||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
||||
$db_erg = HelferListe($db_link);
|
||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($AliasHelferID != $zeile['HelferID']) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
}
|
||||
|
|
@ -132,8 +119,7 @@ $_SESSION["AliasHelferID"]=$AliasHelferID;
|
|||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
}
|
||||
|
||||
|
|
@ -153,7 +139,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if (isset($_POST['plusschicht'])) {
|
||||
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['plusschicht'];
|
||||
|
||||
|
|
@ -164,8 +149,7 @@ if(isset($_POST['plusschicht'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $AliasHelferID, $SchichtId, $AdminID);
|
||||
|
||||
|
|
@ -174,19 +158,14 @@ if(isset($_POST['plusschicht'])) {
|
|||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (isset($_POST['minusschicht'])) {
|
||||
|
|
@ -195,25 +174,17 @@ if(isset($_POST['minusschicht'])) {
|
|||
|
||||
$SchichtID = $_POST['minusschicht'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// Helfer aus Schicht entfernen
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $AliasHelferID, $SchichtID, $AdminID);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -240,18 +211,15 @@ $dienstsort =$_SESSION["dienstsort"];
|
|||
|
||||
|
||||
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='1')
|
||||
{
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '1') {
|
||||
$addschicht = '1';
|
||||
$dienstsort = '1';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='2')
|
||||
{
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '2') {
|
||||
$addschicht = '2';
|
||||
$dienstsort = '2';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='0')
|
||||
{
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '0') {
|
||||
$addschicht = '0';
|
||||
}
|
||||
|
||||
|
|
@ -260,8 +228,7 @@ $_SESSION["dienstsort"] =$dienstsort;
|
|||
|
||||
//echo "<br>Detail=".$addschicht."<br>";
|
||||
|
||||
if($addschicht=='0')
|
||||
{
|
||||
if ($addschicht == '0') {
|
||||
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
||||
echo "<button name='addschicht' value='1'>Tage</button>";
|
||||
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
||||
|
|
@ -269,36 +236,28 @@ if($addschicht=='0')
|
|||
|
||||
//echo "InfoAlleSchichtID ".$InfoAlleSchichtID;
|
||||
|
||||
if($addschicht!='0')
|
||||
{
|
||||
if ($addschicht != '0') {
|
||||
//$db_erg = AlleSchichten($db_link,$dienstsort);
|
||||
//$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00");
|
||||
if ($ZeitBereich==1) // Alle
|
||||
{
|
||||
if ($ZeitBereich == 1) { // Alle
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==2) // Davor
|
||||
{
|
||||
if ($ZeitBereich == 2) { // Davor
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2023-05-18 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==3) // Do
|
||||
{
|
||||
if ($ZeitBereich == 3) { // Do
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-18 00:00:00", "2023-05-19 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==4) // Fr
|
||||
{
|
||||
if ($ZeitBereich == 4) { // Fr
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-19 00:00:00", "2023-05-20 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==5) // Sa
|
||||
{
|
||||
if ($ZeitBereich == 5) { // Sa
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-20 00:00:00", "2023-05-21 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==6) // So
|
||||
{
|
||||
if ($ZeitBereich == 6) { // So
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-21 00:00:00", "2023-05-22 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==7) // Danach
|
||||
{
|
||||
if ($ZeitBereich == 7) { // Danach
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-22 00:00:00", "2223-05-22 00:00:00", -1);
|
||||
}
|
||||
// fuer Anzahlanzeige in Ueberschrift
|
||||
|
|
@ -322,60 +281,39 @@ if($addschicht!='0')
|
|||
echo "<th>". "Von" . "</th>";
|
||||
}
|
||||
*/
|
||||
if ($ZeitBereich==1)
|
||||
{
|
||||
if ($ZeitBereich == 1) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>" . "Alle" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>" . "Alle" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==2)
|
||||
{
|
||||
if ($ZeitBereich == 2) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>" . "Davor" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>" . "Davor" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==3)
|
||||
{
|
||||
if ($ZeitBereich == 3) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>" . "Do" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>" . "Do" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==4)
|
||||
{
|
||||
if ($ZeitBereich == 4) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>" . "Fr" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>" . "Fr" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==5)
|
||||
{
|
||||
if ($ZeitBereich == 5) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>" . "Sa" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>" . "Sa" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==6)
|
||||
{
|
||||
if ($ZeitBereich == 6) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>" . "So" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>" . "So" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==7)
|
||||
{
|
||||
if ($ZeitBereich == 7) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>" . "Danach" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>" . "Danach" . "</th>";
|
||||
}
|
||||
//echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>". "Davor" . "</th>";
|
||||
|
|
@ -390,35 +328,27 @@ if($addschicht!='0')
|
|||
|
||||
$OldTag = "";
|
||||
$OldWas = "";
|
||||
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
// um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link, $AliasHelferID);
|
||||
//print_r($MeineDienste);
|
||||
|
||||
echo '</table>';
|
||||
echo '<table id="customers">';
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($dienstsort == '1') {
|
||||
$Tag = $zeile['Tag'];
|
||||
|
||||
if ($Tag!=$OldTag)
|
||||
{
|
||||
if ($Tag != $OldTag) {
|
||||
echo "<tr class='header'><th colspan='5' >";
|
||||
echo $Tag;
|
||||
echo "</th></tr>";
|
||||
$OldTag = $Tag;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$Was = $zeile['Was'];
|
||||
|
||||
if ($Was!=$OldWas)
|
||||
{
|
||||
if ($Was != $OldWas) {
|
||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||
echo $Was;
|
||||
echo "</th>";
|
||||
|
|
@ -433,18 +363,15 @@ if($addschicht!='0')
|
|||
}
|
||||
}
|
||||
$Color = "red";
|
||||
if ( $zeile['Ist'] > 0 )
|
||||
{
|
||||
if ($zeile['Ist'] > 0) {
|
||||
$Color = "yellow";
|
||||
}
|
||||
if ( $zeile['Ist'] >= $zeile['Soll'] )
|
||||
{
|
||||
if ($zeile['Ist'] >= $zeile['Soll']) {
|
||||
$Color = "green";
|
||||
}
|
||||
$Von = $zeile['Ab'];
|
||||
$Bis = $zeile['Bis'];
|
||||
if ( substr($Von,0,2) == substr($Bis,0,2))
|
||||
{
|
||||
if (substr($Von, 0, 2) == substr($Bis, 0, 2)) {
|
||||
$Bis = substr($Bis, 2);
|
||||
}
|
||||
$Von = substr($Von, 2);
|
||||
|
|
@ -461,28 +388,22 @@ if($addschicht!='0')
|
|||
|
||||
echo '<tr ' . $rowstyle . 'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID=' . $zeile['SchichtID'] . '#Info\';" >';
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
if ($dienstsort == '1') {
|
||||
echo "<td>" . $zeile['Was'] . "</td>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<td>" . $zeile['Tag'] . "</td>";
|
||||
}
|
||||
echo "<td>" . $Von . "</td>";
|
||||
echo "<td>" . $Bis . "</td>";
|
||||
echo "<td bgcolor='" . $Color . "'>" . $zeile['Ist'] . "/";
|
||||
echo "" . $zeile['Soll'] . "</td>";
|
||||
# buttons sind in der selben Zelle
|
||||
// buttons sind in der selben Zelle
|
||||
echo "<td width='30px'>" . "<button width='20px' name='plusschicht' value='" . $zeile['SchichtID'] . "'>+</button>" . "";
|
||||
echo "" . " <button width='120px' name='minusschicht' value='" . $zeile['SchichtID'] . "'>–</button> $regtext" . "</td>";
|
||||
//echo "<td>$regtext</td>";
|
||||
echo "</tr>\n";
|
||||
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
|
|
@ -36,8 +36,7 @@ $SchichtID =$_SESSION["SchichtID"];
|
|||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
if(isset($_POST['HelferID']))
|
||||
{
|
||||
if (isset($_POST['HelferID'])) {
|
||||
$HelferID = $_POST['HelferID'];
|
||||
}
|
||||
if (isset($_POST['ShowHelfer'])) {
|
||||
|
|
@ -49,7 +48,6 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
|
||||
|
||||
if (isset($_POST['ChangeDienst'])) {
|
||||
|
||||
$Was = $_POST['Dienst-Was'];
|
||||
$Wo = $_POST['Dienst-Wo'];
|
||||
$Info = $_POST['Dienst-Info'];
|
||||
|
|
@ -57,11 +55,9 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
$Gruppe = $_POST['Dienst-Gruppe'];
|
||||
$HelferLevel = $_POST['HelferLevel'];
|
||||
ChangeDienst($db_link, $DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel);
|
||||
|
||||
}
|
||||
|
||||
if (isset($_POST['NewDienst'])) {
|
||||
|
||||
$Was = $_POST['Dienst-Was'];
|
||||
$Wo = $_POST['Dienst-Wo'];
|
||||
$Info = $_POST['Dienst-Info'];
|
||||
|
|
@ -69,51 +65,38 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
$Gruppe = $_POST['Dienst-Gruppe'];
|
||||
$HelferLevel = $_POST['HelferLevel'];
|
||||
NewDienst($db_link, $DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel);
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_POST['DeleteDienst']))
|
||||
{
|
||||
|
||||
if (!DeleteDienst($db_link,$DienstID,false))
|
||||
{
|
||||
if (isset($_POST['DeleteDienst'])) {
|
||||
if (!DeleteDienst($db_link, $DienstID, false)) {
|
||||
echo "Erst Schichten des Dienstes Löschen!";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (isset($_POST['ChangeSchicht'])) {
|
||||
|
||||
$Von = $_POST['Schicht-Von'];
|
||||
$Bis = $_POST['Schicht-Bis'];
|
||||
$Soll = $_POST['Schicht-Soll'];
|
||||
|
||||
ChangeSchicht($db_link, $SchichtID, $Von, $Bis, $Soll);
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (isset($_POST['NewSchicht'])) {
|
||||
|
||||
$Von = $_POST['Schicht-Von'];
|
||||
$Bis = $_POST['Schicht-Bis'];
|
||||
$Soll = $_POST['Schicht-Soll'];
|
||||
|
||||
NewSchicht($db_link, $DienstID, $Von, $Bis, $Soll);
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (isset($_POST['DeleteSchicht'])) {
|
||||
|
||||
|
||||
if(!DeleteSchicht($db_link,$SchichtID,false))
|
||||
{
|
||||
if (!DeleteSchicht($db_link, $SchichtID, false)) {
|
||||
echo "Erst Helfer aus Schicht austragen<br>";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -157,16 +140,10 @@ $Leiter="";
|
|||
$Gruppe = "";
|
||||
$HelferLevel = "";
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
if ($zeile['DienstID']!=$DienstID)
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($zeile['DienstID'] != $DienstID) {
|
||||
echo "<option value='" . $zeile['DienstID'] . "'>" . $zeile['Was'] . "</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<option value='" . $zeile['DienstID'] . "' selected='selected'>" . $zeile['Was'] . "</option>";
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
|
|
@ -194,37 +171,31 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
<table border="0" id="customers">
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Was</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Dienst-Was" type="text" value="<?=htmlspecialchars($Was??'')?>">
|
||||
<input name="Dienst-Was" type="text" value="<?php echo htmlspecialchars($Was ?? '')?>">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Wo</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Dienst-Wo" type="text " value="<?=htmlspecialchars($Wo??'')?>">
|
||||
<input name="Dienst-Wo" type="text " value="<?php echo htmlspecialchars($Wo ?? '')?>">
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
<td style="border: 0px solid black;">Info</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Dienst-Info" type="text" value="<?=htmlspecialchars($Info??'')?>" >
|
||||
<input name="Dienst-Info" type="text" value="<?php echo htmlspecialchars($Info ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Leiter</td></tr><tr><td style="border: 0px solid black;">
|
||||
|
||||
<!-- <input name="Dienst-Leiter" type="text" value="<?=htmlspecialchars($Leiter??'')?>" > -->
|
||||
<!-- <input name="Dienst-Leiter" type="text" value="<?php echo htmlspecialchars($Leiter ?? '')?>" > -->
|
||||
<?php
|
||||
echo "<select name='Dienst-Leiter'>";
|
||||
$db_erg = HelferListe($db_link);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($zeile['HelferID']!=$Leiter)
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($zeile['HelferID'] != $Leiter) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</option>";
|
||||
|
||||
}
|
||||
}
|
||||
echo "</select>";
|
||||
|
|
@ -238,18 +209,11 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
//echo "#####".$Gruppe."#####";
|
||||
echo "<select name='Dienst-Gruppe'>";
|
||||
$db_erg = GetDiensteChilds($db_link, 0);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
if ($zeile['DienstID']!=$Gruppe)
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($zeile['DienstID'] != $Gruppe) {
|
||||
echo "<option value='" . $zeile['DienstID'] . "'>" . $zeile['Was'] . "</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<option value='" . $zeile['DienstID'] . "' selected='selected'>" . $zeile['Was'] . "</option>";
|
||||
|
||||
}
|
||||
}
|
||||
echo "</select>";
|
||||
|
|
@ -260,8 +224,12 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
<tr><td style="border: 0px solid black;">HelferLevel</td></tr>
|
||||
<tr><td style="border: 0px solid black;">
|
||||
<select name="HelferLevel">
|
||||
<option value="1" <?php if($HelferLevel==1){echo "selected";};?> >Dauerhelfer</option>
|
||||
<option value="2" <?php if($HelferLevel==2){echo "selected";};?> >Teilnehmer</option>
|
||||
<option value="1" <?php if ($HelferLevel == 1) {
|
||||
echo "selected";
|
||||
};?> >Dauerhelfer</option>
|
||||
<option value="2" <?php if ($HelferLevel == 2) {
|
||||
echo "selected";
|
||||
};?> >Teilnehmer</option>
|
||||
<?php //todo: Name aus HelferLevel-Tabelle erhalten?>
|
||||
</select>
|
||||
</td></tr>
|
||||
|
|
@ -285,18 +253,13 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
$Soll = 1;
|
||||
$db_erg = GetSchichtenEinesDienstes($db_link, $DienstID);
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($SchichtID == 0)
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($SchichtID == 0) {
|
||||
$SchichtID = $zeile['SchichtID'];
|
||||
}
|
||||
if ($zeile['SchichtID']!=$SchichtID)
|
||||
{
|
||||
if ($zeile['SchichtID'] != $SchichtID) {
|
||||
echo "<option value='" . $zeile['SchichtID'] . "'>" . $zeile['TagVon'] . "</option>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<option value='" . $zeile['SchichtID'] . "' selected='selected'>" . $zeile['TagVon'] . "</option>";
|
||||
$Von = $zeile['Von'];
|
||||
$Bis = $zeile['Bis'];
|
||||
|
|
@ -317,17 +280,17 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
|
|||
<table border="0" id='customers'">
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Von</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Schicht-Von" type="datetime-local" value="<?=htmlspecialchars($Von??'')?>" required>
|
||||
<input name="Schicht-Von" type="datetime-local" value="<?php echo htmlspecialchars($Von ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</tr>
|
||||
<td style="border: 0px solid black;">Bis</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Schicht-Bis" type="datetime-local" value="<?=htmlspecialchars($Bis??'')?>" required>
|
||||
<input name="Schicht-Bis" type="datetime-local" value="<?php echo htmlspecialchars($Bis ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</tr>
|
||||
<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="<?=htmlspecialchars((int)$Soll??'')?>" required>
|
||||
<input name="Schicht-Soll" type="number" min=1 value="<?php echo htmlspecialchars((int)$Soll ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
// das hier muss nicht unbedingt eine Adminseite sein
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
|
|
@ -79,13 +79,11 @@ $i=0;
|
|||
$OldHelferName = "";
|
||||
$EinzelDienstStunden = "";
|
||||
$HelferUeberschrift = "";
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile["Name"];
|
||||
$AliasHelferID = $zeile["AliasHelferID"];
|
||||
//echo $HelferName." ".$AliasHelferID."<br>";
|
||||
if($HelferName!= $OldHelferName)
|
||||
{
|
||||
if ($HelferName != $OldHelferName) {
|
||||
if ($EinzelDienstStunden != "") {
|
||||
// Neue Ueberschrift mit Helfernamen + Stunden
|
||||
echo "$HelferUeberschrift </th><th> <img style='width:30px;height:30px;' src='Bilder/PfeilRunter.jpeg'> $dauer Stunden</th>";
|
||||
|
|
@ -108,7 +106,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
$EinzelDienstStunden .= $zeile["Was"];
|
||||
$EinzelDienstStunden .= "</td></tr>";
|
||||
$dauer = $dauer + (int)$zeile["Dauer"];
|
||||
|
||||
}
|
||||
echo "$EinzelDienstStunden";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
|
|
@ -29,15 +29,13 @@ if($AdminStatus != 1) {
|
|||
|
||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['CloseInfo']))
|
||||
{
|
||||
UNSET($InfoMeineSchichtID);
|
||||
UNSET($InfoAlleSchichtID);
|
||||
if (isset($_POST['CloseInfo'])) {
|
||||
unset($InfoMeineSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
}
|
||||
if(isset($_POST['InfoMeineSchichtID']))
|
||||
{
|
||||
if (isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
|
@ -49,14 +47,12 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
if (isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
|
@ -77,28 +73,22 @@ if(isset($_GET['InfoAlleSchichtID']))
|
|||
|
||||
$x = 0;
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$MitHelferID[$x] = $zeile['HelferID'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function HelferAuswahlButton($db_link,$AliasHelferID){
|
||||
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||
{
|
||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
||||
$db_erg = HelferListe($db_link);
|
||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($AliasHelferID != $zeile['HelferID']) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
}
|
||||
|
|
@ -124,8 +114,7 @@ $AdminID = $_SESSION["AdminID"];
|
|||
|
||||
$db_erg = Helferdaten($db_link, $AliasHelferID);
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
}
|
||||
|
||||
|
|
@ -133,7 +122,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
////////////////////////////////////////////////////////
|
||||
|
||||
if (isset($_POST['Del'])) {
|
||||
|
||||
$messages = [];
|
||||
|
||||
$EinzelSchichtID = $_POST['Del'];
|
||||
|
|
@ -148,9 +136,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
|
||||
|
||||
if (empty($messages)) {
|
||||
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link, $AliasHelferID, $EinzelSchichtID, $HelferID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
|
|
@ -159,7 +145,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -179,7 +164,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if (isset($_POST['sent'])) {
|
||||
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['sent'];
|
||||
|
||||
|
|
@ -190,8 +174,7 @@ if(isset($_POST['sent'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $AliasHelferID, $SchichtId, $HelferID);
|
||||
|
||||
|
|
@ -200,19 +183,14 @@ if(isset($_POST['sent'])) {
|
|||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -226,8 +204,7 @@ if(isset($_POST['sent'])) {
|
|||
|
||||
$db_erg = AlleSchichtenEinesHelfers($db_link, $AliasHelferID);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichten des Helfes ungültige Abfrage";
|
||||
die('Ungültige Abfrage: ' . mysqli_error());
|
||||
}
|
||||
|
|
@ -250,9 +227,7 @@ echo '<table id="customers">';
|
|||
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
//echo '<tr title="Details anzeigen" onclick="parent.DetailsSchichten.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
echo '<tr title="Details anzeigen" onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID=' . $zeile['SchichtID'] . '#Info\';" >';
|
||||
echo "<td>" . $zeile['Was'] . "</td>";
|
||||
|
|
@ -260,7 +235,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
echo "<td>" . $zeile['Bis'] . "</td>";
|
||||
echo "<td>" . "<p><button title='Schicht entfernen' name='Del' value='" . $zeile['EinzelSchichtID'] . "'>-</button></p>" . "</td>";
|
||||
echo "</tr>";
|
||||
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +1,25 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
include '_login.php';
|
||||
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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
function HelferAuswahlButton($db_link,$AliasHelferID){
|
||||
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||
{
|
||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
||||
$db_erg = HelferListe($db_link);
|
||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($AliasHelferID != $zeile['HelferID']) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
}
|
||||
|
|
@ -75,8 +69,7 @@ if(isset($_POST['change'])) {
|
|||
// Eingaben überprüfen:
|
||||
|
||||
|
||||
if(strlen($_POST['helfer-newpasswort'])<8 and $_POST['helfer-newpasswort']!="")
|
||||
{
|
||||
if (strlen($_POST['helfer-newpasswort']) < 8 and $_POST['helfer-newpasswort'] != "") {
|
||||
$messages[] = 'Neues Passwort zu kurz';
|
||||
}
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -86,19 +79,15 @@ if(isset($_POST['change'])) {
|
|||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
||||
if ($_POST['IsAdmin'])
|
||||
{
|
||||
if ($_POST['IsAdmin']) {
|
||||
$HelferIsAdmin = 1;
|
||||
//echo "is Admin<br>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$HelferIsAdmin = 0;
|
||||
}
|
||||
if (empty($messages)) {
|
||||
// Helferdaten Ändern
|
||||
HelferdatenAendern($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $AliasHelferID, $HelferIsAdmin, $HelferID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
|
|
@ -114,8 +103,7 @@ if(isset($_POST['change'])) {
|
|||
// Helfer Loeschen
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['del']))
|
||||
{
|
||||
if (isset($_POST['del'])) {
|
||||
HelferLoeschen($db_link, $AliasHelferID, $AdminID);
|
||||
}
|
||||
|
||||
|
|
@ -126,13 +114,11 @@ if(isset($_POST['del']))
|
|||
$db_erg = Helferdaten($db_link, $AliasHelferID);
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferEmail = $zeile['Email'];
|
||||
$HelferHandy = $zeile['Handy'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -147,27 +133,27 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
<form method="post">
|
||||
<tr>
|
||||
<td>Name</td></tr><tr><td>
|
||||
<input name="helfer-name" type="text" value="<?=htmlspecialchars($HelferName??'')?>" required>
|
||||
<input name="helfer-name" type="text" value="<?php echo htmlspecialchars($HelferName ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Email</td></tr><tr><td>
|
||||
<input name="helfer-email" type="email " value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="email " value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Handy</td></tr><tr><td>
|
||||
<input name="helfer-handy" type="tel" value="<?=htmlspecialchars($HelferHandy??'')?>" >
|
||||
<input name="helfer-handy" type="tel" value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Admin Passwort</td></tr><tr><td>
|
||||
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferPasswort??'')?>" >
|
||||
<input name="helfer-passwort" type="password" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Neues Helfer Passwort</td></tr><tr><td>
|
||||
<input name="helfer-newpasswort" type="text" value="<?=htmlspecialchars($HelferPasswort??'')?>" >
|
||||
<input name="helfer-newpasswort" type="text" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
@ -176,7 +162,9 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
<table id="customers">
|
||||
<col style="width:20px">
|
||||
<tr>
|
||||
<td><input type="checkbox" name="IsAdmin" value=1 align="right" <?php if($HelferIsAdmin==1){echo" checked";}?>></td>
|
||||
<td><input type="checkbox" name="IsAdmin" value=1 align="right" <?php if ($HelferIsAdmin == 1) {
|
||||
echo" checked";
|
||||
}?>></td>
|
||||
<td>ist Admin</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
|
||||
|
||||
$db_link = mysqli_connect(
|
||||
|
|
@ -32,20 +32,18 @@ $db_link = mysqli_connect (
|
|||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
|
||||
|
||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['CloseInfo']))
|
||||
{
|
||||
UNSET($InfoMeineSchichtID);
|
||||
UNSET($InfoAlleSchichtID);
|
||||
if (isset($_POST['CloseInfo'])) {
|
||||
unset($InfoMeineSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
}
|
||||
if(isset($_POST['InfoMeineSchichtID']))
|
||||
{
|
||||
if (isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
|
@ -57,14 +55,12 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
if (isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
|
@ -85,23 +81,17 @@ if(isset($_GET['InfoAlleSchichtID']))
|
|||
|
||||
$x = 0;
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$MitHelferID[$x] = $zeile['HelferID'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(isset($_GET['ZeitBereich']))
|
||||
{
|
||||
if (isset($_GET['ZeitBereich'])) {
|
||||
$ZeitBereich = $_GET['ZeitBereich'];
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$ZeitBereich = 1;
|
||||
}
|
||||
|
||||
|
|
@ -121,7 +111,6 @@ else
|
|||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if (isset($_POST['plusschicht'])) {
|
||||
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['plusschicht'];
|
||||
|
||||
|
|
@ -132,8 +121,7 @@ if(isset($_POST['plusschicht'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
||||
|
||||
|
|
@ -142,19 +130,14 @@ if(isset($_POST['plusschicht'])) {
|
|||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (isset($_POST['minusschicht'])) {
|
||||
|
|
@ -163,25 +146,17 @@ if(isset($_POST['minusschicht'])) {
|
|||
|
||||
$SchichtID = $_POST['minusschicht'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// Helfer aus Schicht entfernen
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $HelferID, $SchichtID);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -208,18 +183,15 @@ $dienstsort =$_SESSION["dienstsort"];
|
|||
|
||||
|
||||
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='1')
|
||||
{
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '1') {
|
||||
$addschicht = '1';
|
||||
$dienstsort = '1';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='2')
|
||||
{
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '2') {
|
||||
$addschicht = '2';
|
||||
$dienstsort = '2';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='0')
|
||||
{
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '0') {
|
||||
$addschicht = '0';
|
||||
}
|
||||
|
||||
|
|
@ -228,8 +200,7 @@ $_SESSION["dienstsort"] =$dienstsort;
|
|||
|
||||
//echo "<br>Detail=".$addschicht."<br>";
|
||||
|
||||
if($addschicht=='0')
|
||||
{
|
||||
if ($addschicht == '0') {
|
||||
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
||||
echo "<button name='addschicht' value='1'>Tage</button>";
|
||||
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
||||
|
|
@ -237,36 +208,28 @@ if($addschicht=='0')
|
|||
|
||||
//echo "InfoAlleSchichtID ".$InfoAlleSchichtID;
|
||||
|
||||
if($addschicht!='0')
|
||||
{
|
||||
if ($addschicht != '0') {
|
||||
//$db_erg = AlleSchichten($db_link,$dienstsort);
|
||||
//$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",$HelferLevel);
|
||||
if ($ZeitBereich==1) // Alle
|
||||
{
|
||||
if ($ZeitBereich == 1) { // Alle
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==2) // Davor
|
||||
{
|
||||
if ($ZeitBereich == 2) { // Davor
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2023-05-18 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==3) // Do
|
||||
{
|
||||
if ($ZeitBereich == 3) { // Do
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-18 00:00:00", "2023-05-19 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==4) // Fr
|
||||
{
|
||||
if ($ZeitBereich == 4) { // Fr
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-19 00:00:00", "2023-05-20 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==5) // Sa
|
||||
{
|
||||
if ($ZeitBereich == 5) { // Sa
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-20 00:00:00", "2023-05-21 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==6) // So
|
||||
{
|
||||
if ($ZeitBereich == 6) { // So
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-21 00:00:00", "2023-05-22 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==7) // Danach
|
||||
{
|
||||
if ($ZeitBereich == 7) { // Danach
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-22 00:00:00", "2223-05-22 00:00:00", $HelferLevel);
|
||||
}
|
||||
// fuer Anzahlanzeige in Ueberschrift
|
||||
|
|
@ -290,60 +253,39 @@ if($addschicht!='0')
|
|||
}
|
||||
*/
|
||||
echo "<tr class='header'>"; // Zeitbereich tr
|
||||
if ($ZeitBereich==1)
|
||||
{
|
||||
if ($ZeitBereich == 1) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>" . "Alle" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>" . "Alle" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==2)
|
||||
{
|
||||
if ($ZeitBereich == 2) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>" . "Davor" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>" . "Davor" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==3)
|
||||
{
|
||||
if ($ZeitBereich == 3) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>" . "Do" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>" . "Do" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==4)
|
||||
{
|
||||
if ($ZeitBereich == 4) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>" . "Fr" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>" . "Fr" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==5)
|
||||
{
|
||||
if ($ZeitBereich == 5) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>" . "Sa" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>" . "Sa" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==6)
|
||||
{
|
||||
if ($ZeitBereich == 6) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>" . "So" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>" . "So" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==7)
|
||||
{
|
||||
if ($ZeitBereich == 7) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>" . "Danach" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>" . "Danach" . "</th>";
|
||||
}
|
||||
|
||||
|
|
@ -351,34 +293,26 @@ if($addschicht!='0')
|
|||
|
||||
$OldTag = "";
|
||||
$OldWas = "";
|
||||
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
// um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link, $HelferID);
|
||||
//print_r($MeineDienste);
|
||||
|
||||
echo '</table>';
|
||||
echo '<table id="customers">';
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($dienstsort == '1') {
|
||||
$Tag = $zeile['Tag'];
|
||||
|
||||
if ($Tag!=$OldTag)
|
||||
{
|
||||
if ($Tag != $OldTag) {
|
||||
echo "<tr class='header'><th colspan='5' >";
|
||||
echo $Tag;
|
||||
echo "</th></tr>";
|
||||
$OldTag = $Tag;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$Was = $zeile['Was'];
|
||||
|
||||
if ($Was!=$OldWas)
|
||||
{
|
||||
if ($Was != $OldWas) {
|
||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||
echo $Was;
|
||||
echo "</th>";
|
||||
|
|
@ -393,18 +327,15 @@ if($addschicht!='0')
|
|||
}
|
||||
}
|
||||
$Color = "red";
|
||||
if ( $zeile['Ist'] > 0 )
|
||||
{
|
||||
if ($zeile['Ist'] > 0) {
|
||||
$Color = "yellow";
|
||||
}
|
||||
if ( $zeile['Ist'] >= $zeile['Soll'] )
|
||||
{
|
||||
if ($zeile['Ist'] >= $zeile['Soll']) {
|
||||
$Color = "green";
|
||||
}
|
||||
$Von = $zeile['Ab'];
|
||||
$Bis = $zeile['Bis'];
|
||||
if ( substr($Von,0,2) == substr($Bis,0,2))
|
||||
{
|
||||
if (substr($Von, 0, 2) == substr($Bis, 0, 2)) {
|
||||
$Bis = substr($Bis, 2);
|
||||
}
|
||||
$Von = substr($Von, 2);
|
||||
|
|
@ -421,28 +352,22 @@ if($addschicht!='0')
|
|||
|
||||
echo '<tr ' . $rowstyle . 'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID=' . $zeile['SchichtID'] . '#Info\';" >';
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
if ($dienstsort == '1') {
|
||||
echo "<td>" . $zeile['Was'] . "</td>";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<td>" . $zeile['Tag'] . "</td>";
|
||||
}
|
||||
echo "<td>" . $Von . "</td>";
|
||||
echo "<td>" . $Bis . "</td>";
|
||||
echo "<td bgcolor='" . $Color . "'>" . $zeile['Ist'] . "/";
|
||||
echo "" . $zeile['Soll'] . "</td>";
|
||||
# buttons sind in der selben Zelle
|
||||
// buttons sind in der selben Zelle
|
||||
echo "<td width='30px'>" . "<button width='20px' name='plusschicht' value='" . $zeile['SchichtID'] . "'>+</button>" . "";
|
||||
echo "" . " <button width='120px' name='minusschicht' value='" . $zeile['SchichtID'] . "'>–</button> $regtext" . "</td>";
|
||||
//echo "<td>$regtext</td>";
|
||||
echo "</tr>\n";
|
||||
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
|
||||
SESSION_START();
|
||||
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
|
|
@ -29,7 +29,7 @@ $db_link = mysqli_connect (
|
|||
);
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
|
||||
|
||||
?>
|
||||
|
|
@ -46,20 +46,17 @@ include '_login.php';
|
|||
echo '<table id="customers" >';
|
||||
|
||||
$db_erg = GetDiensteChilds($db_link, 0);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
echo "<tr><th>";
|
||||
echo $zeile["Was"];
|
||||
echo "</th></tr>";
|
||||
|
||||
$db_erg2 = GetDiensteChilds($db_link, $zeile["DienstID"]);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg2, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg2, MYSQLI_ASSOC)) {
|
||||
echo "<tr><td>";
|
||||
echo $zeile["Was"];
|
||||
echo "</td></tr>";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
echo "</table>";
|
||||
|
|
@ -76,12 +73,10 @@ echo "<br><br><table id='customers' style='page-break-before:always'>";
|
|||
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>↩</b></button> <b>Übersicht Schichten der Dienste DAS 2023</b></th>
|
||||
</tr>
|
||||
<?php
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$Was = $zeile["Was"];
|
||||
|
||||
if($Was!= $OldWas)
|
||||
{
|
||||
if ($Was != $OldWas) {
|
||||
echo "</table>";
|
||||
//echo '<table id="customers" style="page-break-before:always">';
|
||||
echo '<table id="customers">';
|
||||
|
|
@ -89,8 +84,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
echo $Was;
|
||||
echo "</th></tr>";
|
||||
$OldWas = $Was;
|
||||
|
||||
|
||||
}
|
||||
|
||||
echo "<tr><td style='width:100px'>";
|
||||
|
|
@ -100,17 +93,13 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
echo "</td><td>";
|
||||
|
||||
$db_erg2 = BeteiligteHelfer($db_link, $zeile["SchichtID"]);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg2, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg2, MYSQLI_ASSOC)) {
|
||||
echo $zeile["Name"];
|
||||
echo " ";
|
||||
echo $zeile["Handy"];
|
||||
echo ",";
|
||||
}
|
||||
echo "</td></tr>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
echo "</table>";
|
||||
|
|
@ -124,12 +113,10 @@ echo "<br><br><table id='customers' style='page-break-before:always'>";
|
|||
</tr>
|
||||
<?php
|
||||
$db_erg = AlleHelferSchichtenUebersicht($db_link);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile["Name"];
|
||||
|
||||
if($HelferName!= $OldHelferName)
|
||||
{
|
||||
if ($HelferName != $OldHelferName) {
|
||||
echo "</table>";
|
||||
//echo '<table id="customers" style="page-break-before:always">';
|
||||
echo '<table id="customers">';
|
||||
|
|
@ -137,8 +124,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
echo $HelferName;
|
||||
echo "</th></tr>";
|
||||
$OldHelferName = $HelferName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
echo "<tr><td style='width:100px'>";
|
||||
|
|
@ -146,8 +131,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
echo "</td><td>";
|
||||
echo $zeile["Was"];
|
||||
echo "</td></tr>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
SESSION_START();
|
||||
//$HelferID = $_SESSION["HelferId"];
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
|
|
@ -26,15 +26,16 @@ $db_link = mysqli_connect (
|
|||
);
|
||||
|
||||
if (isset($_POST['sent'])) {
|
||||
|
||||
$messages = [];
|
||||
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferLevel = $_POST['helfer-level'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];;
|
||||
$HelferPasswort2 = $_POST['helfer-passwort2'];;
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
;
|
||||
$HelferPasswort2 = $_POST['helfer-passwort2'];
|
||||
;
|
||||
|
||||
//echo $HelferName;
|
||||
//echo $HelferEmail;
|
||||
|
|
@ -54,25 +55,21 @@ if(isset($_POST['sent'])) {
|
|||
// $messages[] = 'Bitte prüfen Sie die eingegebene Handynummer';
|
||||
//}
|
||||
|
||||
if($HelferPasswort!=$HelferPasswort2)
|
||||
{
|
||||
if ($HelferPasswort != $HelferPasswort2) {
|
||||
$messages[] = 'Passwörter stimmen nicht überein';
|
||||
$HelferPasswort = "";
|
||||
$HelferPasswort2 = "";
|
||||
}
|
||||
if(strlen($HelferPasswort)<8)
|
||||
{
|
||||
if (strlen($HelferPasswort) < 8) {
|
||||
$messages[] = 'Passwörter zu kurz';
|
||||
$HelferPasswort = "";
|
||||
$HelferPasswort2 = "";
|
||||
}
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
$db_erg = CreateHelfer($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferPasswort, $HelferLevel);
|
||||
if ( $db_erg )
|
||||
{
|
||||
if ($db_erg) {
|
||||
//$insertID = mysql_insert_id();
|
||||
//echo "InserId = ".$insertID;
|
||||
|
||||
|
|
@ -85,9 +82,7 @@ if(isset($_POST['sent'])) {
|
|||
$HelferPasswort2 = '';
|
||||
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "Helfer konnte nicht Angelegt werden, möglichweise exisistiert die Emailadresse " . $HelferEmail . " bereits.<br><br>";
|
||||
}
|
||||
} else {
|
||||
|
|
@ -98,8 +93,6 @@ if(isset($_POST['sent'])) {
|
|||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -116,30 +109,30 @@ if(isset($_POST['sent'])) {
|
|||
<td>Name</td>
|
||||
</tr>
|
||||
<tr><td>
|
||||
<input name="helfer-name" type="text" value="<?=htmlspecialchars($HelferName??'')?>" required>
|
||||
<input name="helfer-name" type="text" value="<?php echo htmlspecialchars($HelferName ?? '')?>" required>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td>Email</td>
|
||||
</tr>
|
||||
<tr><td>
|
||||
<input name="helfer-email" type="email " value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="email " value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td>Handy</td>
|
||||
</tr>
|
||||
<tr><td>
|
||||
<input name="helfer-handy" type="tel" value="<?=htmlspecialchars($HelferHandy??'')?>" >
|
||||
<input name="helfer-handy" type="tel" value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Passwort</td></tr>
|
||||
<tr><td>
|
||||
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferPasswort??'')?>" required>
|
||||
<input name="helfer-passwort" type="password" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr><td>Passwort wiederholen </td></tr>
|
||||
<tr><td>
|
||||
<input name="helfer-passwort2" type="password" value="<?=htmlspecialchars($HelferPasswort2??'')?>" required>
|
||||
<input name="helfer-passwort2" type="password" value="<?php echo htmlspecialchars($HelferPasswort2 ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr><td>Helferlevel </td></tr>
|
||||
|
|
@ -151,7 +144,9 @@ $selected="";
|
|||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferLevel = $zeile['HelferLevel'];
|
||||
$HelferLevelBeschreibung = $zeile['HelferLevelBeschreibung'];
|
||||
if($HelferLevel==1){ $selected = " selected " ;};
|
||||
if ($HelferLevel == 1) {
|
||||
$selected = " selected " ;
|
||||
};
|
||||
echo "<option value='$HelferLevel' $selected>$HelferLevelBeschreibung</option>";
|
||||
$selected = "";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,10 +4,9 @@
|
|||
<body>
|
||||
|
||||
<?php
|
||||
require_once ('konfiguration.php');
|
||||
require_once 'konfiguration.php';
|
||||
|
||||
if (isset($_GET['token'])) {
|
||||
|
||||
// E-Mail-Adresse des Nutzers
|
||||
$encrypted_data = $_GET['token'];
|
||||
$encrypted_iv = $_GET['iv'];
|
||||
|
|
@ -36,9 +35,7 @@ if(substr($decrypted_email, -$verification_length) == $secret_verification) {
|
|||
|
||||
// Ausgabe der entschlüsselten E-Mail-Adresse
|
||||
echo "E-Mail-Adresse: ", $decrypted_email, "<br>\n";
|
||||
|
||||
} else {
|
||||
|
||||
echo "Kein gültiges Token!<br>";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
include '_login.php';
|
||||
include '_crypt.php';
|
||||
require '_login.php';
|
||||
require '_crypt.php';
|
||||
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
|
|
@ -13,7 +13,8 @@ if($AdminStatus != 1) {
|
|||
exit;
|
||||
}
|
||||
|
||||
function validate_email($email) {
|
||||
function validate_email($email)
|
||||
{
|
||||
// Prüfen, ob die Email-Adresse syntaktisch gültig ist
|
||||
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
|
||||
return false;
|
||||
|
|
@ -112,12 +113,16 @@ Als Passwort wird das Token gesetzt. Man kann sich mit dem Link danach wieder in
|
|||
<label for="helfer-status">Status des Accounts, den der Link erstellt:</label>
|
||||
<select style="width:260px" id="helfer-status" name="helfer-status">
|
||||
<!-- TODO: aus DB abfragen -->
|
||||
<option value="2"<?php if($level==2){echo "selected";}?>>Teilnehmer</option>
|
||||
<option value="1" <?php if($level==1){echo "selected";}?>>Dauerhelfer</option>
|
||||
<option value="2"<?php if ($level == 2) {
|
||||
echo "selected";
|
||||
}?>>Teilnehmer</option>
|
||||
<option value="1" <?php if ($level == 1) {
|
||||
echo "selected";
|
||||
}?>>Dauerhelfer</option>
|
||||
</select>
|
||||
</p><p>
|
||||
Subject der Email: <br>
|
||||
<input id="email-subject" name="email-subject" type="textbox" value="<?=htmlspecialchars($email_subject??'');?>">
|
||||
<input id="email-subject" name="email-subject" type="textbox" value="<?php echo htmlspecialchars($email_subject ?? '');?>">
|
||||
</p><p>
|
||||
CC (Kopie) der Email geht an: <br>
|
||||
<input id="email-cc" name="email-cc" type="textbox" value="drophelfer@gmail.com">
|
||||
|
|
@ -125,7 +130,7 @@ Als Passwort wird das Token gesetzt. Man kann sich mit dem Link danach wieder in
|
|||
Emailtext (XXtokenXX an die Stelle schreiben, an der der Link im Emailtext stehen soll):
|
||||
</p><p>
|
||||
<textarea id="email-text" name="email-text" rows="20" cols="80">
|
||||
<?=htmlspecialchars($email_text??'');?>
|
||||
<?php echo htmlspecialchars($email_text ?? '');?>
|
||||
</textarea>
|
||||
</p>
|
||||
<p>
|
||||
|
|
@ -196,7 +201,7 @@ if(isset($_POST['email-liste'])) {
|
|||
<!--Einzelne Email
|
||||
<p>
|
||||
<form method="GET">
|
||||
<input id="helfer-email" name="helfer-email" type="textbox" value="<?=htmlspecialchars($HelferEmail??'')?>">
|
||||
<input id="helfer-email" name="helfer-email" type="textbox" value="<?php echo htmlspecialchars($HelferEmail ?? '')?>">
|
||||
<button name="sent" value="1">Token generieren</button>
|
||||
</form>
|
||||
</p>
|
||||
|
|
@ -204,15 +209,15 @@ if(isset($_POST['email-liste'])) {
|
|||
|
||||
<?php
|
||||
//single email
|
||||
#if(isset($_GET['helfer-email'])) {
|
||||
# $email = $_GET['helfer-email'];
|
||||
# echo "email: $email <br> \n";
|
||||
# // encode
|
||||
# $encrypted_data=encode_string($secret_key, $email,$secret_verification);
|
||||
# $decrypted_data = decode_string($secret_key, $encrypted_data,$secret_verification);
|
||||
# // Ausgabe des verschlüsselten Textesin der URL
|
||||
# echo "$email: <a href='$linktext'> $urlprefix/$linktext</a>(check: $decrypted_data ) <br>";
|
||||
# exit;
|
||||
#}
|
||||
// if(isset($_GET['helfer-email'])) {
|
||||
// $email = $_GET['helfer-email'];
|
||||
// echo "email: $email <br> \n";
|
||||
// // encode
|
||||
// $encrypted_data=encode_string($secret_key, $email,$secret_verification);
|
||||
// $decrypted_data = decode_string($secret_key, $encrypted_data,$secret_verification);
|
||||
// // Ausgabe des verschlüsselten Textesin der URL
|
||||
// echo "$email: <a href='$linktext'> $urlprefix/$linktext</a>(check: $decrypted_data ) <br>";
|
||||
// exit;
|
||||
// }
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
<title>Helfer Drop am See 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 http-equiv="Refresh" content="0; url=<?php require_once ('konfiguration.php'); echo INFORMATIONS_URL;?>" />
|
||||
<meta http-equiv="Refresh" content="0; url=<?php require_once 'konfiguration.php';
|
||||
echo INFORMATIONS_URL;?>" />
|
||||
<meta name="viewport" content="width=480" />
|
||||
</head>
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once 'konfiguration.php';
|
||||
//require_once ('SQL.php');
|
||||
include 'SQL.php';
|
||||
require 'SQL.php';
|
||||
|
||||
|
||||
|
||||
|
|
@ -32,15 +32,13 @@ $db_link = mysqli_connect (
|
|||
|
||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['CloseInfo']))
|
||||
{
|
||||
UNSET($InfoMeineSchichtID);
|
||||
UNSET($InfoAlleSchichtID);
|
||||
if (isset($_POST['CloseInfo'])) {
|
||||
unset($InfoMeineSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
}
|
||||
if(isset($_POST['InfoMeineSchichtID']))
|
||||
{
|
||||
if (isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
|
@ -52,14 +50,12 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
if (isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
|
@ -80,30 +76,25 @@ if(isset($_GET['InfoAlleSchichtID']))
|
|||
|
||||
$x = 0;
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$MitHelferID[$x] = $zeile['HelferID'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// Logout
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['logout']))
|
||||
{
|
||||
if (isset($_POST['logout'])) {
|
||||
unset($_SESSION["HelferID"]);
|
||||
//$_POST['login'] = 1;
|
||||
}
|
||||
|
||||
/// Login
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['login']))
|
||||
{
|
||||
if (isset($_POST['login'])) {
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -114,12 +105,9 @@ if(isset($_POST['login']))
|
|||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach ($messages as $message) {
|
||||
|
|
@ -127,14 +115,11 @@ if(isset($_POST['login']))
|
|||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(!isset($_SESSION["HelferID"]))
|
||||
{
|
||||
|
||||
if (!isset($_SESSION["HelferID"])) {
|
||||
?>
|
||||
<form method="post" action="#Info">
|
||||
|
||||
|
|
@ -144,12 +129,12 @@ if(!isset($_SESSION["HelferID"]))
|
|||
<table border="0" style="border: 0px solid black;">
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Email</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="helfer-email" type="text" value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="text" value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Passwort</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferHandy??'')?>" required>
|
||||
<input name="helfer-passwort" type="password" value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</table>
|
||||
|
|
@ -170,8 +155,7 @@ if(!isset($_SESSION["HelferID"]))
|
|||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
if(isset($_POST['HelferID']))
|
||||
{
|
||||
if (isset($_POST['HelferID'])) {
|
||||
$HelferID = $_POST['HelferID'];
|
||||
}
|
||||
if (isset($_POST['ShowHelfer'])) {
|
||||
|
|
@ -197,7 +181,6 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
////////////////////////////////////////////////////////
|
||||
|
||||
if (isset($_POST['Del'])) {
|
||||
|
||||
$messages = [];
|
||||
|
||||
$EinzelSchichtID = $_POST['Del'];
|
||||
|
|
@ -212,9 +195,7 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
|
||||
|
||||
if (empty($messages)) {
|
||||
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link, $HelferID, $EinzelSchichtID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
|
|
@ -223,7 +204,6 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -243,7 +223,6 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if (isset($_POST['sent'])) {
|
||||
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['sent'];
|
||||
|
||||
|
|
@ -254,8 +233,7 @@ if(isset($_POST['sent'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
||||
|
||||
|
|
@ -264,19 +242,14 @@ if(isset($_POST['sent'])) {
|
|||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -290,8 +263,7 @@ if(isset($_POST['sent'])) {
|
|||
|
||||
$db_erg = AlleSchichtenEinesHelfers($db_link, $HelferID);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichten des Helfes ungültige Abfrage";
|
||||
die('Ungültige Abfrage: ' . mysqli_error());
|
||||
}
|
||||
|
|
@ -314,9 +286,7 @@ echo '<table id="customers">';
|
|||
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
//echo '<tr title="Details anzeigen" onclick="parent.DetailsSchichten.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
echo '<tr title="Details anzeigen" onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID=' . $zeile['SchichtID'] . '#Info\';" >';
|
||||
echo "<td>" . $zeile['Was'] . "</td>";
|
||||
|
|
@ -324,7 +294,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
echo "<td>" . $zeile['Bis'] . "</td>";
|
||||
echo "<td>" . "<button title='Schicht entfernen' name='Del' value='" . $zeile['EinzelSchichtID'] . "'>-</button>" . "</td>";
|
||||
echo "</tr>";
|
||||
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<!--meta name="viewport" content="width=480" /-->
|
||||
<?php
|
||||
require_once ('konfiguration.php');
|
||||
require_once 'konfiguration.php';
|
||||
SESSION_START();
|
||||
|
||||
|
||||
|
|
@ -26,13 +26,12 @@
|
|||
//check for admin status
|
||||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
include 'SQL.php';
|
||||
require 'SQL.php';
|
||||
$db_link = mysqli_connect(MYSQL_HOST, MYSQL_BENUTZER, MYSQL_KENNWORT, MYSQL_DATENBANK);
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
}
|
||||
|
|
@ -51,7 +50,7 @@
|
|||
|
||||
$regex = "/" . "$regex" . "/";
|
||||
foreach (file(LOGFILE) as $line) {
|
||||
#echo "not: $line<br>\n";
|
||||
// echo "not: $line<br>\n";
|
||||
if (preg_match($regex, $line, $matches)) {
|
||||
echo "<tr><td> $line</td></tr>";
|
||||
}
|
||||
|
|
|
|||
319
html/SQL.php
319
html/SQL.php
|
|
@ -1,9 +1,10 @@
|
|||
|
||||
<?php
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once 'konfiguration.php';
|
||||
|
||||
function ConnectDB(){
|
||||
function ConnectDB()
|
||||
{
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
|
|
@ -32,18 +33,17 @@ function CreateHelfer($db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPas
|
|||
$db_erg = mysqli_query($db_link, $sql);
|
||||
error_log(date('Y-m-d H:i') . " CreateHelfer: $HelferName angelegt mit Email $HelferEmail Handy $HelferHandy \n", 3, LOGFILE);
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
// testet fuer urllogin, ob Helfer bereits existiert
|
||||
function HelferIstVorhanden ($db_link,$Email) {
|
||||
function HelferIstVorhanden($db_link, $Email)
|
||||
{
|
||||
$Email = mysqli_real_escape_string($db_link, $Email);
|
||||
$sql = "SELECT count(HelferID) as Anzahl FROM Helfer Where Email = '" . $Email . "'";
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||
return $zeile['Anzahl'];
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
//TODO: pruefen, ob Helfer bereits eingeloggt
|
||||
function HelferLogin($db_link, $HelferEmail, $HelferPasswort, $HelferStatus)
|
||||
|
|
@ -56,18 +56,15 @@ function HelferLogin($db_link,$HelferEmail,$HelferPasswort,$HelferStatus)
|
|||
$sql = "Select HelferID,Admin,Name,Passwort,HelferLevel From Helfer Where Email='" . $HelferEmail . "'";
|
||||
//echo $sql;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Login ungueltige Abfrage";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferPasswort = "€" . $HelferPasswort . "ß";
|
||||
//echo "<b>".$HelferPasswort."</b><br>";
|
||||
//echo "<b>".$zeile['Passwort']."</b><br>";
|
||||
if(password_verify( $HelferPasswort , $zeile['Passwort']) )
|
||||
{
|
||||
if (password_verify($HelferPasswort, $zeile['Passwort'])) {
|
||||
$_SESSION["HelferID"] = $zeile['HelferID'];
|
||||
$_SESSION["HelferName"] = $zeile['Name'];
|
||||
//TODO: das sollte nur gesetzt werden, wenn der Helfer Admin ist
|
||||
|
|
@ -75,15 +72,11 @@ function HelferLogin($db_link,$HelferEmail,$HelferPasswort,$HelferStatus)
|
|||
$_SESSION["AdminStatus"] = $zeile['Admin'];
|
||||
$_SESSION["HelferLevel"] = $zeile['HelferLevel'];
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "Falsches Passwort<br>";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Liste der Helfer fuer Admin-Seite
|
||||
|
|
@ -93,15 +86,13 @@ function HelferListe($db_link)
|
|||
|
||||
$sql = "SELECT HelferID,Name FROM Helfer";
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Helferliste ungueltige Abfrage";
|
||||
die('Unueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
function Helferdaten($db_link, $HelferID)
|
||||
|
|
@ -111,16 +102,14 @@ function Helferdaten($db_link,$HelferID)
|
|||
|
||||
$sql = "SELECT * FROM Helfer Where HelferID =" . $HelferID;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Helferdaten ungueltige Abfrage<br>\n";
|
||||
echo "sql:$sql<br>\n";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -132,58 +121,40 @@ function HelferdatenAendern($db_link,$HelferName,$HelferEmail,$HelferHandy,$Helf
|
|||
$HelferEmail = mysqli_real_escape_string($db_link, $HelferEmail);
|
||||
$HelferHandy = mysqli_real_escape_string($db_link, $HelferHandy);
|
||||
|
||||
if( $HelferNewPasswort == "")
|
||||
{
|
||||
if ($HelferNewPasswort == "") {
|
||||
//$sql = "UPDATE Helfer SET Name='$HelferName',Email='$HelferEmail',Handy='$HelferHandy' ".($HelferIsAdmin!=-1)?',Admin='$HelferIsAdmin.':'." Where HelferId=".$HelferID;
|
||||
if ($HelferIsAdmin==-1)
|
||||
{
|
||||
if ($HelferIsAdmin == -1) {
|
||||
$sql = "UPDATE Helfer SET Name='$HelferName',Email='$HelferEmail',Handy='$HelferHandy' Where HelferId=" . $HelferID;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$sql = "UPDATE Helfer SET Name='$HelferName',Email='$HelferEmail',Handy='$HelferHandy',Admin=$HelferIsAdmin Where HelferId=" . $HelferID;
|
||||
}
|
||||
echo $sql;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
echo "<li>Helferdaten geändert</li>";
|
||||
if($AdminID!=0)
|
||||
{
|
||||
if ($AdminID != 0) {
|
||||
error_log(date('Y-m-d H:i') . "(Admin $AdminID) Helferdaten update: Name: $HelferName (HelferID:$HelferID) Email: $HelferEmail Handy: $HelferHandy Admin: $HelferIsAdmin\n", 3, LOGFILE);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
error_log(date('Y-m-d H:i') . "Helferdaten update: Name: $HelferName (HelferID:$HelferID) Email: $HelferEmail Handy: $HelferHandy Admin: $HelferIsAdmin\n", 3, LOGFILE);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$HelferNewPasswort = "€" . $HelferNewPasswort . "ß";
|
||||
$PasswortHash = password_hash($HelferNewPasswort, PASSWORD_DEFAULT);
|
||||
if ($HelferIsAdmin==-1)
|
||||
{
|
||||
if ($HelferIsAdmin == -1) {
|
||||
$sql = "UPDATE Helfer SET Name='" . $HelferName . "',Email='" . $HelferEmail . "',Handy='" . $HelferHandy . "',Passwort='" . $PasswortHash . "' Where HelferId=" . $HelferID;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$sql = "UPDATE Helfer SET Name='$HelferName',Email='$HelferEmail',Handy='$HelferHandy',Passwort='$PasswortHash',Admin=$HelferIsAdmin Where HelferId=" . $HelferID;
|
||||
}
|
||||
//echo $sql;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
echo "<li>Passwort geändert</li>";
|
||||
if($AdminID!=0)
|
||||
{
|
||||
if ($AdminID != 0) {
|
||||
error_log(date('Y-m-d H:i') . "(Admin $AdminID) Helferdaten update: Name: $HelferName (HelferID:$HelferID) Email: $HelferEmail Handy: $HelferHandy Passwort: neu gesetzt\n", 3, LOGFILE);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
} else {
|
||||
error_log(date('Y-m-d H:i') . "Helferdaten update: Name: $HelferName (HelferID:$HelferID) Email: $HelferEmail Handy: $HelferHandy Passwort: neu gesetzt\n", 3, LOGFILE);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "HelferdatenAendern ungueltiges Statement";
|
||||
echo $sql;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -191,8 +162,7 @@ function HelferdatenAendern($db_link,$HelferName,$HelferEmail,$HelferHandy,$Helf
|
|||
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -202,19 +172,15 @@ function AlleSchichten($db_link,$Sort,$HelferLevel=1)
|
|||
|
||||
$Sort = mysqli_real_escape_string($db_link, $Sort);
|
||||
|
||||
if($Sort=='1')
|
||||
{
|
||||
if ($Sort == '1') {
|
||||
$sql = "select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Dienst.DienstID=SchichtUebersicht.DienstID and Dienst.Helferlevel=$HelferLevel order by Von";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$sql = "select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Dienst.DienstID=SchichtUebersicht.DienstID and Dienst.Helferlevel=$HelferLevel order by Was,Von";
|
||||
}
|
||||
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichten ungueltige Abfrage";
|
||||
echo $Sort;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -222,8 +188,7 @@ function AlleSchichten($db_link,$Sort,$HelferLevel=1)
|
|||
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
function AlleSchichtenCount($db_link, $HelferLevel = 1)
|
||||
{
|
||||
|
|
@ -234,8 +199,7 @@ function AlleSchichtenCount($db_link, $HelferLevel=1)
|
|||
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichtenCount ungueltige Abfrage";
|
||||
echo $Sort;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -243,8 +207,7 @@ function AlleSchichtenCount($db_link, $HelferLevel=1)
|
|||
|
||||
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||
return $zeile['Anzahl'];
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
function AlleBelegteSchichtenCount($db_link, $HelferLevel = 1)
|
||||
|
|
@ -255,8 +218,7 @@ function AlleBelegteSchichtenCount($db_link,$HelferLevel=1)
|
|||
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichtenCount ungueltige Abfrage";
|
||||
echo $Sort;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -264,8 +226,7 @@ function AlleBelegteSchichtenCount($db_link,$HelferLevel=1)
|
|||
|
||||
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||
return $zeile['Anzahl'];
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
function AlleSchichtenImZeitbereich($db_link, $Von, $Bis, $HelferLevel = 1)
|
||||
|
|
@ -283,8 +244,7 @@ function AlleSchichtenImZeitbereich($db_link,$Von,$Bis,$HelferLevel=1)
|
|||
error_log($sql);
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichtenImZeitbereich ungueltige Abfrage<br>";
|
||||
echo $sql;
|
||||
die('<br>Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -292,8 +252,7 @@ function AlleSchichtenImZeitbereich($db_link,$Von,$Bis,$HelferLevel=1)
|
|||
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
function AlleSchichtenEinesHelfers($db_link, $HelferID)
|
||||
|
|
@ -305,8 +264,7 @@ function AlleSchichtenEinesHelfers($db_link,$HelferID)
|
|||
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichtenEinesHelfers ungueltige Abfrage";
|
||||
echo $HelferID;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -314,8 +272,7 @@ function AlleSchichtenEinesHelfers($db_link,$HelferID)
|
|||
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
function HelferLoeschen($db_link, $HelferID, $AdminID)
|
||||
{
|
||||
|
|
@ -324,9 +281,7 @@ function HelferLoeschen($db_link,$HelferID,$AdminID)
|
|||
|
||||
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
//echo "HelferName=$HelferName<br>";
|
||||
}
|
||||
|
|
@ -334,30 +289,22 @@ function HelferLoeschen($db_link,$HelferID,$AdminID)
|
|||
$db_erg = AlleSchichtenEinesHelfers($db_link, $HelferID);
|
||||
|
||||
$AnzahlHelferschichten = mysqli_num_rows($db_erg);
|
||||
if($AnzahlHelferschichten==0)
|
||||
{
|
||||
if ($AnzahlHelferschichten == 0) {
|
||||
$sql = "Delete from Helfer where HelferID='$HelferID'";
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Helfer $HelferName konnte nicht gelöscht werden<br>";
|
||||
echo "$sql <br>";
|
||||
return -2;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
} else {
|
||||
echo "Helfer $HelferName (HelferID:$HelferID) wurde erfolgreich geloescht<br>";
|
||||
error_log(date('Y-m-d H:i') . "(Admin $AdminID) Helfer loeschen: Name: $HelferName (HelferID:$HelferID)\n", 3, LOGFILE);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "Helfer $HelferName hat noch $AnzahlHelferschichten Schichten. Bitte erst die Schichten löschen<br>";
|
||||
return -1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function SchichtIdArrayEinesHelfers($db_link, $HelferID)
|
||||
|
|
@ -380,7 +327,7 @@ function AlleSchichtenEinesHelfersVonJetzt($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>'2023-05-20' order by Von";
|
||||
|
|
@ -388,8 +335,7 @@ function AlleSchichtenEinesHelfersVonJetzt($db_link,$HelferID)
|
|||
//echo $sql;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichtenEinesHelfers ungueltige Abfrage";
|
||||
echo $HelferID;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -397,8 +343,7 @@ function AlleSchichtenEinesHelfersVonJetzt($db_link,$HelferID)
|
|||
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
function SchichtenSummeEinesHelfers($db_link, $HelferID)
|
||||
{
|
||||
|
|
@ -410,8 +355,7 @@ function SchichtenSummeEinesHelfers($db_link,$HelferID)
|
|||
//echo $sql;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "SchichtenSummeEinesHelfers ungueltige Abfrage";
|
||||
echo $HelferID;
|
||||
echo $sql;
|
||||
|
|
@ -420,8 +364,7 @@ function SchichtenSummeEinesHelfers($db_link,$HelferID)
|
|||
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
function LogSchichtEingabe($db_link, $HelferID, $SchichtId, $EinzelSchichtId, $Aktion, $AdminID = 0)
|
||||
{
|
||||
|
|
@ -445,7 +388,7 @@ function LogSchichtEingabe($db_link, $HelferID, $SchichtId, $EinzelSchichtId, $A
|
|||
|
||||
if (mysqli_num_rows($db_erg) > 1) {
|
||||
echo "HelferSchichtZuweisen: Es wurden mehr als eine Zeile zurueckgegeben\n <br>";
|
||||
# Fehler geht ins normale Error-Management, nicht ins Logfile
|
||||
// Fehler geht ins normale Error-Management, nicht ins Logfile
|
||||
error_log(date('Y-m-d H:i') . " HelferSchichtZuweisen: Es wurden mehr als eine Zeile zurueckgegben.\n", 0);
|
||||
} elseif (mysqli_num_rows($db_erg) == 1) {
|
||||
$row = mysqli_fetch_assoc($db_erg);
|
||||
|
|
@ -457,12 +400,9 @@ function LogSchichtEingabe($db_link, $HelferID, $SchichtId, $EinzelSchichtId, $A
|
|||
echo "Es wurde keine Zeile zurueckgegeben.";
|
||||
}
|
||||
|
||||
if($AdminID==0)
|
||||
{
|
||||
if ($AdminID == 0) {
|
||||
error_log(date('Y-m-d H:i') . " HelferSchicht: $HelferName (HelferID:$HelferID) hat Dienst $Was von $Von bis $Bis $Aktion.\n", 3, LOGFILE);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
error_log(date('Y-m-d H:i') . " HelferSchicht: Admin:$AdminID hat von $HelferName (HelferID:$HelferID) den Dienst $Was von $Von bis $Bis $Aktion.\n", 3, LOGFILE);
|
||||
}
|
||||
}
|
||||
|
|
@ -489,8 +429,7 @@ function HelferSchichtZuweisen($db_link,$HelferID,$SchichtId,$AdminID=0)
|
|||
//echo '<script> console.log("Schicht zuweiweisen: '.$sql.'")</script>';
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "HelferSchichtZuweisen ungueltige Abfrage";
|
||||
echo $HelferID;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -498,8 +437,7 @@ function HelferSchichtZuweisen($db_link,$HelferID,$SchichtId,$AdminID=0)
|
|||
LogSchichtEingabe($db_link, $HelferID, $SchichtId, -1, "eingetragen", $AdminID);
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
function HelferVonSchichtLoeschen($db_link, $HelferID, $EinzelSchichtID, $AdminID = 0)
|
||||
{
|
||||
|
|
@ -517,8 +455,7 @@ function HelferVonSchichtLoeschen($db_link,$HelferID,$EinzelSchichtID,$AdminID=0
|
|||
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
function HelferVonSchichtLoeschen_SchichtID($db_link, $HelferID, $SchichtID, $AdminID = 0)
|
||||
{
|
||||
|
|
@ -535,8 +472,7 @@ function HelferVonSchichtLoeschen_SchichtID($db_link,$HelferID,$SchichtID,$Admin
|
|||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -552,8 +488,7 @@ function DetailSchicht($db_link,$InfoSchichtID)
|
|||
//echo $sql;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Details ungueltige Abfrage ";
|
||||
echo $InfoSchichtID;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -561,8 +496,7 @@ function DetailSchicht($db_link,$InfoSchichtID)
|
|||
|
||||
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||
return $zeile;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
function BeteiligteHelfer($db_link, $InfoSchichtID)
|
||||
|
|
@ -573,23 +507,20 @@ function BeteiligteHelfer($db_link,$InfoSchichtID)
|
|||
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Details ungueltige Abfrage ";
|
||||
echo $InfoSchichtID;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
|
||||
return $db_erg;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
function GetDienste($db_link)
|
||||
{
|
||||
$sql = "SELECT DienstID, Was, Wo, Info, Leiter, ElternDienstID, HelferLevel FROM Dienst order By Was";
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "GetDienste ungueltige Abfrage";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
|
|
@ -602,8 +533,7 @@ function GetDiensteChilds($db_link,$DienstID)
|
|||
|
||||
$sql = "SELECT DienstID, Was, Wo, Info, Leiter FROM Dienst where ElternDienstID='" . $DienstID . "' order by Was";
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "GetDienste ungueltige Abfrage";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
|
|
@ -624,8 +554,7 @@ function ChangeDienst($db_link,$DienstID,$Was,$Wo,$Info,$Leiter,$Gruppe,$HelferL
|
|||
$sql = "UPDATE Dienst SET Was='" . $Was . "', Wo='" . $Wo . "', Info='" . $Info . "', Leiter=" . $Leiter . ", ElternDienstID=" . $Gruppe . " where DienstID=" . $DienstID;
|
||||
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Fehler Change Dienst";
|
||||
echo $sql;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -647,14 +576,12 @@ function NewDienst($db_link,$DienstID,$Was,$Wo,$Info,$Leiter,$Gruppe,$HelferLeve
|
|||
$sql = "INSERT INTO Dienst (Was, Wo, Info, Leiter, ElternDienstID, HelferLevel) values ('$Was','$Wo','$Info',$Leiter,$Gruppe,$HelferLevel)";
|
||||
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Fehler New Dienst";
|
||||
// echo $sql;
|
||||
$err = mysqli_error($db_link);
|
||||
die('Ungueltige Abfrage: ' . $err);
|
||||
error_log(date('Y-m-d H:i') . " NeueSchicht: $HelferName konnte Schicht nicht angelegt mit Anfrage $sql Grund: $err \n", 3, LOGFILE);
|
||||
|
||||
} else {
|
||||
error_log(date('Y-m-d H:i') . " NeueSchicht: $HelferName(ID:HelferID) hat Dienst angelegt mit Was: $WAS Wo: $Wo Info: $Info Leiter: $Leiter Gruppe $Gruppe, HelferLevel $HelferLevel \n", 3, LOGFILE);
|
||||
}
|
||||
|
|
@ -665,43 +592,32 @@ function DeleteDienst($db_link,$DienstID,$Rekursiv)
|
|||
$DienstID = mysqli_real_escape_string($db_link, $DienstID);
|
||||
|
||||
|
||||
if ($Rekursiv)
|
||||
{
|
||||
if ($Rekursiv) {
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Pruefen ob noch Schichten eingetragen sind
|
||||
$sql = "SELECT SchichtID FROM Schicht where DienstID=" . $DienstID;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Fehler DeleteDienst";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
|
||||
if( mysqli_num_rows($db_erg)==0)
|
||||
{
|
||||
|
||||
if (mysqli_num_rows($db_erg) == 0) {
|
||||
// Eintrag löschen
|
||||
$sql = "DELETE FROM Dienst where DienstID=" . $DienstID;
|
||||
|
||||
echo $sql;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Fehler DeleteDienst";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
return true;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function GetSchichtenEinesDienstes($db_link, $DienstID)
|
||||
|
|
@ -712,8 +628,7 @@ function GetSchichtenEinesDienstes($db_link,$DienstID)
|
|||
//$sql = "SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon FROM Schicht where DienstID=".$DienstID;
|
||||
$sql = "SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon, DATE_FORMAT(Von,'%H:%i') AS ZeitVon, DATE_FORMAT(Bis,'%H:%i') AS ZeitBis FROM Schicht where DienstID=" . $DienstID;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "GetSchichtenEinesDienstes ungueltige Abfrage";
|
||||
echo $sql;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -732,8 +647,7 @@ function ChangeSchicht($db_link,$SchichtID,$Von,$Bis,$Soll)
|
|||
$sql = "UPDATE Schicht SET Von='" . $Von . "', Bis='" . $Bis . "', Soll='" . $Soll . "' where SchichtID=" . $SchichtID;
|
||||
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Fehler ChangeSchicht";
|
||||
echo $sql;
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
|
|
@ -763,15 +677,13 @@ function NewSchicht($db_link,$DienstID,$Von,$Bis,$Soll)
|
|||
$sql = "INSERT INTO Schicht (DienstID, Von, Bis, Soll) values ('" . $DienstID . "','" . $Von . "','" . $Bis . "'," . $Soll . ")";
|
||||
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Keine Schicht erstellt";
|
||||
//echo $sql;
|
||||
error_log(date('Y-m-d H:i') . " NeueSchicht: $HelferName konnte Schicht nicht angelegt mit $sql \n", 3, LOGFILE);
|
||||
$err = mysqli_error($db_link);
|
||||
die('Ungueltige Abfrage: ' . $err);
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
//TODO: DienstID aufloesen
|
||||
error_log(date('Y-m-d H:i') . " NeueSchicht: $HelferName hat Schicht angelegt mit DienstID $DienstID, Von $Von Bis $Bis Soll $Soll \n", 3, LOGFILE);
|
||||
}
|
||||
|
|
@ -781,38 +693,29 @@ function DeleteSchicht($db_link,$SchichtID,$Rekursiv)
|
|||
{
|
||||
$SchichtID = mysqli_real_escape_string($db_link, $SchichtID);
|
||||
|
||||
if ($Rekursiv)
|
||||
{
|
||||
if ($Rekursiv) {
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Pruefen ob noch Helfer auf der Schicht eingetragen sind
|
||||
$sql = "SELECT Name FROM EinzelSchicht,Helfer where SchichtID=" . $SchichtID . " and Helfer.HelferID=EinzelSchicht.HelferID";
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Fehler Change Dienst";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
|
||||
if( mysqli_num_rows($db_erg)==0)
|
||||
{
|
||||
|
||||
if (mysqli_num_rows($db_erg) == 0) {
|
||||
// Eintrag löschen
|
||||
$sql = "DELETE FROM Schicht where SchichtID=" . $SchichtID;
|
||||
|
||||
echo $sql;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Fehler Change Dienst";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -820,17 +723,14 @@ function DeleteSchicht($db_link,$SchichtID,$Rekursiv)
|
|||
|
||||
|
||||
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";
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "AlleHelferSchichtenUebersicht ungueltige Abfrage";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
return $db_erg;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -839,19 +739,18 @@ function DatenbankAufDeutsch($db_link)
|
|||
$sql = "SET lc_time_names = 'de_DE'";
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "ungueltiges umstellen auf Deutsch";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
function HelferLevel($db_link){
|
||||
function HelferLevel($db_link)
|
||||
{
|
||||
$sql = "select HelferLevel,HelferLevelBeschreibung from HelferLevel";
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
if (! $db_erg) {
|
||||
echo "Konnte HelferLevel nicht abfragen";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
|
|
@ -882,27 +781,27 @@ function DebugAusgabeDbErgebnis($db_erg)
|
|||
{
|
||||
// Ausgabe auf Browser Console
|
||||
|
||||
#if(mysqli_num_rows($db_erg) > 0) {
|
||||
# $fields = mysqli_fetch_fields($db_erg);
|
||||
# $field_names = [];
|
||||
# foreach($fields as $field) {
|
||||
# $field_names[] = $field->name;
|
||||
# }
|
||||
# $rows = array();
|
||||
# while($row = mysqli_fetch_row($db_erg)) {
|
||||
# $rows[] = $row;
|
||||
# }
|
||||
#
|
||||
# $js_code = "console.log('Query results:');";
|
||||
# $js_code .= "console.log('" . implode('\t', $field_names) . "');";
|
||||
# foreach($rows as $row) {
|
||||
# $js_code .= "console.log('" . implode('\t', $row) . "');";
|
||||
# }
|
||||
# echo "<script>" . $js_code . "</script>";
|
||||
#} else {
|
||||
# echo "Keine Ergebnisse gefunden.";
|
||||
#}
|
||||
#
|
||||
// if(mysqli_num_rows($db_erg) > 0) {
|
||||
// $fields = mysqli_fetch_fields($db_erg);
|
||||
// $field_names = [];
|
||||
// foreach($fields as $field) {
|
||||
// $field_names[] = $field->name;
|
||||
// }
|
||||
// $rows = array();
|
||||
// while($row = mysqli_fetch_row($db_erg)) {
|
||||
// $rows[] = $row;
|
||||
// }
|
||||
//
|
||||
// $js_code = "console.log('Query results:');";
|
||||
// $js_code .= "console.log('" . implode('\t', $field_names) . "');";
|
||||
// foreach($rows as $row) {
|
||||
// $js_code .= "console.log('" . implode('\t', $row) . "');";
|
||||
// }
|
||||
// echo "<script>" . $js_code . "</script>";
|
||||
// } else {
|
||||
// echo "Keine Ergebnisse gefunden.";
|
||||
// }
|
||||
//
|
||||
|
||||
|
||||
// direkte ausgabe in Seite
|
||||
|
|
@ -929,7 +828,3 @@ if(mysqli_num_rows($db_erg) > 0) {
|
|||
}
|
||||
echo "</table>";
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
<?php
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
include '_crypt.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
require '_crypt.php';
|
||||
|
||||
|
||||
$head = "<!doctype html>
|
||||
|
|
@ -17,30 +17,30 @@ $db_link = mysqli_connect (
|
|||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
# ist jetzt in _crypt.php, aber aus der anderen Datei, deshalb hier erst
|
||||
# nur auskommentiert
|
||||
#function Entschluessle($encrypted_data,$secret_verification,$secret_key){
|
||||
#
|
||||
# // Erstellen eines Cipher-Objekts für die Verschlüsselung
|
||||
# $cipher_method = "AES-256-CBC";
|
||||
# $iv_length = openssl_cipher_iv_length($cipher_method);
|
||||
# $cipher_options = OPENSSL_RAW_DATA;
|
||||
# $cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
||||
#
|
||||
# // Entschlüsseln des verschlüsselten Textes
|
||||
# // zuerst base64 entfernen. *kein* urldecode, das passiert durch get/post automatisch
|
||||
# $decoded_cipher_text = base64_decode($encrypted_data);
|
||||
# $iv = substr($decoded_cipher_text, 0, $iv_length);
|
||||
# $cipher_text = substr($decoded_cipher_text, $iv_length);
|
||||
# $decrypted_email = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
#
|
||||
# // Verifikationsstring überprüfen und entfernen
|
||||
# $verification_length = strlen($secret_verification);
|
||||
# if(substr($decrypted_email, -$verification_length) == $secret_verification) {
|
||||
# $decrypted_email = substr($decrypted_email, 0, -$verification_length);
|
||||
# }
|
||||
# return($decrypted_email);
|
||||
#}
|
||||
// ist jetzt in _crypt.php, aber aus der anderen Datei, deshalb hier erst
|
||||
// nur auskommentiert
|
||||
// function Entschluessle($encrypted_data,$secret_verification,$secret_key){
|
||||
//
|
||||
// // Erstellen eines Cipher-Objekts für die Verschlüsselung
|
||||
// $cipher_method = "AES-256-CBC";
|
||||
// $iv_length = openssl_cipher_iv_length($cipher_method);
|
||||
// $cipher_options = OPENSSL_RAW_DATA;
|
||||
// $cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
||||
//
|
||||
// // Entschlüsseln des verschlüsselten Textes
|
||||
// // zuerst base64 entfernen. *kein* urldecode, das passiert durch get/post automatisch
|
||||
// $decoded_cipher_text = base64_decode($encrypted_data);
|
||||
// $iv = substr($decoded_cipher_text, 0, $iv_length);
|
||||
// $cipher_text = substr($decoded_cipher_text, $iv_length);
|
||||
// $decrypted_email = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
//
|
||||
// // Verifikationsstring überprüfen und entfernen
|
||||
// $verification_length = strlen($secret_verification);
|
||||
// if(substr($decrypted_email, -$verification_length) == $secret_verification) {
|
||||
// $decrypted_email = substr($decrypted_email, 0, -$verification_length);
|
||||
// }
|
||||
// return($decrypted_email);
|
||||
// }
|
||||
|
||||
if (isset($_GET['token']) || isset($_POST['token'])) {
|
||||
// E-Mail-Adresse des Nutzers
|
||||
|
|
@ -92,4 +92,3 @@ if($success == 1 && $email != ""){
|
|||
echo '<html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ SESSION_START();
|
|||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once 'konfiguration.php';
|
||||
//require_once ('SQL.php');
|
||||
include 'SQL.php';
|
||||
require 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
|
|
@ -40,8 +40,7 @@ if(isset($_POST['change'])) {
|
|||
// Eingaben überprüfen:
|
||||
|
||||
|
||||
if(strlen($_POST['helfer-newpasswort'])<8 and $_POST['helfer-newpasswort']!="")
|
||||
{
|
||||
if (strlen($_POST['helfer-newpasswort']) < 8 and $_POST['helfer-newpasswort'] != "") {
|
||||
$messages[] = 'Neues Passwort zu kurz';
|
||||
}
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -54,7 +53,6 @@ if(isset($_POST['change'])) {
|
|||
if (empty($messages)) {
|
||||
// Helferdaten Ändern
|
||||
HelferdatenAendern($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $HelferID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
|
|
@ -74,8 +72,7 @@ if(isset($_POST['change'])) {
|
|||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferEmail = $zeile['Email'];
|
||||
$HelferHandy = $zeile['Handy'];
|
||||
|
|
@ -83,16 +80,14 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
|
||||
/// Logout
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['logout']))
|
||||
{
|
||||
if (isset($_POST['logout'])) {
|
||||
unset($_SESSION["HelferID"]);
|
||||
//$_POST['login'] = 1;
|
||||
}
|
||||
|
||||
/// Login
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['login']))
|
||||
{
|
||||
if (isset($_POST['login'])) {
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -103,12 +98,9 @@ if(isset($_POST['login']))
|
|||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach ($messages as $message) {
|
||||
|
|
@ -116,7 +108,6 @@ if(isset($_POST['login']))
|
|||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -131,27 +122,27 @@ if(isset($_POST['login']))
|
|||
<form method="post">
|
||||
<tr>
|
||||
<td>Name</td></tr><tr><td>
|
||||
<input name="helfer-name" type="text" value="<?=htmlspecialchars($HelferName??'')?>" required>
|
||||
<input name="helfer-name" type="text" value="<?php echo htmlspecialchars($HelferName ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Email</td></tr><tr><td>
|
||||
<input name="helfer-email" type="email " value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="email " value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Handy</td></tr><tr><td>
|
||||
<input name="helfer-handy" type="tel" value="<?=htmlspecialchars($HelferHandy??'')?>" >
|
||||
<input name="helfer-handy" type="tel" value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Altes Helfer Passwort</td></tr><tr><td>
|
||||
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferPasswort??'')?>" >
|
||||
<input name="helfer-passwort" type="password" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Neues Helfer Passwort</td></tr><tr><td>
|
||||
<input name="helfer-newpasswort" type="text" value="<?=htmlspecialchars($HelferPasswort??'')?>" >
|
||||
<input name="helfer-newpasswort" type="text" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<?php
|
||||
function encode_string($key, $email, $level, $verification) {
|
||||
|
||||
function encode_string($key, $email, $level, $verification)
|
||||
{
|
||||
// String verification anfuegen am Ende, um abgeschnittene URLs zu verhindern
|
||||
$token_content = $email . '|' . $level . '|' . $verification;
|
||||
|
||||
|
|
@ -23,7 +25,8 @@ function encode_string($key, $email, $level, $verification) {
|
|||
return $encrypted_data;
|
||||
}
|
||||
|
||||
function decode_string($key, $encrypted_data, $verification) {
|
||||
function decode_string($key, $encrypted_data, $verification)
|
||||
{
|
||||
// Entschlüsseln des verschuesselten Textes
|
||||
// erst base64 entfernen - urldecode muss wenn noetig vorher angewendet werden
|
||||
$decoded_cipher_text = base64_decode($encrypted_data);
|
||||
|
|
@ -41,7 +44,9 @@ function decode_string($key, $encrypted_data, $verification) {
|
|||
|
||||
$decrypted_data = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
|
||||
if(isset($debug)){echo "<br> decrypted_data " . $decrypted_data." end<br>";}
|
||||
if (isset($debug)) {
|
||||
echo "<br> decrypted_data " . $decrypted_data . " end<br>";
|
||||
}
|
||||
$verification_length = strlen($verification);
|
||||
|
||||
if (substr($decrypted_data, -$verification_length) == $verification) {
|
||||
|
|
@ -58,4 +63,3 @@ function decode_string($key, $encrypted_data, $verification) {
|
|||
);
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,18 @@
|
|||
<?php
|
||||
/// Logout
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_GET['logout']) || isset($_POST['logout']))
|
||||
{
|
||||
if (isset($_GET['logout']) || isset($_POST['logout'])) {
|
||||
// remove all session variables
|
||||
session_unset();
|
||||
|
||||
// destroy the session
|
||||
session_destroy();
|
||||
echo '<!doctype html><html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
|
||||
}
|
||||
|
||||
/// Login
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['login']))
|
||||
{
|
||||
if (isset($_POST['login'])) {
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -28,12 +25,9 @@ if(isset($_POST['login']))
|
|||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach ($messages as $message) {
|
||||
|
|
@ -41,12 +35,9 @@ if(isset($_POST['login']))
|
|||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(!isset($_SESSION["HelferID"]))
|
||||
{
|
||||
|
||||
if (!isset($_SESSION["HelferID"])) {
|
||||
?>
|
||||
<form method="post" action="#Info">
|
||||
|
||||
|
|
@ -56,13 +47,13 @@ if(!isset($_SESSION["HelferID"]))
|
|||
<table border="0" style="border: 0px solid black;">
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Email</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="helfer-email" type="text" size=35 value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="text" size=35 value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Passwort</td></tr>
|
||||
<tr><td style="border: 0px solid black;">
|
||||
<input name="helfer-passwort" id="helfer-passwort" type="password" size=35 value="<?=htmlspecialchars($HelferHandy??'')?>" required>
|
||||
<input name="helfer-passwort" id="helfer-passwort" type="password" size=35 value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" required>
|
||||
</td><td style="border: 0px solid black;">
|
||||
<input type="button" value="Passwort zeigen" style="width:180px !important" onclick="showPassword('helfer-passwort')">
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
<?php
|
||||
require_once("../konfiguration.php");
|
||||
|
||||
require_once "../konfiguration.php";
|
||||
$options = [];
|
||||
$db = new PDO($dsn, MYSQL_BENUTZER, MYSQL_KENNWORT, $options);
|
||||
|
||||
function read($db, $requestParams){
|
||||
function read($db, $requestParams)
|
||||
{
|
||||
$queryParams = [];
|
||||
$queryText = "
|
||||
select Schicht.SchichtID as id,
|
||||
|
|
@ -54,4 +56,3 @@ switch ($_SERVER["REQUEST_METHOD"]) {
|
|||
}
|
||||
header("Content-Type: application/json");
|
||||
echo json_encode($result);
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
<?php
|
||||
require_once("../konfiguration.php");
|
||||
|
||||
require_once "../konfiguration.php";
|
||||
$options = [];
|
||||
SESSION_START();
|
||||
$db = new PDO($dsn, MYSQL_BENUTZER, MYSQL_KENNWORT, $options);
|
||||
if(!isset($_SESSION["HelferID"])){ exit ; }
|
||||
if (!isset($_SESSION["HelferID"])) {
|
||||
exit ;
|
||||
}
|
||||
$HelferID = $_SESSION["HelferID"];
|
||||
|
||||
function read_from_db($db, $requestParams,$HelferID){
|
||||
function read_from_db($db, $requestParams, $HelferID)
|
||||
{
|
||||
$queryParams = [];
|
||||
$queryText = "
|
||||
select Schicht.SchichtID as id,
|
||||
|
|
@ -52,4 +56,3 @@ switch ($_SERVER["REQUEST_METHOD"]) {
|
|||
}
|
||||
header("Content-Type: application/json");
|
||||
echo json_encode($result);
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
<?php
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
|
|
@ -25,7 +25,7 @@ $db_link = mysqli_connect (
|
|||
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
|
||||
// wird von _login.php miterledigt
|
||||
// TODO: hier wird HelferIsAdmin verwendet, woanders ist es AdminStatus
|
||||
|
|
@ -48,12 +48,9 @@ include '_login.php';
|
|||
<td > <img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;">
|
||||
<b>
|
||||
<?php
|
||||
if($HelferIsAdmin)
|
||||
{
|
||||
if ($HelferIsAdmin) {
|
||||
echo "Admin ";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "Helfer ";
|
||||
}
|
||||
echo $HelferName;
|
||||
|
|
@ -80,8 +77,7 @@ $db_erg = AlleSchichtenEinesHelfersVonJetzt($db_link,$HelferID);
|
|||
|
||||
|
||||
$iCount = 0;
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC) and $iCount<3)
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC) and $iCount < 3) {
|
||||
echo "<li>" . $zeile['Ab'] . " " . $zeile['Was'] . "</li>";
|
||||
$iCount++;
|
||||
}
|
||||
|
|
@ -140,8 +136,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC) and $iCount<3)
|
|||
|
||||
</tr>
|
||||
<?php
|
||||
if ($HelferIsAdmin)
|
||||
{
|
||||
if ($HelferIsAdmin) {
|
||||
?>
|
||||
<tr onclick="window.location.href='Admin.php';">
|
||||
<td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Admin</b></td>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
function showPassword(id) {
|
||||
function showPassword(id)
|
||||
{
|
||||
var x = document.getElementById(id);
|
||||
if (x.type === "password") {
|
||||
x.type = "text";
|
||||
|
|
@ -25,21 +26,29 @@ function showPassword(id) {
|
|||
//
|
||||
|
||||
//// collapse column rows that are not header
|
||||
function collapse_table_rows(){
|
||||
$(document).ready(function() {
|
||||
function collapse_table_rows()
|
||||
{
|
||||
$(document).ready(
|
||||
function () {
|
||||
$('tr:not(.header)').hide();
|
||||
|
||||
$('tr.header').click(function() {
|
||||
$(this).find('span').text(function(_, value) {
|
||||
$('tr.header').click(
|
||||
function () {
|
||||
$(this).find('span').text(
|
||||
function (_, value) {
|
||||
return value == '-' ? '+' : '-'
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
$(this).nextUntil('tr.header').slideToggle(100, function () {});
|
||||
});
|
||||
});
|
||||
}
|
||||
);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function expand_all_table_rows(){
|
||||
function expand_all_table_rows()
|
||||
{
|
||||
|
||||
$('tr:not(.header)').hide(); // make all collapsed so that slideToggle doesnt close opened ones
|
||||
$('tr:not(.header)').slideToggle(100, function () {});
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
|
||||
<?php
|
||||
// datenbank-defines extern
|
||||
require_once('/etc/helferdb_konfiguration.php');
|
||||
require_once '/etc/helferdb_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");
|
||||
// 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");
|
||||
|
|
@ -20,15 +20,15 @@ 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";
|
||||
// $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";
|
||||
// $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";
|
||||
// $urlprefix="https://meinserver.de/2023dev/UrlLogin.php";
|
||||
|
||||
|
||||
|
||||
|
|
@ -41,12 +41,9 @@ define('ZEITBEREICHWERTE', $ZeitBereichWerte);
|
|||
$TageNamenDeutsch = array("So","Mo","Di","Mi","Do","Fr","Sa");
|
||||
|
||||
//Kalender-Konfiguration
|
||||
$dsn = "mysql:host=localhost;dbname=".MYSQL_DATENBANK; # dsn fuer Kalender
|
||||
$dsn = "mysql:host=localhost;dbname=" . MYSQL_DATENBANK; // dsn fuer Kalender
|
||||
$options = array(
|
||||
PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'",
|
||||
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
|
||||
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
|
||||
);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue