Result from "php-cs-fixer fix html"
This commit is contained in:
parent
58d6aead69
commit
8256946c5f
|
|
@ -1 +1,2 @@
|
|||
*.pdf
|
||||
.php-cs-fixer.cache
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
$db_link = ConnectDB();
|
||||
include '_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;
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
<!doctype html>
|
||||
|
|
@ -28,33 +28,29 @@ if($AdminStatus != 1) {
|
|||
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
$AliasHelferID=0;
|
||||
$AliasHelferID = 0;
|
||||
|
||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||
if(isset($_SESSION["AliasHelferID"]))
|
||||
{
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
if(isset($_SESSION["AliasHelferID"])) {
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
}
|
||||
|
||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||
|
||||
if(isset($_POST["AliasHelfer"]))
|
||||
{
|
||||
$AliasHelferID = $_POST["AliasHelfer"];
|
||||
//echo "post<br>";
|
||||
if(isset($_POST["AliasHelfer"])) {
|
||||
$AliasHelferID = $_POST["AliasHelfer"];
|
||||
//echo "post<br>";
|
||||
}
|
||||
|
||||
if($AliasHelferID!=0)
|
||||
{
|
||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
||||
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))
|
||||
{
|
||||
$HelferName=$zeile['Name'];
|
||||
$HelferIsAdmin=$zeile['Admin'];
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -87,21 +83,17 @@ 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'])
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
}
|
||||
$db_erg = HelferListe($db_link);
|
||||
while($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($AliasHelferID != $zeile['HelferID']) {
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
} else {
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
?>
|
||||
</select></form>
|
||||
</b>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
$db_link = ConnectDB();
|
||||
include '_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;
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
<!doctype html>
|
||||
|
|
@ -30,111 +30,100 @@ if($AdminStatus != 1) {
|
|||
<button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>↩</b></button>
|
||||
<div style="width: 100%;">
|
||||
<?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']))
|
||||
{
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
||||
if(isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer=$zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link, $InfoAlleSchichtID);
|
||||
|
||||
|
||||
$x = 0;
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$MitHelferID[$x] = $zeile['HelferID'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
$x=0;
|
||||
|
||||
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']))
|
||||
{
|
||||
$ZeitBereich = $_GET['ZeitBereich'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$ZeitBereich = 1;
|
||||
if(isset($_GET['ZeitBereich'])) {
|
||||
$ZeitBereich = $_GET['ZeitBereich'];
|
||||
} else {
|
||||
$ZeitBereich = 1;
|
||||
}
|
||||
|
||||
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))
|
||||
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
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']) {
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
} else {
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
}
|
||||
echo '</select></form>';
|
||||
}
|
||||
echo '</select></form>';
|
||||
}
|
||||
|
||||
if(isset($_POST['AliasHelfer'])) {
|
||||
$AliasHelferID=$_POST['AliasHelfer'];
|
||||
}elseif(isset($_SESSION["AliasHelferID"])){
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
}else{
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
exit;
|
||||
$AliasHelferID = $_POST['AliasHelfer'];
|
||||
} elseif(isset($_SESSION["AliasHelferID"])) {
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
} else {
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
exit;
|
||||
}
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
|
||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
||||
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
$db_erg=Helferdaten($db_link,$HelferID);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$HelferName=$zeile['Name'];
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
}
|
||||
|
||||
// Helferliste Anzeigen
|
||||
|
|
@ -153,64 +142,56 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if(isset($_POST['plusschicht'])) {
|
||||
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['plusschicht'];
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
// if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
// }
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['plusschicht'];
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
// if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link,$AliasHelferID,$SchichtId,$AdminID);
|
||||
if(empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $AliasHelferID, $SchichtId, $AdminID);
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(isset($_POST['minusschicht'])) {
|
||||
// Mich aus Schicht entfernen
|
||||
$messages = [];
|
||||
// Mich aus Schicht entfernen
|
||||
$messages = [];
|
||||
|
||||
$SchichtID = $_POST['minusschicht'];
|
||||
$SchichtID = $_POST['minusschicht'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
// Helfer aus Schicht entfernen
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link,$AliasHelferID,$SchichtID,$AdminID);
|
||||
if(empty($messages)) {
|
||||
// Helfer aus Schicht entfernen
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $AliasHelferID, $SchichtID, $AdminID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -223,263 +204,218 @@ if(isset($_POST['minusschicht'])) {
|
|||
|
||||
|
||||
// Zusammenfassung Eigener Schichten
|
||||
$db_erg = SchichtenSummeEinesHelfers($db_link,$AliasHelferID);
|
||||
$zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC);
|
||||
|
||||
echo '<table id="customers"><tr class="header"><th onclick="window.location.href=\'AdminMeineSchichten.php\'">';
|
||||
echo " Dienstplan von $HelferName (Zusammenfassung)<br>";
|
||||
echo $zeile['Anzahl'];
|
||||
echo " Schichten insgesamt ";
|
||||
echo $zeile['Dauer']/3600;
|
||||
echo " Stunden";
|
||||
echo '</th></tr></table><br><br>';
|
||||
$db_erg = SchichtenSummeEinesHelfers($db_link, $AliasHelferID);
|
||||
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||
|
||||
echo '<table id="customers"><tr class="header"><th onclick="window.location.href=\'AdminMeineSchichten.php\'">';
|
||||
echo " Dienstplan von $HelferName (Zusammenfassung)<br>";
|
||||
echo $zeile['Anzahl'];
|
||||
echo " Schichten insgesamt ";
|
||||
echo $zeile['Dauer'] / 3600;
|
||||
echo " Stunden";
|
||||
echo '</th></tr></table><br><br>';
|
||||
/// Schichten Auswahl
|
||||
////////////////////////////////////////////////////////
|
||||
$addschicht =$_SESSION["addschicht"];
|
||||
$dienstsort =$_SESSION["dienstsort"];
|
||||
$addschicht = $_SESSION["addschicht"];
|
||||
$dienstsort = $_SESSION["dienstsort"];
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='1')
|
||||
{
|
||||
$addschicht='1';
|
||||
$dienstsort='1';
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '1') {
|
||||
$addschicht = '1';
|
||||
$dienstsort = '1';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='2')
|
||||
{
|
||||
$addschicht='2';
|
||||
$dienstsort='2';
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '2') {
|
||||
$addschicht = '2';
|
||||
$dienstsort = '2';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='0')
|
||||
{
|
||||
$addschicht='0';
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '0') {
|
||||
$addschicht = '0';
|
||||
}
|
||||
|
||||
$_SESSION["addschicht"] =$addschicht;
|
||||
$_SESSION["dienstsort"] =$dienstsort;
|
||||
$_SESSION["addschicht"] = $addschicht;
|
||||
$_SESSION["dienstsort"] = $dienstsort;
|
||||
|
||||
//echo "<br>Detail=".$addschicht."<br>";
|
||||
|
||||
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>";
|
||||
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>";
|
||||
}
|
||||
|
||||
//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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2200-05-19 00:00:00",-1);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2023-05-18 00:00:00",-1);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",-1);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-19 00:00:00","2023-05-20 00:00:00",-1);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-20 00:00:00","2023-05-21 00:00:00",-1);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-21 00:00:00","2023-05-22 00:00:00",-1);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-22 00:00:00","2223-05-22 00:00:00",-1);
|
||||
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
|
||||
$iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
||||
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
||||
|
||||
|
||||
//echo "<p><button name='addschicht' value='0'><b>↩</b></button></p>";
|
||||
echo '<table id="customers">';
|
||||
echo "<thead>";
|
||||
echo "<tr>";
|
||||
echo "</tr><th colspan='7'>". "Alle Schichten der Con (" . $iBelegteSchichtenCount."/".$iAlleSchichtenCount. ")</th></tr>";
|
||||
//echo "<p><button name='addschicht' value='0'><b>↩</b></button></p>";
|
||||
echo '<table id="customers">';
|
||||
echo "<thead>";
|
||||
echo "<tr>";
|
||||
echo "</tr><th colspan='7'>". "Alle Schichten der Con (" . $iBelegteSchichtenCount."/".$iAlleSchichtenCount. ")</th></tr>";
|
||||
|
||||
/*
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
echo "<th>". "Dienst" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th>". "Von" . "</th>";
|
||||
}
|
||||
*/
|
||||
if ($ZeitBereich==1)
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>". "Alle" . "</th>";
|
||||
echo "<th>". "Dienst" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th>". "Von" . "</th>";
|
||||
}
|
||||
*/
|
||||
if ($ZeitBereich == 1) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>". "Alle" . "</th>";
|
||||
} 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)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($ZeitBereich == 6) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||
} 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>";
|
||||
//echo "<th style='width:50px'>". "Do" . "</th>";
|
||||
//echo "<th style='width:50px'>". "Fr" . "</th>";
|
||||
//echo "<th style='width:50px'>". "Sa" . "</th>";
|
||||
//echo "<th style='width:50px'>". "Do" . "</th>";
|
||||
//echo "<th style='width:50px'>". "Fr" . "</th>";
|
||||
//echo "<th style='width:50px'>". "Sa" . "</th>";
|
||||
//echo "<th style='width:50px'>". "So" . "</th>";
|
||||
//echo "<th style='width:100px'>". "Danach" . "</th>";
|
||||
|
||||
|
||||
echo "</tr>";
|
||||
echo "</thead>";
|
||||
|
||||
echo "</thead>";
|
||||
|
||||
$OldTag = "";
|
||||
$OldWas = "";
|
||||
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link,$AliasHelferID);
|
||||
//print_r($MeineDienste);
|
||||
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link, $AliasHelferID);
|
||||
//print_r($MeineDienste);
|
||||
|
||||
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')
|
||||
{
|
||||
$Tag = $zeile['Tag'];
|
||||
|
||||
if ($Tag!=$OldTag)
|
||||
{
|
||||
echo "<tr class='header'><th colspan='5' >";
|
||||
echo $Tag;
|
||||
echo "</th></tr>";
|
||||
$OldTag = $Tag;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$Was = $zeile['Was'];
|
||||
|
||||
if ($Was!=$OldWas)
|
||||
{
|
||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||
echo $Was;
|
||||
echo "</th>";
|
||||
if ($dienstsort == '1') {
|
||||
$Tag = $zeile['Tag'];
|
||||
|
||||
if ($Tag != $OldTag) {
|
||||
echo "<tr class='header'><th colspan='5' >";
|
||||
echo $Tag;
|
||||
echo "</th></tr>";
|
||||
$OldTag = $Tag;
|
||||
}
|
||||
} else {
|
||||
$Was = $zeile['Was'];
|
||||
|
||||
if ($Was != $OldWas) {
|
||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||
echo $Was;
|
||||
echo "</th>";
|
||||
/*
|
||||
echo "<th style='width:100px'>". "Von" . "</th>";
|
||||
echo "<th style='width:130px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Ist/Soll" . "</th>";
|
||||
echo "<th style='width:90px'>". "Add" . "</th>";
|
||||
*/
|
||||
echo "<th style='width:100px'>". "Von" . "</th>";
|
||||
echo "<th style='width:130px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Ist/Soll" . "</th>";
|
||||
echo "<th style='width:90px'>". "Add" . "</th>";
|
||||
*/
|
||||
echo "</tr>";
|
||||
$OldWas = $Was;
|
||||
}
|
||||
}
|
||||
$Color="red";
|
||||
if ( $zeile['Ist'] > 0 )
|
||||
{
|
||||
$Color="yellow";
|
||||
}
|
||||
if ( $zeile['Ist'] >= $zeile['Soll'] )
|
||||
{
|
||||
$Color="green";
|
||||
}
|
||||
$Von = $zeile['Ab'];
|
||||
$Bis = $zeile['Bis'];
|
||||
if ( substr($Von,0,2) == substr($Bis,0,2))
|
||||
{
|
||||
$Bis = substr($Bis,2);
|
||||
}
|
||||
$Von = substr($Von,2);
|
||||
|
||||
// Meine Schichten gruen einfaerben
|
||||
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||
$rowstyle = ' style="background-color:lightgreen" ';
|
||||
$regtext = 'Meine!';
|
||||
} else {
|
||||
// dummy-style, um SchichtID unsichtbar im Tag anzuzeigen
|
||||
$rowstyle = 'style="dummy:'.$zeile['SchichtID'].'"';
|
||||
$regtext = '';
|
||||
}
|
||||
|
||||
echo '<tr '.$rowstyle.'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
echo "<td>". $zeile['Was'] . "</td>";
|
||||
}
|
||||
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
|
||||
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";
|
||||
$OldWas = $Was;
|
||||
}
|
||||
}
|
||||
$Color = "red";
|
||||
if ($zeile['Ist'] > 0) {
|
||||
$Color = "yellow";
|
||||
}
|
||||
if ($zeile['Ist'] >= $zeile['Soll']) {
|
||||
$Color = "green";
|
||||
}
|
||||
$Von = $zeile['Ab'];
|
||||
$Bis = $zeile['Bis'];
|
||||
if (substr($Von, 0, 2) == substr($Bis, 0, 2)) {
|
||||
$Bis = substr($Bis, 2);
|
||||
}
|
||||
$Von = substr($Von, 2);
|
||||
|
||||
}
|
||||
// Meine Schichten gruen einfaerben
|
||||
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||
$rowstyle = ' style="background-color:lightgreen" ';
|
||||
$regtext = 'Meine!';
|
||||
} else {
|
||||
// dummy-style, um SchichtID unsichtbar im Tag anzuzeigen
|
||||
$rowstyle = 'style="dummy:'.$zeile['SchichtID'].'"';
|
||||
$regtext = '';
|
||||
}
|
||||
|
||||
echo '<tr '.$rowstyle.'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
|
||||
if ($dienstsort == '1') {
|
||||
echo "<td>". $zeile['Was'] . "</td>";
|
||||
} 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
|
||||
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>";
|
||||
|
||||
|
||||
|
|
@ -491,7 +427,7 @@ if($addschicht!='0')
|
|||
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
$db_link = ConnectDB();
|
||||
include '_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;
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
<!doctype html>
|
||||
|
|
@ -28,111 +28,107 @@ if($AdminStatus != 1) {
|
|||
|
||||
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
$DienstID =$_SESSION["DienstID"];
|
||||
$SchichtID =$_SESSION["SchichtID"];
|
||||
|
||||
$DienstID = $_SESSION["DienstID"];
|
||||
$SchichtID = $_SESSION["SchichtID"];
|
||||
|
||||
|
||||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
if(isset($_POST['HelferID']))
|
||||
{
|
||||
$HelferID = $_POST['HelferID'];
|
||||
if(isset($_POST['HelferID'])) {
|
||||
$HelferID = $_POST['HelferID'];
|
||||
}
|
||||
if(isset($_POST['ShowHelfer'])) {
|
||||
$HelferID = $_POST['HelperSearch'];
|
||||
}
|
||||
if(isset($_POST['ShowHelfer'])) {
|
||||
$HelferID=$_POST['HelperSearch'];
|
||||
}
|
||||
|
||||
$_SESSION["HelferID"] = $HelferID;
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['ChangeDienst'])) {
|
||||
|
||||
$Was=$_POST['Dienst-Was'];
|
||||
$Wo=$_POST['Dienst-Wo'];
|
||||
$Info=$_POST['Dienst-Info'];
|
||||
$Leiter=$_POST['Dienst-Leiter'];
|
||||
$Gruppe=$_POST['Dienst-Gruppe'];
|
||||
$HelferLevel=$_POST['HelferLevel'];
|
||||
ChangeDienst($db_link,$DienstID,$Was,$Wo,$Info,$Leiter,$Gruppe,$HelferLevel);
|
||||
|
||||
}
|
||||
if(isset($_POST['ChangeDienst'])) {
|
||||
|
||||
if(isset($_POST['NewDienst'])) {
|
||||
|
||||
$Was=$_POST['Dienst-Was'];
|
||||
$Wo=$_POST['Dienst-Wo'];
|
||||
$Info=$_POST['Dienst-Info'];
|
||||
$Leiter=$_POST['Dienst-Leiter'];
|
||||
$Gruppe=$_POST['Dienst-Gruppe'];
|
||||
$HelferLevel=$_POST['HelferLevel'];
|
||||
NewDienst($db_link,$DienstID,$Was,$Wo,$Info,$Leiter,$Gruppe,$HelferLevel);
|
||||
|
||||
}
|
||||
$Was = $_POST['Dienst-Was'];
|
||||
$Wo = $_POST['Dienst-Wo'];
|
||||
$Info = $_POST['Dienst-Info'];
|
||||
$Leiter = $_POST['Dienst-Leiter'];
|
||||
$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'];
|
||||
$Leiter = $_POST['Dienst-Leiter'];
|
||||
$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))
|
||||
{
|
||||
echo "Erst Schichten des Dienstes Löschen!";
|
||||
}
|
||||
|
||||
}
|
||||
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['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['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))
|
||||
{
|
||||
echo "Erst Helfer aus Schicht austragen<br>";
|
||||
}
|
||||
|
||||
}
|
||||
if(isset($_POST['DeleteSchicht'])) {
|
||||
|
||||
|
||||
if(!DeleteSchicht($db_link, $SchichtID, false)) {
|
||||
echo "Erst Helfer aus Schicht austragen<br>";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['ShowSchicht'])) {
|
||||
$SchichtID=$_POST['SchichtSearch'];
|
||||
}
|
||||
if(isset($_POST['SchichtSearch'])) {
|
||||
$SchichtID=$_POST['SchichtSearch'];
|
||||
}
|
||||
if(isset($_POST['ShowSchicht'])) {
|
||||
$SchichtID = $_POST['SchichtSearch'];
|
||||
}
|
||||
if(isset($_POST['SchichtSearch'])) {
|
||||
$SchichtID = $_POST['SchichtSearch'];
|
||||
}
|
||||
|
||||
if(isset($_POST['ShowSchichten'])) {
|
||||
$DienstID=$_POST['DienstSearch'];
|
||||
}
|
||||
if(isset($_POST['ShowSchichten'])) {
|
||||
$DienstID = $_POST['DienstSearch'];
|
||||
}
|
||||
|
||||
if(isset($_POST['DienstSearch'])) {
|
||||
$DienstID=$_POST['DienstSearch'];
|
||||
$SchichtID=0;
|
||||
}
|
||||
if(isset($_POST['DienstSearch'])) {
|
||||
$DienstID = $_POST['DienstSearch'];
|
||||
$SchichtID = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -150,33 +146,29 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
|
||||
$db_erg = GetDienste($db_link);
|
||||
|
||||
$Was="";
|
||||
$Wo="";
|
||||
$Info="";
|
||||
$Leiter="";
|
||||
$Gruppe="";
|
||||
$HelferLevel="";
|
||||
$Was = "";
|
||||
$Wo = "";
|
||||
$Info = "";
|
||||
$Leiter = "";
|
||||
$Gruppe = "";
|
||||
$HelferLevel = "";
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
if ($zeile['DienstID']!=$DienstID)
|
||||
{
|
||||
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
||||
$Was=$zeile['Was'];
|
||||
$Wo=$zeile['Wo'];
|
||||
$Info=$zeile['Info'];
|
||||
$Leiter=$zeile['Leiter'];
|
||||
$Gruppe=$zeile['ElternDienstID'];
|
||||
$HelferLevel=$zeile['HelferLevel'];
|
||||
}
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
|
||||
if ($zeile['DienstID'] != $DienstID) {
|
||||
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
||||
|
||||
} else {
|
||||
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Info = $zeile['Info'];
|
||||
$Leiter = $zeile['Leiter'];
|
||||
$Gruppe = $zeile['ElternDienstID'];
|
||||
$HelferLevel = $zeile['HelferLevel'];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
echo "</select>";
|
||||
echo "</th></tr>";
|
||||
echo " </table>";
|
||||
|
|
@ -194,74 +186,70 @@ 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="<?=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="<?=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="<?=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??'')?>" > -->
|
||||
<?php
|
||||
<!-- <input name="Dienst-Leiter" type="text" value="<?=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)
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</option>";
|
||||
$db_erg = HelferListe($db_link);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($zeile['HelferID'] != $Leiter) {
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</option>";
|
||||
|
||||
}
|
||||
}
|
||||
echo "</select>";
|
||||
?>
|
||||
} else {
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</option>";
|
||||
|
||||
}
|
||||
}
|
||||
echo "</select>";
|
||||
?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Gruppe</td></tr><tr><td style="border: 0px solid black;">
|
||||
|
||||
<?php
|
||||
//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)
|
||||
{
|
||||
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
||||
<?php
|
||||
//echo "#####".$Gruppe."#####";
|
||||
echo "<select name='Dienst-Gruppe'>";
|
||||
$db_erg = GetDiensteChilds($db_link, 0);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
|
||||
}
|
||||
}
|
||||
echo "</select>";
|
||||
?>
|
||||
if ($zeile['DienstID'] != $Gruppe) {
|
||||
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
||||
|
||||
} else {
|
||||
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
||||
|
||||
}
|
||||
}
|
||||
echo "</select>";
|
||||
?>
|
||||
</td>
|
||||
</td>
|
||||
</tr>
|
||||
<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>
|
||||
|
|
@ -282,31 +270,26 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
<?php
|
||||
|
||||
|
||||
$Soll=1;
|
||||
$db_erg = GetSchichtenEinesDienstes($db_link,$DienstID);
|
||||
$Soll = 1;
|
||||
$db_erg = GetSchichtenEinesDienstes($db_link, $DienstID);
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($SchichtID == 0)
|
||||
{
|
||||
$SchichtID=$zeile['SchichtID'];
|
||||
}
|
||||
if ($zeile['SchichtID']!=$SchichtID)
|
||||
{
|
||||
echo "<option value='".$zeile['SchichtID']."'>".$zeile['TagVon']."</option>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['SchichtID']."' selected='selected'>".$zeile['TagVon']."</option>";
|
||||
$Von=$zeile['Von'];
|
||||
$Bis=$zeile['Bis'];
|
||||
$Soll=(int)$zeile['Soll'];
|
||||
}
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($SchichtID == 0) {
|
||||
$SchichtID = $zeile['SchichtID'];
|
||||
}
|
||||
if ($zeile['SchichtID'] != $SchichtID) {
|
||||
echo "<option value='".$zeile['SchichtID']."'>".$zeile['TagVon']."</option>";
|
||||
} else {
|
||||
echo "<option value='".$zeile['SchichtID']."' selected='selected'>".$zeile['TagVon']."</option>";
|
||||
$Von = $zeile['Von'];
|
||||
$Bis = $zeile['Bis'];
|
||||
$Soll = (int)$zeile['Soll'];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
echo "</select>";
|
||||
echo "</th></tr>";
|
||||
echo " </table>";
|
||||
echo " </table>";
|
||||
echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button></noscript>";
|
||||
//echo "<button name='DeleteSchicht' value='1'>Schicht löschen</button>";
|
||||
|
||||
|
|
@ -317,17 +300,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="<?=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="<?=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="<?=htmlspecialchars((int)$Soll ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</tr>
|
||||
|
|
@ -344,10 +327,10 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
|
|||
<?php
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
$_SESSION["DienstID"] = $DienstID;
|
||||
$_SESSION["DienstID"] = $DienstID;
|
||||
$_SESSION["SchichtID"] = $SchichtID;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
$db_link = ConnectDB();
|
||||
include '_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
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
<!doctype html>
|
||||
|
|
@ -33,7 +33,7 @@ if($AdminStatus != 1) {
|
|||
|
||||
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
|
||||
//$DienstID =$_SESSION["DienstID"];
|
||||
//$SchichtID =$_SESSION["SchichtID"];
|
||||
|
||||
|
|
@ -43,21 +43,21 @@ $AdminID = $_SESSION["AdminID"];
|
|||
$_SESSION["HelferID"] = $HelferID;
|
||||
|
||||
|
||||
if(isset($_POST['ShowSchicht'])) {
|
||||
$SchichtID=$_POST['SchichtSearch'];
|
||||
}
|
||||
if(isset($_POST['SchichtSearch'])) {
|
||||
$SchichtID=$_POST['SchichtSearch'];
|
||||
}
|
||||
if(isset($_POST['ShowSchicht'])) {
|
||||
$SchichtID = $_POST['SchichtSearch'];
|
||||
}
|
||||
if(isset($_POST['SchichtSearch'])) {
|
||||
$SchichtID = $_POST['SchichtSearch'];
|
||||
}
|
||||
|
||||
if(isset($_POST['ShowSchichten'])) {
|
||||
$DienstID=$_POST['DienstSearch'];
|
||||
}
|
||||
if(isset($_POST['ShowSchichten'])) {
|
||||
$DienstID = $_POST['DienstSearch'];
|
||||
}
|
||||
|
||||
if(isset($_POST['DienstSearch'])) {
|
||||
$DienstID=$_POST['DienstSearch'];
|
||||
$SchichtID=0;
|
||||
}
|
||||
if(isset($_POST['DienstSearch'])) {
|
||||
$DienstID = $_POST['DienstSearch'];
|
||||
$SchichtID = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -74,40 +74,38 @@ echo "<br><br><table class='commontable' style='page-break-before:always'>";
|
|||
<table class="commontable">
|
||||
<?php
|
||||
$db_erg = AlleHelferSchichtenUebersicht($db_link);
|
||||
$dauer=0;
|
||||
$i=0;
|
||||
$OldHelferName="";
|
||||
$EinzelDienstStunden="";
|
||||
$HelferUeberschrift="";
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$HelferName = $zeile["Name"];
|
||||
$AliasHelferID = $zeile["AliasHelferID"];
|
||||
//echo $HelferName." ".$AliasHelferID."<br>";
|
||||
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>";
|
||||
echo "<th ><div style='display:table'><form style='display:table-cell' action='AdminAlleSchichten.php' method='post'>";
|
||||
echo "<button width='120px' name='AliasHelfer' value='". $OldAliasHelferID ."'>+</button></form>\n";
|
||||
echo " ";
|
||||
echo "<form style='display:table-cell' action='AdminMeineSchichten.php' method='post'>";
|
||||
echo "<button width='120px' name='AliasHelfer' value='". $OldAliasHelferID ."'>–</button></form>";
|
||||
echo "</div></th>";
|
||||
$dauer=0;
|
||||
echo "$EinzelDienstStunden</td></tr>\n ";
|
||||
}
|
||||
$EinzelDienstStunden="";
|
||||
$HelferUeberschrift="<tr class='header'><th width='15%'>".$HelferName;
|
||||
$OldHelferName=$HelferName;
|
||||
$OldAliasHelferID=$AliasHelferID;
|
||||
$i+=1;
|
||||
$dauer = 0;
|
||||
$i = 0;
|
||||
$OldHelferName = "";
|
||||
$EinzelDienstStunden = "";
|
||||
$HelferUeberschrift = "";
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile["Name"];
|
||||
$AliasHelferID = $zeile["AliasHelferID"];
|
||||
//echo $HelferName." ".$AliasHelferID."<br>";
|
||||
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>";
|
||||
echo "<th ><div style='display:table'><form style='display:table-cell' action='AdminAlleSchichten.php' method='post'>";
|
||||
echo "<button width='120px' name='AliasHelfer' value='". $OldAliasHelferID ."'>+</button></form>\n";
|
||||
echo " ";
|
||||
echo "<form style='display:table-cell' action='AdminMeineSchichten.php' method='post'>";
|
||||
echo "<button width='120px' name='AliasHelfer' value='". $OldAliasHelferID ."'>–</button></form>";
|
||||
echo "</div></th>";
|
||||
$dauer = 0;
|
||||
echo "$EinzelDienstStunden</td></tr>\n ";
|
||||
}
|
||||
$EinzelDienstStunden.="<tr><td style='width:100px'> ".(int)$zeile["Dauer"]."</td><td>";
|
||||
$EinzelDienstStunden.= $zeile["Was"];
|
||||
$EinzelDienstStunden.= "</td></tr>";
|
||||
$dauer=$dauer+(int)$zeile["Dauer"];
|
||||
$EinzelDienstStunden = "";
|
||||
$HelferUeberschrift = "<tr class='header'><th width='15%'>".$HelferName;
|
||||
$OldHelferName = $HelferName;
|
||||
$OldAliasHelferID = $AliasHelferID;
|
||||
$i += 1;
|
||||
}
|
||||
$EinzelDienstStunden .= "<tr><td style='width:100px'> ".(int)$zeile["Dauer"]."</td><td>";
|
||||
$EinzelDienstStunden .= $zeile["Was"];
|
||||
$EinzelDienstStunden .= "</td></tr>";
|
||||
$dauer = $dauer + (int)$zeile["Dauer"];
|
||||
|
||||
}
|
||||
echo "$EinzelDienstStunden";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
$db_link = ConnectDB();
|
||||
include '_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;
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
<!doctype html>
|
||||
|
|
@ -29,137 +29,129 @@ 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']))
|
||||
{
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
||||
if(isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer=$zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link, $InfoAlleSchichtID);
|
||||
|
||||
|
||||
$x = 0;
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$MitHelferID[$x] = $zeile['HelferID'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
$x=0;
|
||||
|
||||
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){
|
||||
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))
|
||||
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
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']) {
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
} else {
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
}
|
||||
echo '</select></form>';
|
||||
}
|
||||
echo '</select></form>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['AliasHelfer'])) {
|
||||
$AliasHelferID=$_POST['AliasHelfer'];
|
||||
echo "AliasHelfer: $AliasHelferID<br>";
|
||||
}elseif(isset($_SESSION["AliasHelferID"])){
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
}else{
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
exit;
|
||||
$AliasHelferID = $_POST['AliasHelfer'];
|
||||
echo "AliasHelfer: $AliasHelferID<br>";
|
||||
} elseif(isset($_SESSION["AliasHelferID"])) {
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
} else {
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
exit;
|
||||
}
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
|
||||
|
||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
||||
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
$db_erg=Helferdaten($db_link,$AliasHelferID);
|
||||
$db_erg = Helferdaten($db_link, $AliasHelferID);
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$HelferName=$zeile['Name'];
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
}
|
||||
|
||||
/// Schicht Löschen
|
||||
////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['Del'])) {
|
||||
|
||||
$messages = [];
|
||||
|
||||
$EinzelSchichtID = $_POST['Del'];
|
||||
|
||||
|
||||
// Eingaben überprüfen:
|
||||
if(isset($_POST['Del'])) {
|
||||
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
|
||||
$messages = [];
|
||||
|
||||
if(empty($messages)) {
|
||||
$EinzelSchichtID = $_POST['Del'];
|
||||
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link,$AliasHelferID,$EinzelSchichtID,$HelferID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
// Eingaben überprüfen:
|
||||
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
|
||||
|
||||
if(empty($messages)) {
|
||||
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link, $AliasHelferID, $EinzelSchichtID, $HelferID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -179,40 +171,36 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if(isset($_POST['sent'])) {
|
||||
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['sent'];
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
// if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
// }
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['sent'];
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
// if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link,$AliasHelferID,$SchichtId,$HelferID);
|
||||
if(empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $AliasHelferID, $SchichtId, $HelferID);
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -223,45 +211,43 @@ if(isset($_POST['sent'])) {
|
|||
/// Alle Schichten Des Helfers Anzeigen
|
||||
////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
$db_erg = AlleSchichtenEinesHelfers($db_link,$AliasHelferID);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
echo "AlleSchichten des Helfes ungültige Abfrage";
|
||||
die('Ungültige Abfrage: ' . mysqli_error());
|
||||
$db_erg = AlleSchichtenEinesHelfers($db_link, $AliasHelferID);
|
||||
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichten des Helfes ungültige Abfrage";
|
||||
die('Ungültige Abfrage: ' . mysqli_error());
|
||||
}
|
||||
|
||||
$iSQLCount = mysqli_num_rows($db_erg);
|
||||
//$iSQLCount = 3;
|
||||
$iSQLCount = mysqli_num_rows($db_erg);
|
||||
//$iSQLCount = 3;
|
||||
|
||||
echo '<table id="customers">';
|
||||
|
||||
echo "<thead>";
|
||||
echo "<tr>";
|
||||
echo "<th colspan=1>". "Schichten von $HelferName (".$iSQLCount." Schichten)</th>";
|
||||
//echo "</tr><tr>";
|
||||
//echo "<th></th>";
|
||||
echo "<th style='width:180px'>". "Von" . "</th>";
|
||||
echo "<th style='width:180px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Del" . "</th>";
|
||||
echo "</tr>";
|
||||
echo "</thead>";
|
||||
echo "<thead>";
|
||||
echo "<tr>";
|
||||
echo "<th colspan=1>". "Schichten von $HelferName (".$iSQLCount." Schichten)</th>";
|
||||
//echo "</tr><tr>";
|
||||
//echo "<th></th>";
|
||||
echo "<th style='width:180px'>". "Von" . "</th>";
|
||||
echo "<th style='width:180px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Del" . "</th>";
|
||||
echo "</tr>";
|
||||
echo "</thead>";
|
||||
|
||||
|
||||
|
||||
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 '<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>";
|
||||
echo "<td>". $zeile['Ab'] . "</td>";
|
||||
echo "<td>". $zeile['Bis'] . "</td>";
|
||||
echo "<td>". "<p><button title='Schicht entfernen' name='Del' value='". $zeile['EinzelSchichtID'] ."'>-</button></p>" . "</td>";
|
||||
echo "</tr>";
|
||||
echo "</tr>";
|
||||
|
||||
}
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
echo "<br><br>";
|
||||
|
|
@ -270,13 +256,13 @@ $iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
|||
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
||||
|
||||
echo '<table id="customers" onclick="window.location.href=\'AdminAlleSchichten.php\'">';
|
||||
echo "<tr>";
|
||||
echo "<th>". "Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
||||
echo "</tr>";
|
||||
echo "<tr>";
|
||||
echo "<th>". "Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
||||
echo "</tr>";
|
||||
echo "</table>";
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,48 +1,45 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
$db_link = ConnectDB();
|
||||
include '_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;
|
||||
//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){
|
||||
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))
|
||||
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
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']) {
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
} else {
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
}
|
||||
echo '</select></form>';
|
||||
}
|
||||
echo '</select></form>';
|
||||
}
|
||||
|
||||
if(isset($_POST['AliasHelfer'])) {
|
||||
$AliasHelferID=$_POST['AliasHelfer'];
|
||||
}elseif(isset($_SESSION["AliasHelferID"])){
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
}else{
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
exit;
|
||||
$AliasHelferID = $_POST['AliasHelfer'];
|
||||
} elseif(isset($_SESSION["AliasHelferID"])) {
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
} else {
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
exit;
|
||||
}
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
|
||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
||||
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
echo "Admin=$AdminID<br>";
|
||||
|
|
@ -69,72 +66,66 @@ echo "Alias=$AliasHelferID<br>";
|
|||
////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['change'])) {
|
||||
$messages = [];
|
||||
|
||||
|
||||
// Eingaben überprüfen:
|
||||
$messages = [];
|
||||
|
||||
|
||||
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)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
||||
if ($_POST['IsAdmin'])
|
||||
{
|
||||
$HelferIsAdmin=1;
|
||||
//echo "is Admin<br>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$HelferIsAdmin=0;
|
||||
}
|
||||
if(empty($messages)) {
|
||||
// Helferdaten Ändern
|
||||
HelferdatenAendern($db_link,$HelferName,$HelferEmail,$HelferHandy,$HelferNewPasswort,$AliasHelferID,$HelferIsAdmin,$HelferID);
|
||||
// Eingaben überprüfen:
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
|
||||
if(strlen($_POST['helfer-newpasswort']) < 8 and $_POST['helfer-newpasswort'] != "") {
|
||||
$messages[] = 'Neues Passwort zu kurz';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
}
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
||||
if ($_POST['IsAdmin']) {
|
||||
$HelferIsAdmin = 1;
|
||||
//echo "is Admin<br>";
|
||||
} 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>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////
|
||||
// Helfer Loeschen
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['del']))
|
||||
{
|
||||
HelferLoeschen($db_link,$AliasHelferID,$AdminID);
|
||||
if(isset($_POST['del'])) {
|
||||
HelferLoeschen($db_link, $AliasHelferID, $AdminID);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
// Helferdate holen
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
$db_erg = Helferdaten($db_link,$AliasHelferID);
|
||||
$db_erg = Helferdaten($db_link, $AliasHelferID);
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferEmail = $zeile['Email'];
|
||||
$HelferHandy = $zeile['Handy'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferEmail = $zeile['Email'];
|
||||
$HelferHandy = $zeile['Handy'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
||||
|
||||
|
|
@ -147,27 +138,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="<?=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="<?=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="<?=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="<?=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="<?=htmlspecialchars($HelferPasswort ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -22,87 +22,80 @@
|
|||
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
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']))
|
||||
{
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
||||
if(isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer=$zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link, $InfoAlleSchichtID);
|
||||
|
||||
|
||||
$x = 0;
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$MitHelferID[$x] = $zeile['HelferID'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
$x=0;
|
||||
|
||||
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']))
|
||||
{
|
||||
$ZeitBereich = $_GET['ZeitBereich'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$ZeitBereich = 1;
|
||||
if(isset($_GET['ZeitBereich'])) {
|
||||
$ZeitBereich = $_GET['ZeitBereich'];
|
||||
} else {
|
||||
$ZeitBereich = 1;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -121,64 +114,56 @@ else
|
|||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if(isset($_POST['plusschicht'])) {
|
||||
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['plusschicht'];
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
// if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
// }
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['plusschicht'];
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
// if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link,$HelferID,$SchichtId);
|
||||
if(empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(isset($_POST['minusschicht'])) {
|
||||
// Mich aus Schicht entfernen
|
||||
$messages = [];
|
||||
// Mich aus Schicht entfernen
|
||||
$messages = [];
|
||||
|
||||
$SchichtID = $_POST['minusschicht'];
|
||||
$SchichtID = $_POST['minusschicht'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
// Helfer aus Schicht entfernen
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link,$HelferID,$SchichtID);
|
||||
if(empty($messages)) {
|
||||
// Helfer aus Schicht entfernen
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $HelferID, $SchichtID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -191,255 +176,210 @@ if(isset($_POST['minusschicht'])) {
|
|||
|
||||
|
||||
// Zusammenfassung Eigener Schichten
|
||||
$db_erg = SchichtenSummeEinesHelfers($db_link,$HelferID);
|
||||
$zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC);
|
||||
|
||||
echo '<table class="commontable"><tr class="header"><th onclick="window.location.href=\'MeineSchichten.php\'">';
|
||||
echo '<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">'. " Mein Dienstplan (";
|
||||
echo $zeile['Anzahl'];
|
||||
echo " Schichten, ";
|
||||
echo $zeile['Dauer']/3600;
|
||||
echo " Stunden)";
|
||||
echo '</th></tr></table><br><br>';
|
||||
$db_erg = SchichtenSummeEinesHelfers($db_link, $HelferID);
|
||||
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||
|
||||
echo '<table class="commontable"><tr class="header"><th onclick="window.location.href=\'MeineSchichten.php\'">';
|
||||
echo '<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">'. " Mein Dienstplan (";
|
||||
echo $zeile['Anzahl'];
|
||||
echo " Schichten, ";
|
||||
echo $zeile['Dauer'] / 3600;
|
||||
echo " Stunden)";
|
||||
echo '</th></tr></table><br><br>';
|
||||
/// Schichten Auswahl
|
||||
////////////////////////////////////////////////////////
|
||||
$addschicht =$_SESSION["addschicht"];
|
||||
$dienstsort =$_SESSION["dienstsort"];
|
||||
$addschicht = $_SESSION["addschicht"];
|
||||
$dienstsort = $_SESSION["dienstsort"];
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='1')
|
||||
{
|
||||
$addschicht='1';
|
||||
$dienstsort='1';
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '1') {
|
||||
$addschicht = '1';
|
||||
$dienstsort = '1';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='2')
|
||||
{
|
||||
$addschicht='2';
|
||||
$dienstsort='2';
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '2') {
|
||||
$addschicht = '2';
|
||||
$dienstsort = '2';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='0')
|
||||
{
|
||||
$addschicht='0';
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '0') {
|
||||
$addschicht = '0';
|
||||
}
|
||||
|
||||
$_SESSION["addschicht"] =$addschicht;
|
||||
$_SESSION["dienstsort"] =$dienstsort;
|
||||
$_SESSION["addschicht"] = $addschicht;
|
||||
$_SESSION["dienstsort"] = $dienstsort;
|
||||
|
||||
//echo "<br>Detail=".$addschicht."<br>";
|
||||
|
||||
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>";
|
||||
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>";
|
||||
}
|
||||
|
||||
//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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2200-05-19 00:00:00",$HelferLevel);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2023-05-18 00:00:00",$HelferLevel);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",$HelferLevel);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-19 00:00:00","2023-05-20 00:00:00",$HelferLevel);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-20 00:00:00","2023-05-21 00:00:00",$HelferLevel);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-21 00:00:00","2023-05-22 00:00:00",$HelferLevel);
|
||||
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
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-22 00:00:00","2223-05-22 00:00:00",$HelferLevel);
|
||||
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
|
||||
$iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
||||
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
||||
echo "<button type='button' onclick='expand_all_table_rows();'>Alles Ausklappen</button>";
|
||||
echo "<button type='button' onclick='expand_all_table_rows();'>Alles Ausklappen</button>";
|
||||
|
||||
//echo "<p><button name='addschicht' value='0'><b>↩</b></button></p>";
|
||||
echo '<table id="customers">';
|
||||
echo "<tr class='header'>";
|
||||
echo "<th colspan='7'>". "Alle Schichten der Con (" . $iBelegteSchichtenCount."/".$iAlleSchichtenCount. ")</th></tr>";
|
||||
//echo "<p><button name='addschicht' value='0'><b>↩</b></button></p>";
|
||||
echo '<table id="customers">';
|
||||
echo "<tr class='header'>";
|
||||
echo "<th colspan='7'>". "Alle Schichten der Con (" . $iBelegteSchichtenCount."/".$iAlleSchichtenCount. ")</th></tr>";
|
||||
|
||||
/*
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
echo "<th>". "Dienst" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th>". "Von" . "</th>";
|
||||
}
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
echo "<th>". "Dienst" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th>". "Von" . "</th>";
|
||||
}
|
||||
*/
|
||||
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)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($ZeitBereich == 6) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||
} 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 "</tr>"; //Zeitbereich tr
|
||||
|
||||
|
||||
$OldTag = "";
|
||||
$OldWas = "";
|
||||
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link,$HelferID);
|
||||
//print_r($MeineDienste);
|
||||
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link, $HelferID);
|
||||
//print_r($MeineDienste);
|
||||
|
||||
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')
|
||||
{
|
||||
$Tag = $zeile['Tag'];
|
||||
|
||||
if ($Tag!=$OldTag)
|
||||
{
|
||||
echo "<tr class='header'><th colspan='5' >";
|
||||
echo $Tag;
|
||||
echo "</th></tr>";
|
||||
$OldTag = $Tag;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$Was = $zeile['Was'];
|
||||
|
||||
if ($Was!=$OldWas)
|
||||
{
|
||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||
echo $Was;
|
||||
echo "</th>";
|
||||
if ($dienstsort == '1') {
|
||||
$Tag = $zeile['Tag'];
|
||||
|
||||
if ($Tag != $OldTag) {
|
||||
echo "<tr class='header'><th colspan='5' >";
|
||||
echo $Tag;
|
||||
echo "</th></tr>";
|
||||
$OldTag = $Tag;
|
||||
}
|
||||
} else {
|
||||
$Was = $zeile['Was'];
|
||||
|
||||
if ($Was != $OldWas) {
|
||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||
echo $Was;
|
||||
echo "</th>";
|
||||
/*
|
||||
echo "<th style='width:100px'>". "Von" . "</th>";
|
||||
echo "<th style='width:130px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Ist/Soll" . "</th>";
|
||||
echo "<th style='width:90px'>". "Add" . "</th>";
|
||||
*/
|
||||
echo "<th style='width:100px'>". "Von" . "</th>";
|
||||
echo "<th style='width:130px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Ist/Soll" . "</th>";
|
||||
echo "<th style='width:90px'>". "Add" . "</th>";
|
||||
*/
|
||||
echo "</tr>";
|
||||
$OldWas = $Was;
|
||||
}
|
||||
}
|
||||
$Color="red";
|
||||
if ( $zeile['Ist'] > 0 )
|
||||
{
|
||||
$Color="yellow";
|
||||
}
|
||||
if ( $zeile['Ist'] >= $zeile['Soll'] )
|
||||
{
|
||||
$Color="green";
|
||||
}
|
||||
$Von = $zeile['Ab'];
|
||||
$Bis = $zeile['Bis'];
|
||||
if ( substr($Von,0,2) == substr($Bis,0,2))
|
||||
{
|
||||
$Bis = substr($Bis,2);
|
||||
}
|
||||
$Von = substr($Von,2);
|
||||
|
||||
// Meine Schichten gruen einfaerben
|
||||
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||
$rowstyle = ' style="background-color:lightgreen" ';
|
||||
$regtext = 'Meine!';
|
||||
} else {
|
||||
// dummy-style, um SchichtID unsichtbar im Tag anzuzeigen
|
||||
$rowstyle = 'dbinfo="SchichtID:'.$zeile['SchichtID'].';helferlvl:'.$HelferLevel.'" ';
|
||||
$regtext = '';
|
||||
}
|
||||
|
||||
echo '<tr '.$rowstyle.'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
echo "<td>". $zeile['Was'] . "</td>";
|
||||
}
|
||||
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
|
||||
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";
|
||||
$OldWas = $Was;
|
||||
}
|
||||
}
|
||||
$Color = "red";
|
||||
if ($zeile['Ist'] > 0) {
|
||||
$Color = "yellow";
|
||||
}
|
||||
if ($zeile['Ist'] >= $zeile['Soll']) {
|
||||
$Color = "green";
|
||||
}
|
||||
$Von = $zeile['Ab'];
|
||||
$Bis = $zeile['Bis'];
|
||||
if (substr($Von, 0, 2) == substr($Bis, 0, 2)) {
|
||||
$Bis = substr($Bis, 2);
|
||||
}
|
||||
$Von = substr($Von, 2);
|
||||
|
||||
}
|
||||
// Meine Schichten gruen einfaerben
|
||||
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||
$rowstyle = ' style="background-color:lightgreen" ';
|
||||
$regtext = 'Meine!';
|
||||
} else {
|
||||
// dummy-style, um SchichtID unsichtbar im Tag anzuzeigen
|
||||
$rowstyle = 'dbinfo="SchichtID:'.$zeile['SchichtID'].';helferlvl:'.$HelferLevel.'" ';
|
||||
$regtext = '';
|
||||
}
|
||||
|
||||
echo '<tr '.$rowstyle.'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
|
||||
if ($dienstsort == '1') {
|
||||
echo "<td>". $zeile['Was'] . "</td>";
|
||||
} 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
|
||||
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>";
|
||||
|
||||
|
||||
|
|
@ -451,7 +391,7 @@ if($addschicht!='0')
|
|||
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@ SESSION_START();
|
|||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
include '_login.php';
|
||||
|
|
@ -45,77 +45,72 @@ include '_login.php';
|
|||
|
||||
echo '<table id="customers" >';
|
||||
|
||||
$db_erg = GetDiensteChilds($db_link,0);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
echo "<tr><th>";
|
||||
echo $zeile["Was"];
|
||||
echo "</th></tr>";
|
||||
$db_erg = GetDiensteChilds($db_link, 0);
|
||||
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))
|
||||
{
|
||||
echo "<tr><td>";
|
||||
echo $zeile["Was"];
|
||||
echo "</td></tr>";
|
||||
}
|
||||
$db_erg2 = GetDiensteChilds($db_link, $zeile["DienstID"]);
|
||||
while ($zeile = mysqli_fetch_array($db_erg2, MYSQLI_ASSOC)) {
|
||||
echo "<tr><td>";
|
||||
echo $zeile["Was"];
|
||||
echo "</td></tr>";
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
echo "</table>";
|
||||
|
||||
|
||||
|
||||
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2200-05-19 00:00:00");
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00");
|
||||
|
||||
$OldWas="";
|
||||
$OldWas = "";
|
||||
echo "<br><br><table id='customers' style='page-break-before:always'>";
|
||||
?>
|
||||
<tr>
|
||||
<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))
|
||||
{
|
||||
$Was = $zeile["Was"];
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$Was = $zeile["Was"];
|
||||
|
||||
if($Was!= $OldWas)
|
||||
{
|
||||
echo "</table>";
|
||||
//echo '<table id="customers" style="page-break-before:always">';
|
||||
echo '<table id="customers">';
|
||||
echo "<tr><th colspan=3>";
|
||||
echo $Was;
|
||||
echo "</th></tr>";
|
||||
$OldWas=$Was;
|
||||
if($Was != $OldWas) {
|
||||
echo "</table>";
|
||||
//echo '<table id="customers" style="page-break-before:always">';
|
||||
echo '<table id="customers">';
|
||||
echo "<tr><th colspan=3>";
|
||||
echo $Was;
|
||||
echo "</th></tr>";
|
||||
$OldWas = $Was;
|
||||
|
||||
|
||||
}
|
||||
|
||||
echo "<tr><td style='width:100px'>";
|
||||
echo $zeile["Ab"];
|
||||
echo "</td><td style='width:100px'>";
|
||||
echo $zeile["Bis"];
|
||||
echo "</td><td>";
|
||||
|
||||
$db_erg2 = BeteiligteHelfer($db_link,$zeile["SchichtID"]);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg2, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
echo $zeile["Name"];
|
||||
echo " ";
|
||||
echo $zeile["Handy"];
|
||||
echo ",";
|
||||
}
|
||||
echo "</td></tr>";
|
||||
}
|
||||
|
||||
echo "<tr><td style='width:100px'>";
|
||||
echo $zeile["Ab"];
|
||||
echo "</td><td style='width:100px'>";
|
||||
echo $zeile["Bis"];
|
||||
echo "</td><td>";
|
||||
|
||||
$db_erg2 = BeteiligteHelfer($db_link, $zeile["SchichtID"]);
|
||||
while ($zeile = mysqli_fetch_array($db_erg2, MYSQLI_ASSOC)) {
|
||||
|
||||
echo $zeile["Name"];
|
||||
echo " ";
|
||||
echo $zeile["Handy"];
|
||||
echo ",";
|
||||
}
|
||||
echo "</td></tr>";
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
echo "</table>";
|
||||
|
||||
$OldHelferName="";
|
||||
$OldHelferName = "";
|
||||
|
||||
echo "<br><br><table id='customers' style='page-break-before:always'>";
|
||||
?>
|
||||
|
|
@ -124,28 +119,26 @@ 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))
|
||||
{
|
||||
$HelferName = $zeile["Name"];
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile["Name"];
|
||||
|
||||
if($HelferName!= $OldHelferName)
|
||||
{
|
||||
echo "</table>";
|
||||
//echo '<table id="customers" style="page-break-before:always">';
|
||||
echo '<table id="customers">';
|
||||
echo "<tr><th colspan=3>";
|
||||
echo $HelferName;
|
||||
echo "</th></tr>";
|
||||
$OldHelferName=$HelferName;
|
||||
if($HelferName != $OldHelferName) {
|
||||
echo "</table>";
|
||||
//echo '<table id="customers" style="page-break-before:always">';
|
||||
echo '<table id="customers">';
|
||||
echo "<tr><th colspan=3>";
|
||||
echo $HelferName;
|
||||
echo "</th></tr>";
|
||||
$OldHelferName = $HelferName;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
echo "<tr><td style='width:100px'>";
|
||||
echo (int)$zeile["Dauer"];
|
||||
echo "</td><td>";
|
||||
echo $zeile["Was"];
|
||||
echo "</td></tr>";
|
||||
echo "<tr><td style='width:100px'>";
|
||||
echo (int)$zeile["Dauer"];
|
||||
echo "</td><td>";
|
||||
echo $zeile["Was"];
|
||||
echo "</td></tr>";
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -159,7 +152,7 @@ echo "</table>";
|
|||
|
||||
<?php
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
?>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,91 +15,87 @@
|
|||
SESSION_START();
|
||||
//$HelferID = $_SESSION["HelferId"];
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
|
||||
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'];;
|
||||
$messages = [];
|
||||
|
||||
//echo $HelferName;
|
||||
//echo $HelferEmail;
|
||||
//echo $HelferHandy;
|
||||
|
||||
// Eingaben überprüfen:
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferLevel = $_POST['helfer-level'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
;
|
||||
$HelferPasswort2 = $_POST['helfer-passwort2'];
|
||||
;
|
||||
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
if(!filter_var($HelferEmail, FILTER_VALIDATE_EMAIL)) {
|
||||
$messages[] = 'Bitte prüfen Sie die eingegebene E-Mail-Adresse.';
|
||||
}
|
||||
|
||||
//if(!filter_var($HelferHandy, FILTER_VALIDATE_INT)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebene Handynummer';
|
||||
//}
|
||||
|
||||
if($HelferPasswort!=$HelferPasswort2)
|
||||
{
|
||||
$messages[] = 'Passwörter stimmen nicht überein';
|
||||
$HelferPasswort ="";
|
||||
$HelferPasswort2 = "";
|
||||
}
|
||||
if(strlen($HelferPasswort)<8)
|
||||
{
|
||||
$messages[] = 'Passwörter zu kurz';
|
||||
$HelferPasswort ="";
|
||||
$HelferPasswort2 = "";
|
||||
}
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
$db_erg = CreateHelfer($db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);
|
||||
if ( $db_erg )
|
||||
{
|
||||
//$insertID = mysql_insert_id();
|
||||
//echo "InserId = ".$insertID;
|
||||
//echo $HelferName;
|
||||
//echo $HelferEmail;
|
||||
//echo $HelferHandy;
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
echo "Helfer mit Emailadresse ".$HelferEmail." Angelegt.<br><br>";
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
$HelferPasswort = '';
|
||||
$HelferPasswort2 = '';
|
||||
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "Helfer konnte nicht Angelegt werden, möglichweise exisistiert die Emailadresse ".$HelferEmail." bereits.<br><br>";
|
||||
}
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
// Eingaben überprüfen:
|
||||
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
if(!filter_var($HelferEmail, FILTER_VALIDATE_EMAIL)) {
|
||||
$messages[] = 'Bitte prüfen Sie die eingegebene E-Mail-Adresse.';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
//if(!filter_var($HelferHandy, FILTER_VALIDATE_INT)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebene Handynummer';
|
||||
//}
|
||||
|
||||
if($HelferPasswort != $HelferPasswort2) {
|
||||
$messages[] = 'Passwörter stimmen nicht überein';
|
||||
$HelferPasswort = "";
|
||||
$HelferPasswort2 = "";
|
||||
}
|
||||
if(strlen($HelferPasswort) < 8) {
|
||||
$messages[] = 'Passwörter zu kurz';
|
||||
$HelferPasswort = "";
|
||||
$HelferPasswort2 = "";
|
||||
}
|
||||
|
||||
|
||||
if(empty($messages)) {
|
||||
$db_erg = CreateHelfer($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferPasswort, $HelferLevel);
|
||||
if ($db_erg) {
|
||||
//$insertID = mysql_insert_id();
|
||||
//echo "InserId = ".$insertID;
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
echo "Helfer mit Emailadresse ".$HelferEmail." Angelegt.<br><br>";
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
$HelferPasswort = '';
|
||||
$HelferPasswort2 = '';
|
||||
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
} else {
|
||||
echo "Helfer konnte nicht Angelegt werden, möglichweise exisistiert die Emailadresse ".$HelferEmail." bereits.<br><br>";
|
||||
}
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -116,44 +112,46 @@ 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="<?=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="<?=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="<?=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="<?=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="<?=htmlspecialchars($HelferPasswort2 ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr><td>Helferlevel </td></tr>
|
||||
<tr><td>
|
||||
<select name="helfer-level">
|
||||
<?php
|
||||
<?php
|
||||
$db_erg = HelferLevel($db_link);
|
||||
$selected="";
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferLevel = $zeile['HelferLevel'];
|
||||
$HelferLevelBeschreibung = $zeile['HelferLevelBeschreibung'];
|
||||
if($HelferLevel==1){ $selected = " selected " ;};
|
||||
echo "<option value='$HelferLevel' $selected>$HelferLevelBeschreibung</option>";
|
||||
$selected="";
|
||||
$selected = "";
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferLevel = $zeile['HelferLevel'];
|
||||
$HelferLevelBeschreibung = $zeile['HelferLevelBeschreibung'];
|
||||
if($HelferLevel == 1) {
|
||||
$selected = " selected " ;
|
||||
};
|
||||
echo "<option value='$HelferLevel' $selected>$HelferLevelBeschreibung</option>";
|
||||
$selected = "";
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
|
|
@ -171,7 +169,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)) {
|
|||
|
||||
<?php
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
?>
|
||||
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -4,42 +4,42 @@
|
|||
<body>
|
||||
|
||||
<?php
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
|
||||
if(isset($_GET['token']) ) {
|
||||
if(isset($_GET['token'])) {
|
||||
|
||||
// E-Mail-Adresse des Nutzers
|
||||
$encrypted_data = $_GET['token'];
|
||||
$encrypted_iv = $_GET['iv'];
|
||||
echo "token: $encrypted_data<br> \n";
|
||||
echo "iv: $encrypted_iv<br> \n";
|
||||
// E-Mail-Adresse des Nutzers
|
||||
$encrypted_data = $_GET['token'];
|
||||
$encrypted_iv = $_GET['iv'];
|
||||
echo "token: $encrypted_data<br> \n";
|
||||
echo "iv: $encrypted_iv<br> \n";
|
||||
|
||||
// Erstellen eines Cipher-Objekts für die Verschlüsselung
|
||||
$cipher_method = "AES-256-CBC";
|
||||
$iv_length = openssl_cipher_iv_length($cipher_method);
|
||||
$iv = base64_decode($encrypted_iv);
|
||||
$cipher_options = OPENSSL_RAW_DATA;
|
||||
$cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
||||
// Erstellen eines Cipher-Objekts für die Verschlüsselung
|
||||
$cipher_method = "AES-256-CBC";
|
||||
$iv_length = openssl_cipher_iv_length($cipher_method);
|
||||
$iv = base64_decode($encrypted_iv);
|
||||
$cipher_options = OPENSSL_RAW_DATA;
|
||||
$cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
||||
|
||||
// Entschlüsseln des verschlüsselten Textes
|
||||
$decoded_cipher_text = base64_decode($encrypted_data);
|
||||
$iv = base64_decode($encrypted_iv);
|
||||
$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);
|
||||
// Entschlüsseln des verschlüsselten Textes
|
||||
$decoded_cipher_text = base64_decode($encrypted_data);
|
||||
$iv = base64_decode($encrypted_iv);
|
||||
$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);
|
||||
}
|
||||
// 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);
|
||||
}
|
||||
|
||||
// Ausgabe der entschlüsselten E-Mail-Adresse
|
||||
echo "E-Mail-Adresse: ", $decrypted_email, "<br>\n";
|
||||
// Ausgabe der entschlüsselten E-Mail-Adresse
|
||||
echo "E-Mail-Adresse: ", $decrypted_email, "<br>\n";
|
||||
|
||||
} else {
|
||||
|
||||
echo "Kein gültiges Token!<br>";
|
||||
echo "Kein gültiges Token!<br>";
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,36 +1,37 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
$db_link = ConnectDB();
|
||||
include '_login.php';
|
||||
include '_crypt.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;
|
||||
//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 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;
|
||||
}
|
||||
|
||||
|
||||
// Prüfen, ob das @-Symbol enthalten ist
|
||||
if (strpos($email, '@') === false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Prüfen, ob der Teil nach dem @-Symbol eine gültige Domain enthält
|
||||
$parts = explode('@', $email);
|
||||
$domain = $parts[1];
|
||||
if (!filter_var($domain, FILTER_VALIDATE_DOMAIN)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Alle Checks bestanden
|
||||
return true;
|
||||
}
|
||||
|
|
@ -38,25 +39,25 @@ function validate_email($email) {
|
|||
|
||||
// wird immer auf 2 (Teilnehmer) gesetzt und wird auch nicht gespeichert, wenn anders gesetzt
|
||||
// andere level muessen jedes Mal gesetzt werden
|
||||
$level=2;
|
||||
$level = 2;
|
||||
|
||||
if(isset($_POST['helfer-status'])) {
|
||||
$level=$_POST['helfer-status'];
|
||||
$level = $_POST['helfer-status'];
|
||||
}
|
||||
|
||||
// nicht sicher, wo so ein default-text herkommen sollte
|
||||
// oder ob es tatsächlich einen geben sollte
|
||||
$email_subject="Drop am See beginnt bald!";
|
||||
$email_subject = "Drop am See beginnt bald!";
|
||||
if(isset($_POST['email-subject'])) {
|
||||
$email_subject=$_POST['email-subject'];
|
||||
$email_subject = $_POST['email-subject'];
|
||||
}
|
||||
|
||||
$email_cc="drophelfer@gmail.com";
|
||||
$email_cc = "drophelfer@gmail.com";
|
||||
if(isset($_POST['email-cc'])) {
|
||||
$email_cc=$_POST['email-cc'];
|
||||
$email_cc = $_POST['email-cc'];
|
||||
}
|
||||
|
||||
$email_text="
|
||||
$email_text = "
|
||||
Lieber Teilnehmer,
|
||||
trage dich bitte mit folgendem Link für eine Stunde pro Person als Helfer bei uns ein.Wir verschicken eine Mail pro Emailaddresse, also bitte für alle, die mit dieser Emailaddresse angemeldet sind.
|
||||
|
||||
|
|
@ -71,12 +72,12 @@ dein Drop am See Team
|
|||
";
|
||||
|
||||
if(isset($_POST['email-text'])) {
|
||||
$email_text=$_POST['email-text'];
|
||||
$email_text = $_POST['email-text'];
|
||||
}
|
||||
|
||||
$sendmail=0;
|
||||
$sendmail = 0;
|
||||
if(isset($_POST['sendmail'])) {
|
||||
$sendmail=$_POST['sendmail'];
|
||||
$sendmail = $_POST['sendmail'];
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -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="<?=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??'');?>
|
||||
<?=htmlspecialchars($email_text ?? '');?>
|
||||
</textarea>
|
||||
</p>
|
||||
<p>
|
||||
|
|
@ -143,47 +148,47 @@ Liste von Emails, an die Anschreiben verschickt wird (Eine Email pro Zeile, nur
|
|||
<?php
|
||||
|
||||
if(isset($_POST['email-liste'])) {
|
||||
// TODO: check if email-text contains tokentext to substitute
|
||||
// TODO: check if subject is set
|
||||
// get email addresses from textarea
|
||||
$email_list = $_POST['helfer-email-liste'];
|
||||
// Aufteilen der Textbox in einzelne Emails
|
||||
// TODO: check if email-text contains tokentext to substitute
|
||||
// TODO: check if subject is set
|
||||
// get email addresses from textarea
|
||||
$email_list = $_POST['helfer-email-liste'];
|
||||
// Aufteilen der Textbox in einzelne Emails
|
||||
|
||||
//mit explode: jede Email in einer Zeile, andere Leerzeichen koennen zur Email werden
|
||||
// $emails = explode("\n", $email_list);
|
||||
//mit explode: jede Email in einer Zeile, andere Leerzeichen koennen zur Email werden
|
||||
// $emails = explode("\n", $email_list);
|
||||
|
||||
//preg_split, um bei allen Leerzeichen zu trennen
|
||||
$email_array = preg_split('/\s+/', $email_list); // Trennzeichen: 1 oder mehr Whitespace-Zeichen
|
||||
foreach ($email_array as $email) {
|
||||
$email=trim($email);
|
||||
$encrypted_data=encode_string($secret_key, $email,$level,$secret_verification);
|
||||
$token_url = "$urlprefix?token=$encrypted_data";
|
||||
// Ausgabe des verschluesselten Textes in der URL
|
||||
$decrypted_data = decode_string($secret_key, urldecode($encrypted_data),$secret_verification);
|
||||
$email_subst_text = str_replace('XXtokenXX', $token_url, $email_text);
|
||||
if($sendmail != 1){
|
||||
// keine Emails verschicken, wir gebeben die Inhalte unten als Text aus
|
||||
echo "Verschicken nicht ausgewählt. Zeige Emails an:<br>";
|
||||
echo $sendmail ."<br>";
|
||||
echo "=======================================<br>";
|
||||
echo "To: ".$decrypted_data['email']." (level: ".$decrypted_data['level']."):<br>";
|
||||
echo "CC: ".$email_cc."<br>";
|
||||
echo "<pre>".$email_subst_text."</pre><br>";
|
||||
echo "$email: <a href='$token_url'> $token_url</a> (check: ".$decrypted_data['email'].", lv: ".$decrypted_data['level'].")<br>";
|
||||
} else {
|
||||
// Email verschicken - send mail
|
||||
$to=$decrypted_data['email'];
|
||||
$from="root";
|
||||
$headers = 'From: ' . $from. "\r\n";
|
||||
$headers .= 'CC: ' . $email_cc . "\r\n";
|
||||
if (mail($to, $email_subject, $email_subst_text, $headers)) {
|
||||
echo "Die E-Mail an $to wurde erfolgreich versendet.";
|
||||
error_log(date('Y-m-d H:i') . "(AdminID:$AdminID) Name: $HelferName (HelferID:$HelferID) hat Email mit Link verschickt an: $to mit CC an: $email_cc\n",3,LOGFILE);
|
||||
} else {
|
||||
echo "Beim Versenden der E-Mail an $to ist ein Fehler aufgetreten.";
|
||||
}
|
||||
//preg_split, um bei allen Leerzeichen zu trennen
|
||||
$email_array = preg_split('/\s+/', $email_list); // Trennzeichen: 1 oder mehr Whitespace-Zeichen
|
||||
foreach ($email_array as $email) {
|
||||
$email = trim($email);
|
||||
$encrypted_data = encode_string($secret_key, $email, $level, $secret_verification);
|
||||
$token_url = "$urlprefix?token=$encrypted_data";
|
||||
// Ausgabe des verschluesselten Textes in der URL
|
||||
$decrypted_data = decode_string($secret_key, urldecode($encrypted_data), $secret_verification);
|
||||
$email_subst_text = str_replace('XXtokenXX', $token_url, $email_text);
|
||||
if($sendmail != 1) {
|
||||
// keine Emails verschicken, wir gebeben die Inhalte unten als Text aus
|
||||
echo "Verschicken nicht ausgewählt. Zeige Emails an:<br>";
|
||||
echo $sendmail ."<br>";
|
||||
echo "=======================================<br>";
|
||||
echo "To: ".$decrypted_data['email']." (level: ".$decrypted_data['level']."):<br>";
|
||||
echo "CC: ".$email_cc."<br>";
|
||||
echo "<pre>".$email_subst_text."</pre><br>";
|
||||
echo "$email: <a href='$token_url'> $token_url</a> (check: ".$decrypted_data['email'].", lv: ".$decrypted_data['level'].")<br>";
|
||||
} else {
|
||||
// Email verschicken - send mail
|
||||
$to = $decrypted_data['email'];
|
||||
$from = "root";
|
||||
$headers = 'From: ' . $from. "\r\n";
|
||||
$headers .= 'CC: ' . $email_cc . "\r\n";
|
||||
if (mail($to, $email_subject, $email_subst_text, $headers)) {
|
||||
echo "Die E-Mail an $to wurde erfolgreich versendet.";
|
||||
error_log(date('Y-m-d H:i') . "(AdminID:$AdminID) Name: $HelferName (HelferID:$HelferID) hat Email mit Link verschickt an: $to mit CC an: $email_cc\n", 3, LOGFILE);
|
||||
} else {
|
||||
echo "Beim Versenden der E-Mail an $to ist ein Fehler aufgetreten.";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -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="<?=htmlspecialchars($HelferEmail ?? '')?>">
|
||||
<button name="sent" value="1">Token generieren</button>
|
||||
</form>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -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,127 +15,117 @@
|
|||
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
//require_once ('SQL.php');
|
||||
include 'SQL.php';
|
||||
|
||||
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/// 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']))
|
||||
{
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
||||
if(isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer=$zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
||||
if(isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link, $InfoAlleSchichtID);
|
||||
|
||||
|
||||
$x = 0;
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$MitHelferID[$x] = $zeile['HelferID'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
$x=0;
|
||||
|
||||
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']))
|
||||
{
|
||||
unset($_SESSION["HelferID"]);
|
||||
//$_POST['login'] = 1;
|
||||
}
|
||||
if(isset($_POST['logout'])) {
|
||||
unset($_SESSION["HelferID"]);
|
||||
//$_POST['login'] = 1;
|
||||
}
|
||||
|
||||
/// Login
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['login']))
|
||||
{
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
if(isset($_POST['login'])) {
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
|
||||
if(empty($messages)) {
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort, 0 );
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(!isset($_SESSION["HelferID"]))
|
||||
{
|
||||
if(!isset($_SESSION["HelferID"])) {
|
||||
|
||||
?>
|
||||
?>
|
||||
<form method="post" action="#Info">
|
||||
|
||||
<fieldset>
|
||||
|
|
@ -144,12 +134,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="<?=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="<?=htmlspecialchars($HelferHandy ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</table>
|
||||
|
|
@ -162,7 +152,7 @@ if(!isset($_SESSION["HelferID"]))
|
|||
|
||||
</form>
|
||||
<?php
|
||||
exit;
|
||||
exit;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -170,13 +160,12 @@ if(!isset($_SESSION["HelferID"]))
|
|||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
if(isset($_POST['HelferID']))
|
||||
{
|
||||
$HelferID = $_POST['HelferID'];
|
||||
if(isset($_POST['HelferID'])) {
|
||||
$HelferID = $_POST['HelferID'];
|
||||
}
|
||||
if(isset($_POST['ShowHelfer'])) {
|
||||
$HelferID = $_POST['HelperSearch'];
|
||||
}
|
||||
if(isset($_POST['ShowHelfer'])) {
|
||||
$HelferID=$_POST['HelperSearch'];
|
||||
}
|
||||
|
||||
$_SESSION["HelferID"] = $HelferID;
|
||||
|
||||
|
|
@ -195,35 +184,35 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
|
||||
/// Schicht Löschen
|
||||
////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['Del'])) {
|
||||
|
||||
$messages = [];
|
||||
|
||||
$EinzelSchichtID = $_POST['Del'];
|
||||
|
||||
|
||||
// Eingaben überprüfen:
|
||||
if(isset($_POST['Del'])) {
|
||||
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
|
||||
$messages = [];
|
||||
|
||||
if(empty($messages)) {
|
||||
$EinzelSchichtID = $_POST['Del'];
|
||||
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link,$HelferID,$EinzelSchichtID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
// Eingaben überprüfen:
|
||||
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
|
||||
|
||||
if(empty($messages)) {
|
||||
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link, $HelferID, $EinzelSchichtID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -243,40 +232,36 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if(isset($_POST['sent'])) {
|
||||
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['sent'];
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
// if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
// }
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['sent'];
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
// if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link,$HelferID,$SchichtId);
|
||||
if(empty($messages)) {
|
||||
// Helfer Schicht zuweisen
|
||||
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -287,45 +272,43 @@ if(isset($_POST['sent'])) {
|
|||
/// Alle Schichten Des Helfers Anzeigen
|
||||
////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
$db_erg = AlleSchichtenEinesHelfers($db_link,$HelferID);
|
||||
|
||||
if ( ! $db_erg )
|
||||
{
|
||||
echo "AlleSchichten des Helfes ungültige Abfrage";
|
||||
die('Ungültige Abfrage: ' . mysqli_error());
|
||||
$db_erg = AlleSchichtenEinesHelfers($db_link, $HelferID);
|
||||
|
||||
if (! $db_erg) {
|
||||
echo "AlleSchichten des Helfes ungültige Abfrage";
|
||||
die('Ungültige Abfrage: ' . mysqli_error());
|
||||
}
|
||||
|
||||
$iSQLCount = mysqli_num_rows($db_erg);
|
||||
//$iSQLCount = 3;
|
||||
$iSQLCount = mysqli_num_rows($db_erg);
|
||||
//$iSQLCount = 3;
|
||||
|
||||
echo '<table id="customers">';
|
||||
|
||||
echo "<thead>";
|
||||
echo "<tr>";
|
||||
echo "<th colspan=4>". "Meine Schichten (".$iSQLCount." Schichten)</th>";
|
||||
echo "</tr><tr>";
|
||||
echo "<th></th>";
|
||||
echo "<th style='width:180px'>". "Von" . "</th>";
|
||||
echo "<th style='width:180px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Del" . "</th>";
|
||||
echo "</tr>";
|
||||
echo "</thead>";
|
||||
echo "<thead>";
|
||||
echo "<tr>";
|
||||
echo "<th colspan=4>". "Meine Schichten (".$iSQLCount." Schichten)</th>";
|
||||
echo "</tr><tr>";
|
||||
echo "<th></th>";
|
||||
echo "<th style='width:180px'>". "Von" . "</th>";
|
||||
echo "<th style='width:180px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Del" . "</th>";
|
||||
echo "</tr>";
|
||||
echo "</thead>";
|
||||
|
||||
|
||||
|
||||
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 '<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>";
|
||||
echo "<td>". $zeile['Ab'] . "</td>";
|
||||
echo "<td>". $zeile['Bis'] . "</td>";
|
||||
echo "<td>". "<button title='Schicht entfernen' name='Del' value='". $zeile['EinzelSchichtID'] ."'>-</button>" . "</td>";
|
||||
echo "</tr>";
|
||||
echo "</tr>";
|
||||
|
||||
}
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
echo "<br><br>";
|
||||
|
|
@ -334,13 +317,13 @@ $iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
|||
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
||||
|
||||
echo '<table id="customers" onclick="window.location.href=\'AlleSchichten.php\'">';
|
||||
echo "<tr>";
|
||||
echo "<th>".'<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">'. " Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
||||
echo "</tr>";
|
||||
echo "<tr>";
|
||||
echo "<th>".'<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">'. " Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
||||
echo "</tr>";
|
||||
echo "</table>";
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -7,56 +7,55 @@
|
|||
|
||||
<!--meta name="viewport" content="width=480" /-->
|
||||
<?php
|
||||
require_once ('konfiguration.php');
|
||||
SESSION_START();
|
||||
require_once('konfiguration.php');
|
||||
SESSION_START();
|
||||
|
||||
|
||||
// if we are not logged in, we redirect in the header back to the main page
|
||||
if(!isset($_SESSION["HelferID"]) || ! $_SESSION["HelferID"] > 0) {
|
||||
// if we are not logged in, we redirect in the header back to the main page
|
||||
if(!isset($_SESSION["HelferID"]) || ! $_SESSION["HelferID"] > 0) {
|
||||
echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />
|
||||
';
|
||||
}
|
||||
// print top of page if we are logged in and not redirecting
|
||||
echo " </head> \n <body> \n";
|
||||
echo '<button name="BackHelferdaten" value="1" onclick="window.location.href = \'index.php\';"><b>↩</b></button><br>'."\n";
|
||||
echo '<H1> Helferdaten - Log </H1>';
|
||||
echo '<p>Hier werden alle Aktionen, die einen Helfer betreffen aufgelistet</p>';
|
||||
echo '<table id="customers">'."\n";
|
||||
// print top of page if we are logged in and not redirecting
|
||||
echo " </head> \n <body> \n";
|
||||
echo '<button name="BackHelferdaten" value="1" onclick="window.location.href = \'index.php\';"><b>↩</b></button><br>'."\n";
|
||||
echo '<H1> Helferdaten - Log </H1>';
|
||||
echo '<p>Hier werden alle Aktionen, die einen Helfer betreffen aufgelistet</p>';
|
||||
echo '<table id="customers">'."\n";
|
||||
|
||||
//check for admin status
|
||||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
include 'SQL.php';
|
||||
$db_link = mysqli_connect ( MYSQL_HOST, MYSQL_BENUTZER, MYSQL_KENNWORT, MYSQL_DATENBANK );
|
||||
DatenbankAufDeutsch($db_link);
|
||||
//check for admin status
|
||||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
include '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))
|
||||
{
|
||||
$HelferName=$zeile['Name'];
|
||||
$HelferIsAdmin=$zeile['Admin'];
|
||||
}
|
||||
|
||||
// Wir suchen nach HelferID:<zahl> - wenn das Admin Flag gesetzt ist, kann man den Suchstring auf etwas anderes aendern
|
||||
$regex = "\(HelferID:$HelferID\)";
|
||||
if($HelferIsAdmin){
|
||||
if(isset($_POST['suche']) || isset($_GET['suche'])){
|
||||
$regex=$_POST['suche'].$_GET['suche'];
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
}
|
||||
|
||||
// Wir suchen nach HelferID:<zahl> - wenn das Admin Flag gesetzt ist, kann man den Suchstring auf etwas anderes aendern
|
||||
$regex = "\(HelferID:$HelferID\)";
|
||||
if($HelferIsAdmin) {
|
||||
if(isset($_POST['suche']) || isset($_GET['suche'])) {
|
||||
$regex = $_POST['suche'].$_GET['suche'];
|
||||
}
|
||||
echo "<form>";
|
||||
echo "Nur Admins: Suchbegriff (Per Default der selbe Suchtext, wie bei nicht-Admin Helfern):<input name='suche' type='text' size=35 value='$regex'><br> \n";
|
||||
echo "Der Suchbegriff ist ein <a href='https://de.wikipedia.org/wiki/Regul%C3%A4rer_Ausdruck'>Regulärer Ausdruck</a><br><br>";
|
||||
echo "</form>";
|
||||
}
|
||||
}
|
||||
|
||||
$regex = "/"."$regex"."/";
|
||||
foreach(file(LOGFILE) as $line) {
|
||||
$regex = "/"."$regex"."/";
|
||||
foreach(file(LOGFILE) as $line) {
|
||||
#echo "not: $line<br>\n";
|
||||
if(preg_match($regex,$line,$matches)){
|
||||
echo "<tr><td> $line</td></tr>";
|
||||
if(preg_match($regex, $line, $matches)) {
|
||||
echo "<tr><td> $line</td></tr>";
|
||||
}
|
||||
}
|
||||
?>
|
||||
}
|
||||
?>
|
||||
</table>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
1055
html/SQL.php
1055
html/SQL.php
File diff suppressed because it is too large
Load Diff
|
|
@ -2,70 +2,70 @@
|
|||
<?php
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
include '_crypt.php';
|
||||
|
||||
|
||||
$head="<!doctype html>
|
||||
$head = "<!doctype html>
|
||||
<head></head> <body> ";
|
||||
$foot="</body></html>";
|
||||
$foot = "</body></html>";
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
# ist jetzt in _crypt.php, aber aus der anderen Datei, deshalb hier erst
|
||||
# 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
|
||||
$token = $_GET['token'];
|
||||
//$email = Entschluessle($token,$secret_verification,$secret_key);
|
||||
$decrypted_data = decode_string($secret_key, $token, $secret_verification);
|
||||
//error_log("decrytped_data: ". $decrypted_data);
|
||||
$email=$decrypted_data['email'];
|
||||
$helfer_level=$decrypted_data['level'];
|
||||
$success=$decrypted_data['success'];
|
||||
//error_log("email: ".$email.",level: ".$helfer_level.",success: ".$success);
|
||||
if(isset($_GET['token']) || isset($_POST['token'])) {
|
||||
// E-Mail-Adresse des Nutzers
|
||||
$token = $_GET['token'];
|
||||
//$email = Entschluessle($token,$secret_verification,$secret_key);
|
||||
$decrypted_data = decode_string($secret_key, $token, $secret_verification);
|
||||
//error_log("decrytped_data: ". $decrypted_data);
|
||||
$email = $decrypted_data['email'];
|
||||
$helfer_level = $decrypted_data['level'];
|
||||
$success = $decrypted_data['success'];
|
||||
//error_log("email: ".$email.",level: ".$helfer_level.",success: ".$success);
|
||||
} else {
|
||||
echo "$head Kein Token angegeben!<br> $foot";
|
||||
exit;
|
||||
}
|
||||
if($success != 1) {
|
||||
// if ( $db_erg ) {
|
||||
// echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />';
|
||||
// } else {
|
||||
echo "$head Kein gültiges Token!<br>$foot";
|
||||
exit;
|
||||
}
|
||||
// if ( $db_erg ) {
|
||||
// echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />';
|
||||
// } else {
|
||||
echo "$head Kein gültiges Token!<br>$foot";
|
||||
exit;
|
||||
}
|
||||
//}
|
||||
//TODO: Variablendoppelung aufloesen und oben gleich einmal setzen
|
||||
if($success == 1 && $email != ""){
|
||||
if($success == 1 && $email != "") {
|
||||
// Ausgabe der entschlüsselten E-Mail-Adresse
|
||||
//echo "E-Mail-Adresse: ", $email, "<br>\n";
|
||||
//echo "Passwort: ",$token,"<br>\n";
|
||||
|
|
@ -76,19 +76,19 @@ if($success == 1 && $email != ""){
|
|||
$HelferPasswort = $token;
|
||||
|
||||
if(!filter_var($HelferEmail, FILTER_VALIDATE_EMAIL)) {
|
||||
echo 'Problem mit E-Mail-Adresse.';
|
||||
exit;
|
||||
echo 'Problem mit E-Mail-Adresse.';
|
||||
exit;
|
||||
}
|
||||
error_log("2email: ".$HelferEmail.",level: ".$helfer_level.",success: ".$success);
|
||||
error_log("2email: ".$HelferEmail.",level: ".$helfer_level.",success: ".$success);
|
||||
// Helfer Anlegen, wenn er nicht existiert
|
||||
if( ! HelferIstVorhanden($db_link,$HelferEmail) ) {
|
||||
error_log("Helfer ".$HelferEmail." nicht vorhanden, lege an");
|
||||
error_log("CreateHelfer(db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);");
|
||||
$db_erg = CreateHelfer($db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);
|
||||
if(! HelferIstVorhanden($db_link, $HelferEmail)) {
|
||||
error_log("Helfer ".$HelferEmail." nicht vorhanden, lege an");
|
||||
error_log("CreateHelfer(db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);");
|
||||
$db_erg = CreateHelfer($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferPasswort, $HelferLevel);
|
||||
}
|
||||
// Login-Versuch, entweder direkt nach Anlegen oder wenn existiert hat
|
||||
// Login und auf Haupt-Seite gehen
|
||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort,0);
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
echo '<html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@ SESSION_START();
|
|||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
//require_once ('SQL.php');
|
||||
include 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
|
||||
|
||||
|
||||
|
|
@ -34,36 +34,35 @@ $db_link = mysqli_connect (
|
|||
////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['change'])) {
|
||||
$messages = [];
|
||||
|
||||
|
||||
// Eingaben überprüfen:
|
||||
$messages = [];
|
||||
|
||||
|
||||
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)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
||||
if(empty($messages)) {
|
||||
// Helferdaten Ändern
|
||||
HelferdatenAendern($db_link,$HelferName,$HelferEmail,$HelferHandy,$HelferNewPasswort,$HelferID);
|
||||
// Eingaben überprüfen:
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
|
||||
if(strlen($_POST['helfer-newpasswort']) < 8 and $_POST['helfer-newpasswort'] != "") {
|
||||
$messages[] = 'Neues Passwort zu kurz';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
}
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
||||
if(empty($messages)) {
|
||||
// Helferdaten Ändern
|
||||
HelferdatenAendern($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $HelferID);
|
||||
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -71,52 +70,46 @@ if(isset($_POST['change'])) {
|
|||
// Helferdate holen
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
$db_erg = Helferdaten($db_link,$HelferID);
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferEmail = $zeile['Email'];
|
||||
$HelferHandy = $zeile['Handy'];
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferEmail = $zeile['Email'];
|
||||
$HelferHandy = $zeile['Handy'];
|
||||
}
|
||||
|
||||
/// Logout
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['logout']))
|
||||
{
|
||||
unset($_SESSION["HelferID"]);
|
||||
//$_POST['login'] = 1;
|
||||
}
|
||||
if(isset($_POST['logout'])) {
|
||||
unset($_SESSION["HelferID"]);
|
||||
//$_POST['login'] = 1;
|
||||
}
|
||||
|
||||
/// Login
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['login']))
|
||||
{
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
if(isset($_POST['login'])) {
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
|
||||
if(empty($messages)) {
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort, 0 );
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -131,27 +124,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="<?=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="<?=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="<?=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="<?=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="<?=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;
|
||||
|
||||
|
|
@ -11,9 +13,9 @@ function encode_string($key, $email, $level, $verification) {
|
|||
// sha256 hash des passworts, damit das Geheimnis lang genug ist
|
||||
$cipher_key = openssl_digest($key, 'SHA256', true);
|
||||
$cipher_text = openssl_encrypt($token_content, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
|
||||
|
||||
if(isset($debug)) {
|
||||
echo "<br>encode: cipher:".chunk_split(bin2hex($cipher_text),4,' ')." <br>iv:".chunk_split(bin2hex($iv),4,' ')." <br>iv_length:$iv_length<br>cipher_key ".chunk_split(bin2hex($cipher_key),4,' ')."<br>";
|
||||
echo "<br>encode: cipher:".chunk_split(bin2hex($cipher_text), 4, ' ')." <br>iv:".chunk_split(bin2hex($iv), 4, ' ')." <br>iv_length:$iv_length<br>cipher_key ".chunk_split(bin2hex($cipher_key), 4, ' ')."<br>";
|
||||
}
|
||||
|
||||
$cipher_text = $iv . $cipher_text;
|
||||
|
|
@ -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);
|
||||
|
|
@ -35,13 +38,15 @@ function decode_string($key, $encrypted_data, $verification) {
|
|||
$cipher_options = OPENSSL_RAW_DATA;
|
||||
$cipher_key = openssl_digest($key, 'SHA256', true);
|
||||
|
||||
if(isset($debug)){
|
||||
echo "<br>decode: cipher:".chunk_split(bin2hex($cipher_text),4,' '). " <br>iv:".chunk_split(bin2hex($iv),4,' '). " <br>iv_length:$iv_length<br>cipher_key ". chunk_split(bin2hex($cipher_key),4,' ');
|
||||
if(isset($debug)) {
|
||||
echo "<br>decode: cipher:".chunk_split(bin2hex($cipher_text), 4, ' '). " <br>iv:".chunk_split(bin2hex($iv), 4, ' '). " <br>iv_length:$iv_length<br>cipher_key ". chunk_split(bin2hex($cipher_key), 4, ' ');
|
||||
}
|
||||
|
||||
$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) {
|
||||
|
|
@ -53,9 +58,8 @@ function decode_string($key, $encrypted_data, $verification) {
|
|||
);
|
||||
} else {
|
||||
error_log("Verschlüsseltes Token enthielt den Verifikationscode nicht: $decrypted_data<br>\n");
|
||||
return array(
|
||||
'success' => 0
|
||||
return array(
|
||||
'success' => 0
|
||||
);
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,53 +1,47 @@
|
|||
<?php
|
||||
/// Logout
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_GET['logout']) || isset($_POST['logout']))
|
||||
{
|
||||
// remove all session variables
|
||||
session_unset();
|
||||
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>';
|
||||
|
||||
}
|
||||
// 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']))
|
||||
{
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
if(isset($_POST['login'])) {
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
//if (isset ($_POST['helfer-name'])) {
|
||||
// $HelferName = $_POST['helfer-name'];
|
||||
//} // delete - login shouldnt provide this
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
//if (isset ($_POST['helfer-name'])) {
|
||||
// $HelferName = $_POST['helfer-name'];
|
||||
//} // delete - login shouldnt provide this
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
|
||||
if(empty($messages)) {
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort, 0 );
|
||||
}
|
||||
else
|
||||
{
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(!isset($_SESSION["HelferID"]))
|
||||
{
|
||||
if(!isset($_SESSION["HelferID"])) {
|
||||
|
||||
?>
|
||||
?>
|
||||
<form method="post" action="#Info">
|
||||
|
||||
<fieldset>
|
||||
|
|
@ -56,13 +50,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="<?=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="<?=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>
|
||||
|
|
@ -77,14 +71,14 @@ if(!isset($_SESSION["HelferID"]))
|
|||
|
||||
</form>
|
||||
<?php
|
||||
exit;
|
||||
exit;
|
||||
}
|
||||
|
||||
|
||||
$HelferID = $_SESSION["HelferID"];
|
||||
$HelferName = $_SESSION["HelferName"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
//TODO vereinheitlichen. index.php verwendet HelferIsAdmin
|
||||
$HelferIsAdmin=$AdminStatus = $_SESSION["AdminStatus"];
|
||||
$HelferLevel= $_SESSION["HelferLevel"];
|
||||
//TODO vereinheitlichen. index.php verwendet HelferIsAdmin
|
||||
$HelferIsAdmin = $AdminStatus = $_SESSION["AdminStatus"];
|
||||
$HelferLevel = $_SESSION["HelferLevel"];
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
<?php
|
||||
|
||||
require_once("../konfiguration.php");
|
||||
$options=[];
|
||||
$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,
|
||||
|
|
@ -27,14 +29,14 @@ function read($db, $requestParams){
|
|||
INNER JOIN Dienst ON Dienst.DienstID=Schicht.DienstID
|
||||
INNER JOIN SchichtUebersicht ON Dienst.DienstID=SchichtUebersicht.DienstID AND SchichtUebersicht.SchichtID=Schicht.SchichtID
|
||||
GROUP BY Schicht.SchichtID;";
|
||||
|
||||
|
||||
//error_log(date('Y-m-d H:i ') . $queryText,3,"/tmp/sql.log");
|
||||
// handle dynamic loading
|
||||
if (isset($requestParams["from"]) && isset($requestParams["to"])) {
|
||||
//error_log("timespan given. from: ".$requestParams["from"]." to: ".$requestParams["to"]);
|
||||
$queryText .= " WHERE `Schicht.Bis`>=? AND `Schicht.Von` < ?;";
|
||||
$queryParams = [filter_var($requestParams["from"],FILTER_SANITIZE_NUMBER_FLOAT), filter_var($requestParams["to"],FILTER_SANITIZE_NUMBER_FLOAT)];
|
||||
}
|
||||
//error_log("timespan given. from: ".$requestParams["from"]." to: ".$requestParams["to"]);
|
||||
$queryText .= " WHERE `Schicht.Bis`>=? AND `Schicht.Von` < ?;";
|
||||
$queryParams = [filter_var($requestParams["from"], FILTER_SANITIZE_NUMBER_FLOAT), filter_var($requestParams["to"], FILTER_SANITIZE_NUMBER_FLOAT)];
|
||||
}
|
||||
$query = $db->prepare($queryText);
|
||||
$query->execute($queryParams);
|
||||
$events = $query->fetchAll();
|
||||
|
|
@ -47,11 +49,10 @@ switch ($_SERVER["REQUEST_METHOD"]) {
|
|||
break;
|
||||
case "POST":
|
||||
// only if changes will be allowed
|
||||
break;
|
||||
default:
|
||||
throw new Exception("Unexpected Method");
|
||||
break;
|
||||
break;
|
||||
default:
|
||||
throw new Exception("Unexpected Method");
|
||||
break;
|
||||
}
|
||||
header("Content-Type: application/json");
|
||||
echo json_encode($result);
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
<?php
|
||||
|
||||
require_once("../konfiguration.php");
|
||||
$options=[];
|
||||
$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,
|
||||
|
|
@ -34,22 +38,21 @@ function read_from_db($db, $requestParams,$HelferID){
|
|||
|
||||
$query = $db->prepare($queryText);
|
||||
$query->execute($queryParams);
|
||||
error_log(date('Y-m-d H:i ') . print_r($queryText,true),3,"/var/log/dropamsee/debug.log");
|
||||
error_log(date('Y-m-d H:i ') . print_r($queryText, true), 3, "/var/log/dropamsee/debug.log");
|
||||
$events = $query->fetchAll();
|
||||
return $events;
|
||||
}
|
||||
|
||||
switch ($_SERVER["REQUEST_METHOD"]) {
|
||||
case "GET":
|
||||
$result = read_from_db($db, $_GET,$HelferID);
|
||||
$result = read_from_db($db, $_GET, $HelferID);
|
||||
break;
|
||||
case "POST":
|
||||
// only if changes will be allowed
|
||||
break;
|
||||
default:
|
||||
throw new Exception("Unexpected Method");
|
||||
break;
|
||||
break;
|
||||
default:
|
||||
throw new Exception("Unexpected Method");
|
||||
break;
|
||||
}
|
||||
header("Content-Type: application/json");
|
||||
echo json_encode($result);
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@
|
|||
<?php
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ include '_login.php';
|
|||
//$db_erg = Helferdaten($db_link,$HelferID);
|
||||
//while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
//{
|
||||
// $HelferName=$zeile['Name'];
|
||||
// $HelferName=$zeile['Name'];
|
||||
// $HelferIsAdmin=$zeile['Admin'];
|
||||
//}
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
@ -65,26 +62,25 @@ include '_login.php';
|
|||
<img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"> <b>Nächste Helferschichten:</b>
|
||||
|
||||
<ul style="display: block; list-style-type: none; margin-left: 20px;margin-top: 0px;margin-bottom: 0px">
|
||||
<?php
|
||||
<?php
|
||||
//<li>Fr 08:00 Leitung Halle</li>
|
||||
//<li>So 12:00 Abbau</li>
|
||||
/// Die 3 nächsten Schichten Des Helfers Anzeigen
|
||||
////////////////////////////////////////////////////////
|
||||
//$HelferID=72;
|
||||
|
||||
$db_erg = AlleSchichtenEinesHelfersVonJetzt($db_link,$HelferID);
|
||||
|
||||
$db_erg = AlleSchichtenEinesHelfersVonJetzt($db_link, $HelferID);
|
||||
|
||||
|
||||
$iSQLCount = mysqli_num_rows($db_erg);
|
||||
//$iSQLCount = 3;
|
||||
$iSQLCount = mysqli_num_rows($db_erg);
|
||||
//$iSQLCount = 3;
|
||||
|
||||
|
||||
$iCount=0;
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC) and $iCount<3)
|
||||
{
|
||||
$iCount = 0;
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC) and $iCount < 3) {
|
||||
echo "<li>". $zeile['Ab'] . " ". $zeile['Was'] . "</li>";
|
||||
$iCount++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
|
@ -140,16 +136,15 @@ 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>
|
||||
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
||||
</tr>
|
||||
<tr onclick="window.location.href='index.php?logout=1';">
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<?php
|
||||
// datenbank-defines extern
|
||||
require_once('/etc/helferdb_konfiguration.php');
|
||||
// die folgenden Zeilen ohne Kommentarzeichen nach /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' );
|
||||
|
|
@ -15,7 +15,7 @@ require_once('/etc/helferdb_konfiguration.php');
|
|||
date_default_timezone_set('Europe/Berlin');
|
||||
setlocale(LC_TIME, "de_DE.UTF-8");
|
||||
$start_date = new DateTimeImmutable("2023-05-18");
|
||||
define ('TAGE_DAUER', 4);
|
||||
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
|
||||
|
|
@ -35,10 +35,10 @@ define ('TAGE_DAUER', 4);
|
|||
|
||||
// muss nicht angepasst werden // no changes needed
|
||||
// Zeitbereich: -1 davor, 0 kein Limit, 1-N Tag N der Con, 1000: nach der Con
|
||||
$ZeitBereichWerte=range(-1,TAGE_DAUER);
|
||||
array_push($ZeitBereichWerte,1000);
|
||||
define('ZEITBEREICHWERTE', $ZeitBereichWerte);
|
||||
$TageNamenDeutsch=array("So","Mo","Di","Mi","Do","Fr","Sa");
|
||||
$ZeitBereichWerte = range(-1, TAGE_DAUER);
|
||||
array_push($ZeitBereichWerte, 1000);
|
||||
define('ZEITBEREICHWERTE', $ZeitBereichWerte);
|
||||
$TageNamenDeutsch = array("So","Mo","Di","Mi","Do","Fr","Sa");
|
||||
|
||||
//Kalender-Konfiguration
|
||||
$dsn = "mysql:host=localhost;dbname=".MYSQL_DATENBANK; # dsn fuer Kalender
|
||||
|
|
|
|||
Loading…
Reference in New Issue