Result from "php-cs-fixer fix html"
This commit is contained in:
parent
58d6aead69
commit
8256946c5f
|
|
@ -1 +1,2 @@
|
|||
*.pdf
|
||||
.php-cs-fixer.cache
|
||||
|
|
|
|||
|
|
@ -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>";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -57,10 +55,9 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
}
|
||||
|
||||
|
||||
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,8 +78,7 @@ 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'];
|
||||
|
|
@ -92,26 +88,20 @@ if(isset($_GET['InfoAlleSchichtID']))
|
|||
|
||||
}
|
||||
|
||||
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 +122,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'];
|
||||
}
|
||||
|
||||
|
|
@ -164,8 +153,7 @@ if(isset($_POST['plusschicht'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if(empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $AliasHelferID, $SchichtId, $AdminID);
|
||||
|
||||
|
|
@ -174,13 +162,10 @@ 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>';
|
||||
|
|
@ -195,18 +180,14 @@ 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>';
|
||||
|
|
@ -240,18 +221,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 +238,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 +246,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 +291,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>";
|
||||
|
|
@ -397,28 +345,22 @@ if($addschicht!='0')
|
|||
echo '</table>';
|
||||
echo '<table id="customers">';
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
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 +375,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,12 +400,9 @@ 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>";
|
||||
|
|
|
|||
|
|
@ -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'])) {
|
||||
|
|
@ -73,11 +72,9 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
}
|
||||
|
||||
|
||||
if(isset($_POST['DeleteDienst']))
|
||||
{
|
||||
if(isset($_POST['DeleteDienst'])) {
|
||||
|
||||
if (!DeleteDienst($db_link,$DienstID,false))
|
||||
{
|
||||
if (!DeleteDienst($db_link, $DienstID, false)) {
|
||||
echo "Erst Schichten des Dienstes Löschen!";
|
||||
}
|
||||
|
||||
|
|
@ -109,8 +106,7 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
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 +153,12 @@ $Leiter="";
|
|||
$Gruppe = "";
|
||||
$HelferLevel = "";
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
|
||||
if ($zeile['DienstID']!=$DienstID)
|
||||
{
|
||||
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'];
|
||||
|
|
@ -214,15 +206,11 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
<?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>";
|
||||
|
||||
}
|
||||
|
|
@ -238,16 +226,12 @@ 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))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
|
||||
if ($zeile['DienstID']!=$Gruppe)
|
||||
{
|
||||
if ($zeile['DienstID'] != $Gruppe) {
|
||||
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
||||
|
||||
}
|
||||
|
|
@ -260,8 +244,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 +273,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'];
|
||||
|
|
|
|||
|
|
@ -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>";
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -53,10 +51,9 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
}
|
||||
|
||||
|
||||
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,8 +74,7 @@ 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'];
|
||||
|
|
@ -88,17 +84,14 @@ if(isset($_GET['InfoAlleSchichtID']))
|
|||
|
||||
}
|
||||
|
||||
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 +117,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'];
|
||||
}
|
||||
|
||||
|
|
@ -190,8 +182,7 @@ if(isset($_POST['sent'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if(empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $AliasHelferID, $SchichtId, $HelferID);
|
||||
|
||||
|
|
@ -200,13 +191,10 @@ 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>';
|
||||
|
|
@ -226,8 +214,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,8 +237,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\';" >';
|
||||
|
|
|
|||
|
|
@ -15,17 +15,14 @@ if($AdminStatus != 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>";
|
||||
}
|
||||
}
|
||||
|
|
@ -75,8 +72,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,13 +82,10 @@ 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)) {
|
||||
|
|
@ -114,8 +107,7 @@ if(isset($_POST['change'])) {
|
|||
// Helfer Loeschen
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['del']))
|
||||
{
|
||||
if(isset($_POST['del'])) {
|
||||
HelferLoeschen($db_link, $AliasHelferID, $AdminID);
|
||||
}
|
||||
|
||||
|
|
@ -126,8 +118,7 @@ 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'];
|
||||
|
|
@ -176,7 +167,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>
|
||||
|
|
|
|||
|
|
@ -37,15 +37,13 @@ include '_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);
|
||||
|
|
@ -61,10 +59,9 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
}
|
||||
|
||||
|
||||
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,8 +82,7 @@ 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'];
|
||||
|
|
@ -96,12 +92,9 @@ if(isset($_GET['InfoAlleSchichtID']))
|
|||
|
||||
}
|
||||
|
||||
if(isset($_GET['ZeitBereich']))
|
||||
{
|
||||
if(isset($_GET['ZeitBereich'])) {
|
||||
$ZeitBereich = $_GET['ZeitBereich'];
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$ZeitBereich = 1;
|
||||
}
|
||||
|
||||
|
|
@ -132,8 +125,7 @@ if(isset($_POST['plusschicht'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if(empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
||||
|
||||
|
|
@ -142,13 +134,10 @@ 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>';
|
||||
|
|
@ -163,18 +152,14 @@ 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>';
|
||||
|
|
@ -208,18 +193,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 +210,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 +218,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 +263,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>";
|
||||
}
|
||||
|
||||
|
|
@ -357,28 +309,22 @@ if($addschicht!='0')
|
|||
|
||||
echo '</table>';
|
||||
echo '<table id="customers">';
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
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 +339,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,12 +364,9 @@ 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>";
|
||||
|
|
|
|||
|
|
@ -46,15 +46,13 @@ 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>";
|
||||
|
|
@ -76,12 +74,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">';
|
||||
|
|
@ -100,8 +96,7 @@ 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 " ";
|
||||
|
|
@ -124,12 +119,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">';
|
||||
|
|
|
|||
|
|
@ -33,8 +33,10 @@ if(isset($_POST['sent'])) {
|
|||
$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 +56,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 +83,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 {
|
||||
|
|
@ -151,7 +147,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 = "";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,8 +113,12 @@ 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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -56,10 +54,9 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
}
|
||||
|
||||
|
||||
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,8 +77,7 @@ 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'];
|
||||
|
|
@ -94,16 +90,14 @@ if(isset($_GET['InfoAlleSchichtID']))
|
|||
|
||||
/// 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 +108,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) {
|
||||
|
|
@ -132,8 +123,7 @@ if(isset($_POST['login']))
|
|||
|
||||
|
||||
|
||||
if(!isset($_SESSION["HelferID"]))
|
||||
{
|
||||
if(!isset($_SESSION["HelferID"])) {
|
||||
|
||||
?>
|
||||
<form method="post" action="#Info">
|
||||
|
|
@ -170,8 +160,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'])) {
|
||||
|
|
@ -254,8 +243,7 @@ if(isset($_POST['sent'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if(empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
||||
|
||||
|
|
@ -264,13 +252,10 @@ 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>';
|
||||
|
|
@ -290,8 +275,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,8 +298,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\';" >';
|
||||
|
|
|
|||
|
|
@ -31,8 +31,7 @@
|
|||
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'];
|
||||
}
|
||||
|
|
|
|||
201
html/SQL.php
201
html/SQL.php
|
|
@ -3,7 +3,8 @@
|
|||
|
||||
require_once('konfiguration.php');
|
||||
|
||||
function ConnectDB(){
|
||||
function ConnectDB()
|
||||
{
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
|
|
@ -36,7 +37,8 @@ function CreateHelfer($db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPas
|
|||
};
|
||||
|
||||
// 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);
|
||||
|
|
@ -56,18 +58,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,9 +74,7 @@ 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;
|
||||
}
|
||||
|
|
@ -93,8 +90,7 @@ 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));
|
||||
}
|
||||
|
|
@ -111,8 +107,7 @@ 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));
|
||||
|
|
@ -132,58 +127,42 @@ 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));
|
||||
|
|
@ -202,19 +181,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));
|
||||
|
|
@ -234,8 +209,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));
|
||||
|
|
@ -255,8 +229,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));
|
||||
|
|
@ -283,8 +256,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));
|
||||
|
|
@ -305,8 +277,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));
|
||||
|
|
@ -324,8 +295,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,26 +304,20 @@ 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;
|
||||
}
|
||||
|
|
@ -388,8 +352,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));
|
||||
|
|
@ -410,8 +373,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;
|
||||
|
|
@ -457,12 +419,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 +448,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));
|
||||
|
|
@ -552,8 +510,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));
|
||||
|
|
@ -573,8 +530,7 @@ 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));
|
||||
|
|
@ -588,8 +544,7 @@ 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 +557,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 +578,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,8 +600,7 @@ 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);
|
||||
|
|
@ -665,39 +617,31 @@ 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;
|
||||
}
|
||||
}
|
||||
|
|
@ -712,8 +656,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 +675,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 +705,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 +721,30 @@ 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,12 +752,10 @@ 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));
|
||||
}
|
||||
|
|
@ -839,19 +769,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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)) {
|
||||
|
|
@ -74,8 +73,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 +81,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 +99,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) {
|
||||
|
|
|
|||
|
|
@ -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,8 +1,7 @@
|
|||
<?php
|
||||
/// Logout
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_GET['logout']) || isset($_POST['logout']))
|
||||
{
|
||||
if(isset($_GET['logout']) || isset($_POST['logout'])) {
|
||||
// remove all session variables
|
||||
session_unset();
|
||||
|
||||
|
|
@ -14,8 +13,7 @@ if(isset($_GET['logout']) || isset($_POST['logout']))
|
|||
|
||||
/// 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 +26,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) {
|
||||
|
|
@ -44,8 +39,7 @@ if(isset($_POST['login']))
|
|||
|
||||
}
|
||||
|
||||
if(!isset($_SESSION["HelferID"]))
|
||||
{
|
||||
if(!isset($_SESSION["HelferID"])) {
|
||||
|
||||
?>
|
||||
<form method="post" action="#Info">
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
<?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");
|
||||
$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);
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue