Result from "php-cs-fixer fix html"
This commit is contained in:
parent
58d6aead69
commit
8256946c5f
|
|
@ -1 +1,2 @@
|
||||||
*.pdf
|
*.pdf
|
||||||
|
.php-cs-fixer.cache
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
$db_link=ConnectDB();
|
$db_link = ConnectDB();
|
||||||
include '_login.php';
|
include '_login.php';
|
||||||
|
|
||||||
if($AdminStatus != 1) {
|
if($AdminStatus != 1) {
|
||||||
|
|
@ -28,33 +28,29 @@ if($AdminStatus != 1) {
|
||||||
|
|
||||||
DatenbankAufDeutsch($db_link);
|
DatenbankAufDeutsch($db_link);
|
||||||
|
|
||||||
$AliasHelferID=0;
|
$AliasHelferID = 0;
|
||||||
|
|
||||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||||
if(isset($_SESSION["AliasHelferID"]))
|
if(isset($_SESSION["AliasHelferID"])) {
|
||||||
{
|
|
||||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||||
}
|
}
|
||||||
|
|
||||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||||
|
|
||||||
if(isset($_POST["AliasHelfer"]))
|
if(isset($_POST["AliasHelfer"])) {
|
||||||
{
|
|
||||||
$AliasHelferID = $_POST["AliasHelfer"];
|
$AliasHelferID = $_POST["AliasHelfer"];
|
||||||
//echo "post<br>";
|
//echo "post<br>";
|
||||||
}
|
}
|
||||||
|
|
||||||
if($AliasHelferID!=0)
|
if($AliasHelferID != 0) {
|
||||||
{
|
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
|
||||||
}
|
}
|
||||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||||
|
|
||||||
$db_erg = Helferdaten($db_link,$HelferID);
|
$db_erg = Helferdaten($db_link, $HelferID);
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
$HelferName = $zeile['Name'];
|
||||||
$HelferName=$zeile['Name'];
|
$HelferIsAdmin = $zeile['Admin'];
|
||||||
$HelferIsAdmin=$zeile['Admin'];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
@ -88,20 +84,16 @@ 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()">
|
<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
|
<?php
|
||||||
$db_erg = HelferListe($db_link);
|
$db_erg = HelferListe($db_link);
|
||||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
if ($AliasHelferID != $zeile['HelferID']) {
|
||||||
if ($AliasHelferID!=$zeile['HelferID'])
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
</select></form>
|
</select></form>
|
||||||
</b>
|
</b>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
$db_link=ConnectDB();
|
$db_link = ConnectDB();
|
||||||
include '_login.php';
|
include '_login.php';
|
||||||
|
|
||||||
if($AdminStatus != 1) {
|
if($AdminStatus != 1) {
|
||||||
|
|
@ -33,18 +33,16 @@ if($AdminStatus != 1) {
|
||||||
|
|
||||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['CloseInfo']))
|
if(isset($_POST['CloseInfo'])) {
|
||||||
{
|
unset($InfoMeineSchichtID);
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
UNSET($InfoAlleSchichtID);
|
|
||||||
}
|
}
|
||||||
if(isset($_POST['InfoMeineSchichtID']))
|
if(isset($_POST['InfoMeineSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||||
UNSET($InfoAlleSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||||
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$Wo = $zeile['Wo'];
|
$Wo = $zeile['Wo'];
|
||||||
|
|
@ -57,17 +55,16 @@ if(isset($_POST['InfoMeineSchichtID']))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isset($_GET['InfoAlleSchichtID']))
|
if(isset($_GET['InfoAlleSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoMeineSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||||
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$Wo = $zeile['Wo'];
|
$Wo = $zeile['Wo'];
|
||||||
$Dauer=$zeile['Dauer'];
|
$Dauer = $zeile['Dauer'];
|
||||||
$Leiter = $zeile['Name'];
|
$Leiter = $zeile['Name'];
|
||||||
$LeiterHandy = $zeile['Handy'];
|
$LeiterHandy = $zeile['Handy'];
|
||||||
$LeiterEmail = $zeile['Email'];
|
$LeiterEmail = $zeile['Email'];
|
||||||
|
|
@ -76,65 +73,57 @@ if(isset($_GET['InfoAlleSchichtID']))
|
||||||
|
|
||||||
|
|
||||||
// Beteiligte Helfer Holen
|
// Beteiligte Helfer Holen
|
||||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
$db_erg = BeteiligteHelfer($db_link, $InfoAlleSchichtID);
|
||||||
|
|
||||||
|
|
||||||
$x=0;
|
$x = 0;
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$MitHelferID[$x] = $zeile['HelferID'];
|
$MitHelferID[$x] = $zeile['HelferID'];
|
||||||
$MitHelfer[$x] = $zeile['Name'];
|
$MitHelfer[$x] = $zeile['Name'];
|
||||||
$MitHelferHandy[$x]= $zeile['Handy'];
|
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||||
$x++;
|
$x++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_GET['ZeitBereich']))
|
if(isset($_GET['ZeitBereich'])) {
|
||||||
{
|
|
||||||
$ZeitBereich = $_GET['ZeitBereich'];
|
$ZeitBereich = $_GET['ZeitBereich'];
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$ZeitBereich = 1;
|
$ZeitBereich = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
function HelferAuswahlButton($db_link,$AliasHelferID){
|
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
|
||||||
$db_erg = HelferListe($db_link);
|
|
||||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|
||||||
{
|
{
|
||||||
if ($AliasHelferID!=$zeile['HelferID'])
|
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>";
|
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo '</select></form>';
|
echo '</select></form>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['AliasHelfer'])) {
|
if(isset($_POST['AliasHelfer'])) {
|
||||||
$AliasHelferID=$_POST['AliasHelfer'];
|
$AliasHelferID = $_POST['AliasHelfer'];
|
||||||
}elseif(isset($_SESSION["AliasHelferID"])){
|
} elseif(isset($_SESSION["AliasHelferID"])) {
|
||||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||||
}else{
|
} else {
|
||||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||||
|
|
||||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||||
$AdminID = $_SESSION["AdminID"];
|
$AdminID = $_SESSION["AdminID"];
|
||||||
|
|
||||||
$db_erg=Helferdaten($db_link,$HelferID);
|
$db_erg = Helferdaten($db_link, $HelferID);
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
$HelferName = $zeile['Name'];
|
||||||
$HelferName=$zeile['Name'];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helferliste Anzeigen
|
// Helferliste Anzeigen
|
||||||
|
|
@ -164,23 +153,19 @@ if(isset($_POST['plusschicht'])) {
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
|
||||||
// Helfer Schicht zuweisen
|
// Helfer Schicht zuweisen
|
||||||
$db_erg = HelferSchichtZuweisen($db_link,$AliasHelferID,$SchichtId,$AdminID);
|
$db_erg = HelferSchichtZuweisen($db_link, $AliasHelferID, $SchichtId, $AdminID);
|
||||||
|
|
||||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||||
$HelferName = '';
|
$HelferName = '';
|
||||||
$HelferEmail = '';
|
$HelferEmail = '';
|
||||||
$HelferHandy = '';
|
$HelferHandy = '';
|
||||||
//die('<div class="Helfer wurde angelegt.</div>');
|
//die('<div class="Helfer wurde angelegt.</div>');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message)
|
foreach($messages as $message) {
|
||||||
{
|
|
||||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
|
|
@ -190,23 +175,19 @@ if(isset($_POST['plusschicht'])) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['minusschicht'])) {
|
if(isset($_POST['minusschicht'])) {
|
||||||
// Mich aus Schicht entfernen
|
// Mich aus Schicht entfernen
|
||||||
$messages = [];
|
$messages = [];
|
||||||
|
|
||||||
$SchichtID = $_POST['minusschicht'];
|
$SchichtID = $_POST['minusschicht'];
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
|
||||||
// Helfer aus Schicht entfernen
|
// Helfer aus Schicht entfernen
|
||||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link,$AliasHelferID,$SchichtID,$AdminID);
|
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $AliasHelferID, $SchichtID, $AdminID);
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message)
|
foreach($messages as $message) {
|
||||||
{
|
|
||||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
|
|
@ -223,45 +204,41 @@ if(isset($_POST['minusschicht'])) {
|
||||||
|
|
||||||
|
|
||||||
// Zusammenfassung Eigener Schichten
|
// Zusammenfassung Eigener Schichten
|
||||||
$db_erg = SchichtenSummeEinesHelfers($db_link,$AliasHelferID);
|
$db_erg = SchichtenSummeEinesHelfers($db_link, $AliasHelferID);
|
||||||
$zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC);
|
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||||
|
|
||||||
echo '<table id="customers"><tr class="header"><th onclick="window.location.href=\'AdminMeineSchichten.php\'">';
|
echo '<table id="customers"><tr class="header"><th onclick="window.location.href=\'AdminMeineSchichten.php\'">';
|
||||||
echo " Dienstplan von $HelferName (Zusammenfassung)<br>";
|
echo " Dienstplan von $HelferName (Zusammenfassung)<br>";
|
||||||
echo $zeile['Anzahl'];
|
echo $zeile['Anzahl'];
|
||||||
echo " Schichten insgesamt ";
|
echo " Schichten insgesamt ";
|
||||||
echo $zeile['Dauer']/3600;
|
echo $zeile['Dauer'] / 3600;
|
||||||
echo " Stunden";
|
echo " Stunden";
|
||||||
echo '</th></tr></table><br><br>';
|
echo '</th></tr></table><br><br>';
|
||||||
/// Schichten Auswahl
|
/// Schichten Auswahl
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
$addschicht =$_SESSION["addschicht"];
|
$addschicht = $_SESSION["addschicht"];
|
||||||
$dienstsort =$_SESSION["dienstsort"];
|
$dienstsort = $_SESSION["dienstsort"];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='1')
|
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '1') {
|
||||||
{
|
$addschicht = '1';
|
||||||
$addschicht='1';
|
$dienstsort = '1';
|
||||||
$dienstsort='1';
|
|
||||||
}
|
}
|
||||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='2')
|
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '2') {
|
||||||
{
|
$addschicht = '2';
|
||||||
$addschicht='2';
|
$dienstsort = '2';
|
||||||
$dienstsort='2';
|
|
||||||
}
|
}
|
||||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='0')
|
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '0') {
|
||||||
{
|
$addschicht = '0';
|
||||||
$addschicht='0';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$_SESSION["addschicht"] =$addschicht;
|
$_SESSION["addschicht"] = $addschicht;
|
||||||
$_SESSION["dienstsort"] =$dienstsort;
|
$_SESSION["dienstsort"] = $dienstsort;
|
||||||
|
|
||||||
//echo "<br>Detail=".$addschicht."<br>";
|
//echo "<br>Detail=".$addschicht."<br>";
|
||||||
|
|
||||||
if($addschicht=='0')
|
if($addschicht == '0') {
|
||||||
{
|
|
||||||
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
||||||
echo "<button name='addschicht' value='1'>Tage</button>";
|
echo "<button name='addschicht' value='1'>Tage</button>";
|
||||||
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
||||||
|
|
@ -269,37 +246,29 @@ if($addschicht=='0')
|
||||||
|
|
||||||
//echo "InfoAlleSchichtID ".$InfoAlleSchichtID;
|
//echo "InfoAlleSchichtID ".$InfoAlleSchichtID;
|
||||||
|
|
||||||
if($addschicht!='0')
|
if($addschicht != '0') {
|
||||||
{
|
|
||||||
//$db_erg = AlleSchichten($db_link,$dienstsort);
|
//$db_erg = AlleSchichten($db_link,$dienstsort);
|
||||||
//$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00");
|
//$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00");
|
||||||
if ($ZeitBereich==1) // Alle
|
if ($ZeitBereich == 1) { // Alle
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00", -1);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2200-05-19 00:00:00",-1);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==2) // Davor
|
if ($ZeitBereich == 2) { // Davor
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2023-05-18 00:00:00", -1);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2023-05-18 00:00:00",-1);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==3) // Do
|
if ($ZeitBereich == 3) { // Do
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-18 00:00:00", "2023-05-19 00:00:00", -1);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",-1);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==4) // Fr
|
if ($ZeitBereich == 4) { // Fr
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-19 00:00:00", "2023-05-20 00:00:00", -1);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-19 00:00:00","2023-05-20 00:00:00",-1);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==5) // Sa
|
if ($ZeitBereich == 5) { // Sa
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-20 00:00:00", "2023-05-21 00:00:00", -1);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-20 00:00:00","2023-05-21 00:00:00",-1);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==6) // So
|
if ($ZeitBereich == 6) { // So
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-21 00:00:00", "2023-05-22 00:00:00", -1);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-21 00:00:00","2023-05-22 00:00:00",-1);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==7) // Danach
|
if ($ZeitBereich == 7) { // Danach
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-22 00:00:00", "2223-05-22 00:00:00", -1);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-22 00:00:00","2223-05-22 00:00:00",-1);
|
|
||||||
}
|
}
|
||||||
// fuer Anzahlanzeige in Ueberschrift
|
// fuer Anzahlanzeige in Ueberschrift
|
||||||
$iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
$iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
||||||
|
|
@ -322,60 +291,39 @@ if($addschicht!='0')
|
||||||
echo "<th>". "Von" . "</th>";
|
echo "<th>". "Von" . "</th>";
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
if ($ZeitBereich==1)
|
if ($ZeitBereich == 1) {
|
||||||
{
|
|
||||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>". "Alle" . "</th>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>". "Sa" . "</th>";
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==6)
|
if ($ZeitBereich == 6) {
|
||||||
{
|
|
||||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
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>";
|
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=7\"'>". "Danach" . "</th>";
|
||||||
}
|
}
|
||||||
//echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>". "Davor" . "</th>";
|
//echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>". "Davor" . "</th>";
|
||||||
|
|
@ -391,34 +339,28 @@ if($addschicht!='0')
|
||||||
$OldTag = "";
|
$OldTag = "";
|
||||||
$OldWas = "";
|
$OldWas = "";
|
||||||
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link,$AliasHelferID);
|
$MeineDienste = SchichtIdArrayEinesHelfers($db_link, $AliasHelferID);
|
||||||
//print_r($MeineDienste);
|
//print_r($MeineDienste);
|
||||||
|
|
||||||
echo '</table>';
|
echo '</table>';
|
||||||
echo '<table id="customers">';
|
echo '<table id="customers">';
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
if ($dienstsort=='1')
|
if ($dienstsort == '1') {
|
||||||
{
|
|
||||||
$Tag = $zeile['Tag'];
|
$Tag = $zeile['Tag'];
|
||||||
|
|
||||||
if ($Tag!=$OldTag)
|
if ($Tag != $OldTag) {
|
||||||
{
|
|
||||||
echo "<tr class='header'><th colspan='5' >";
|
echo "<tr class='header'><th colspan='5' >";
|
||||||
echo $Tag;
|
echo $Tag;
|
||||||
echo "</th></tr>";
|
echo "</th></tr>";
|
||||||
$OldTag = $Tag;
|
$OldTag = $Tag;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
|
|
||||||
if ($Was!=$OldWas)
|
if ($Was != $OldWas) {
|
||||||
{
|
|
||||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||||
echo $Was;
|
echo $Was;
|
||||||
echo "</th>";
|
echo "</th>";
|
||||||
|
|
@ -432,22 +374,19 @@ if($addschicht!='0')
|
||||||
$OldWas = $Was;
|
$OldWas = $Was;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$Color="red";
|
$Color = "red";
|
||||||
if ( $zeile['Ist'] > 0 )
|
if ($zeile['Ist'] > 0) {
|
||||||
{
|
$Color = "yellow";
|
||||||
$Color="yellow";
|
|
||||||
}
|
}
|
||||||
if ( $zeile['Ist'] >= $zeile['Soll'] )
|
if ($zeile['Ist'] >= $zeile['Soll']) {
|
||||||
{
|
$Color = "green";
|
||||||
$Color="green";
|
|
||||||
}
|
}
|
||||||
$Von = $zeile['Ab'];
|
$Von = $zeile['Ab'];
|
||||||
$Bis = $zeile['Bis'];
|
$Bis = $zeile['Bis'];
|
||||||
if ( substr($Von,0,2) == substr($Bis,0,2))
|
if (substr($Von, 0, 2) == substr($Bis, 0, 2)) {
|
||||||
{
|
$Bis = substr($Bis, 2);
|
||||||
$Bis = substr($Bis,2);
|
|
||||||
}
|
}
|
||||||
$Von = substr($Von,2);
|
$Von = substr($Von, 2);
|
||||||
|
|
||||||
// Meine Schichten gruen einfaerben
|
// Meine Schichten gruen einfaerben
|
||||||
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||||
|
|
@ -461,12 +400,9 @@ if($addschicht!='0')
|
||||||
|
|
||||||
echo '<tr '.$rowstyle.'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
echo '<tr '.$rowstyle.'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||||
|
|
||||||
if ($dienstsort=='1')
|
if ($dienstsort == '1') {
|
||||||
{
|
|
||||||
echo "<td>". $zeile['Was'] . "</td>";
|
echo "<td>". $zeile['Was'] . "</td>";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<td>". $zeile['Tag'] . "</td>";
|
echo "<td>". $zeile['Tag'] . "</td>";
|
||||||
}
|
}
|
||||||
echo "<td>". $Von . "</td>";
|
echo "<td>". $Von . "</td>";
|
||||||
|
|
@ -491,7 +427,7 @@ if($addschicht!='0')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
mysqli_free_result( $db_erg );
|
mysqli_free_result($db_erg);
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
$db_link=ConnectDB();
|
$db_link = ConnectDB();
|
||||||
include '_login.php';
|
include '_login.php';
|
||||||
|
|
||||||
if($AdminStatus != 1) {
|
if($AdminStatus != 1) {
|
||||||
|
|
@ -29,110 +29,106 @@ if($AdminStatus != 1) {
|
||||||
|
|
||||||
DatenbankAufDeutsch($db_link);
|
DatenbankAufDeutsch($db_link);
|
||||||
|
|
||||||
$DienstID =$_SESSION["DienstID"];
|
$DienstID = $_SESSION["DienstID"];
|
||||||
$SchichtID =$_SESSION["SchichtID"];
|
$SchichtID = $_SESSION["SchichtID"];
|
||||||
|
|
||||||
|
|
||||||
$HelferID = $_SESSION["HelferID"];
|
$HelferID = $_SESSION["HelferID"];
|
||||||
$AdminID = $_SESSION["AdminID"];
|
$AdminID = $_SESSION["AdminID"];
|
||||||
|
|
||||||
if(isset($_POST['HelferID']))
|
if(isset($_POST['HelferID'])) {
|
||||||
{
|
|
||||||
$HelferID = $_POST['HelferID'];
|
$HelferID = $_POST['HelferID'];
|
||||||
}
|
}
|
||||||
if(isset($_POST['ShowHelfer'])) {
|
if(isset($_POST['ShowHelfer'])) {
|
||||||
$HelferID=$_POST['HelperSearch'];
|
$HelferID = $_POST['HelperSearch'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$_SESSION["HelferID"] = $HelferID;
|
$_SESSION["HelferID"] = $HelferID;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['ChangeDienst'])) {
|
if(isset($_POST['ChangeDienst'])) {
|
||||||
|
|
||||||
$Was=$_POST['Dienst-Was'];
|
$Was = $_POST['Dienst-Was'];
|
||||||
$Wo=$_POST['Dienst-Wo'];
|
$Wo = $_POST['Dienst-Wo'];
|
||||||
$Info=$_POST['Dienst-Info'];
|
$Info = $_POST['Dienst-Info'];
|
||||||
$Leiter=$_POST['Dienst-Leiter'];
|
$Leiter = $_POST['Dienst-Leiter'];
|
||||||
$Gruppe=$_POST['Dienst-Gruppe'];
|
$Gruppe = $_POST['Dienst-Gruppe'];
|
||||||
$HelferLevel=$_POST['HelferLevel'];
|
$HelferLevel = $_POST['HelferLevel'];
|
||||||
ChangeDienst($db_link,$DienstID,$Was,$Wo,$Info,$Leiter,$Gruppe,$HelferLevel);
|
ChangeDienst($db_link, $DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['NewDienst'])) {
|
if(isset($_POST['NewDienst'])) {
|
||||||
|
|
||||||
$Was=$_POST['Dienst-Was'];
|
$Was = $_POST['Dienst-Was'];
|
||||||
$Wo=$_POST['Dienst-Wo'];
|
$Wo = $_POST['Dienst-Wo'];
|
||||||
$Info=$_POST['Dienst-Info'];
|
$Info = $_POST['Dienst-Info'];
|
||||||
$Leiter=$_POST['Dienst-Leiter'];
|
$Leiter = $_POST['Dienst-Leiter'];
|
||||||
$Gruppe=$_POST['Dienst-Gruppe'];
|
$Gruppe = $_POST['Dienst-Gruppe'];
|
||||||
$HelferLevel=$_POST['HelferLevel'];
|
$HelferLevel = $_POST['HelferLevel'];
|
||||||
NewDienst($db_link,$DienstID,$Was,$Wo,$Info,$Leiter,$Gruppe,$HelferLevel);
|
NewDienst($db_link, $DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['DeleteDienst']))
|
if(isset($_POST['DeleteDienst'])) {
|
||||||
{
|
|
||||||
|
|
||||||
if (!DeleteDienst($db_link,$DienstID,false))
|
if (!DeleteDienst($db_link, $DienstID, false)) {
|
||||||
{
|
|
||||||
echo "Erst Schichten des Dienstes Löschen!";
|
echo "Erst Schichten des Dienstes Löschen!";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['ChangeSchicht'])) {
|
if(isset($_POST['ChangeSchicht'])) {
|
||||||
|
|
||||||
$Von=$_POST['Schicht-Von'];
|
$Von = $_POST['Schicht-Von'];
|
||||||
$Bis=$_POST['Schicht-Bis'];
|
$Bis = $_POST['Schicht-Bis'];
|
||||||
$Soll=$_POST['Schicht-Soll'];
|
$Soll = $_POST['Schicht-Soll'];
|
||||||
|
|
||||||
ChangeSchicht($db_link,$SchichtID,$Von,$Bis,$Soll);
|
ChangeSchicht($db_link, $SchichtID, $Von, $Bis, $Soll);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['NewSchicht'])) {
|
if(isset($_POST['NewSchicht'])) {
|
||||||
|
|
||||||
$Von=$_POST['Schicht-Von'];
|
$Von = $_POST['Schicht-Von'];
|
||||||
$Bis=$_POST['Schicht-Bis'];
|
$Bis = $_POST['Schicht-Bis'];
|
||||||
$Soll=$_POST['Schicht-Soll'];
|
$Soll = $_POST['Schicht-Soll'];
|
||||||
|
|
||||||
NewSchicht($db_link,$DienstID,$Von,$Bis,$Soll);
|
NewSchicht($db_link, $DienstID, $Von, $Bis, $Soll);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['DeleteSchicht'])) {
|
if(isset($_POST['DeleteSchicht'])) {
|
||||||
|
|
||||||
|
|
||||||
if(!DeleteSchicht($db_link,$SchichtID,false))
|
if(!DeleteSchicht($db_link, $SchichtID, false)) {
|
||||||
{
|
|
||||||
echo "Erst Helfer aus Schicht austragen<br>";
|
echo "Erst Helfer aus Schicht austragen<br>";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['ShowSchicht'])) {
|
if(isset($_POST['ShowSchicht'])) {
|
||||||
$SchichtID=$_POST['SchichtSearch'];
|
$SchichtID = $_POST['SchichtSearch'];
|
||||||
}
|
}
|
||||||
if(isset($_POST['SchichtSearch'])) {
|
if(isset($_POST['SchichtSearch'])) {
|
||||||
$SchichtID=$_POST['SchichtSearch'];
|
$SchichtID = $_POST['SchichtSearch'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['ShowSchichten'])) {
|
if(isset($_POST['ShowSchichten'])) {
|
||||||
$DienstID=$_POST['DienstSearch'];
|
$DienstID = $_POST['DienstSearch'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['DienstSearch'])) {
|
if(isset($_POST['DienstSearch'])) {
|
||||||
$DienstID=$_POST['DienstSearch'];
|
$DienstID = $_POST['DienstSearch'];
|
||||||
$SchichtID=0;
|
$SchichtID = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -150,30 +146,26 @@ $_SESSION["HelferID"] = $HelferID;
|
||||||
|
|
||||||
$db_erg = GetDienste($db_link);
|
$db_erg = GetDienste($db_link);
|
||||||
|
|
||||||
$Was="";
|
$Was = "";
|
||||||
$Wo="";
|
$Wo = "";
|
||||||
$Info="";
|
$Info = "";
|
||||||
$Leiter="";
|
$Leiter = "";
|
||||||
$Gruppe="";
|
$Gruppe = "";
|
||||||
$HelferLevel="";
|
$HelferLevel = "";
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
|
|
||||||
if ($zeile['DienstID']!=$DienstID)
|
if ($zeile['DienstID'] != $DienstID) {
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
||||||
$Was=$zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$Wo=$zeile['Wo'];
|
$Wo = $zeile['Wo'];
|
||||||
$Info=$zeile['Info'];
|
$Info = $zeile['Info'];
|
||||||
$Leiter=$zeile['Leiter'];
|
$Leiter = $zeile['Leiter'];
|
||||||
$Gruppe=$zeile['ElternDienstID'];
|
$Gruppe = $zeile['ElternDienstID'];
|
||||||
$HelferLevel=$zeile['HelferLevel'];
|
$HelferLevel = $zeile['HelferLevel'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -194,41 +186,37 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
||||||
<table border="0" id="customers">
|
<table border="0" id="customers">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="border: 0px solid black;">Was</td></tr><tr><td style="border: 0px solid black;">
|
<td style="border: 0px solid black;">Was</td></tr><tr><td style="border: 0px solid black;">
|
||||||
<input name="Dienst-Was" type="text" value="<?=htmlspecialchars($Was??'')?>">
|
<input name="Dienst-Was" type="text" value="<?=htmlspecialchars($Was ?? '')?>">
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="border: 0px solid black;">Wo</td></tr><tr><td style="border: 0px solid black;">
|
<td style="border: 0px solid black;">Wo</td></tr><tr><td style="border: 0px solid black;">
|
||||||
<input name="Dienst-Wo" type="text " value="<?=htmlspecialchars($Wo??'')?>">
|
<input name="Dienst-Wo" type="text " value="<?=htmlspecialchars($Wo ?? '')?>">
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tr>
|
</tr>
|
||||||
<td style="border: 0px solid black;">Info</td></tr><tr><td style="border: 0px solid black;">
|
<td style="border: 0px solid black;">Info</td></tr><tr><td style="border: 0px solid black;">
|
||||||
<input name="Dienst-Info" type="text" value="<?=htmlspecialchars($Info??'')?>" >
|
<input name="Dienst-Info" type="text" value="<?=htmlspecialchars($Info ?? '')?>" >
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="border: 0px solid black;">Leiter</td></tr><tr><td style="border: 0px solid black;">
|
<td style="border: 0px solid black;">Leiter</td></tr><tr><td style="border: 0px solid black;">
|
||||||
|
|
||||||
<!-- <input name="Dienst-Leiter" type="text" value="<?=htmlspecialchars($Leiter??'')?>" > -->
|
<!-- <input name="Dienst-Leiter" type="text" value="<?=htmlspecialchars($Leiter ?? '')?>" > -->
|
||||||
<?php
|
<?php
|
||||||
echo "<select name='Dienst-Leiter'>";
|
echo "<select name='Dienst-Leiter'>";
|
||||||
$db_erg = HelferListe($db_link);
|
$db_erg = HelferListe($db_link);
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
if ($zeile['HelferID'] != $Leiter) {
|
||||||
if ($zeile['HelferID']!=$Leiter)
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</option>";
|
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</option>";
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</option>";
|
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</option>";
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo "</select>";
|
echo "</select>";
|
||||||
?>
|
?>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -237,31 +225,31 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
||||||
<?php
|
<?php
|
||||||
//echo "#####".$Gruppe."#####";
|
//echo "#####".$Gruppe."#####";
|
||||||
echo "<select name='Dienst-Gruppe'>";
|
echo "<select name='Dienst-Gruppe'>";
|
||||||
$db_erg = GetDiensteChilds($db_link,0);
|
$db_erg = GetDiensteChilds($db_link, 0);
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
|
|
||||||
if ($zeile['DienstID']!=$Gruppe)
|
if ($zeile['DienstID'] != $Gruppe) {
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo "</select>";
|
echo "</select>";
|
||||||
?>
|
?>
|
||||||
</td>
|
</td>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr><td style="border: 0px solid black;">HelferLevel</td></tr>
|
<tr><td style="border: 0px solid black;">HelferLevel</td></tr>
|
||||||
<tr><td style="border: 0px solid black;">
|
<tr><td style="border: 0px solid black;">
|
||||||
<select name="HelferLevel">
|
<select name="HelferLevel">
|
||||||
<option value="1" <?php if($HelferLevel==1){echo "selected";};?> >Dauerhelfer</option>
|
<option value="1" <?php if($HelferLevel == 1) {
|
||||||
<option value="2" <?php if($HelferLevel==2){echo "selected";};?> >Teilnehmer</option>
|
echo "selected";
|
||||||
|
};?> >Dauerhelfer</option>
|
||||||
|
<option value="2" <?php if($HelferLevel == 2) {
|
||||||
|
echo "selected";
|
||||||
|
};?> >Teilnehmer</option>
|
||||||
<?php //todo: Name aus HelferLevel-Tabelle erhalten?>
|
<?php //todo: Name aus HelferLevel-Tabelle erhalten?>
|
||||||
</select>
|
</select>
|
||||||
</td></tr>
|
</td></tr>
|
||||||
|
|
@ -282,25 +270,20 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
$Soll=1;
|
$Soll = 1;
|
||||||
$db_erg = GetSchichtenEinesDienstes($db_link,$DienstID);
|
$db_erg = GetSchichtenEinesDienstes($db_link, $DienstID);
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
if ($SchichtID == 0) {
|
||||||
if ($SchichtID == 0)
|
$SchichtID = $zeile['SchichtID'];
|
||||||
{
|
|
||||||
$SchichtID=$zeile['SchichtID'];
|
|
||||||
}
|
}
|
||||||
if ($zeile['SchichtID']!=$SchichtID)
|
if ($zeile['SchichtID'] != $SchichtID) {
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['SchichtID']."'>".$zeile['TagVon']."</option>";
|
echo "<option value='".$zeile['SchichtID']."'>".$zeile['TagVon']."</option>";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['SchichtID']."' selected='selected'>".$zeile['TagVon']."</option>";
|
echo "<option value='".$zeile['SchichtID']."' selected='selected'>".$zeile['TagVon']."</option>";
|
||||||
$Von=$zeile['Von'];
|
$Von = $zeile['Von'];
|
||||||
$Bis=$zeile['Bis'];
|
$Bis = $zeile['Bis'];
|
||||||
$Soll=(int)$zeile['Soll'];
|
$Soll = (int)$zeile['Soll'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -317,17 +300,17 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
|
||||||
<table border="0" id='customers'">
|
<table border="0" id='customers'">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="border: 0px solid black;">Von</td></tr><tr><td style="border: 0px solid black;">
|
<td style="border: 0px solid black;">Von</td></tr><tr><td style="border: 0px solid black;">
|
||||||
<input name="Schicht-Von" type="datetime-local" value="<?=htmlspecialchars($Von??'')?>" required>
|
<input name="Schicht-Von" type="datetime-local" value="<?=htmlspecialchars($Von ?? '')?>" required>
|
||||||
</td>
|
</td>
|
||||||
<tr>
|
<tr>
|
||||||
</tr>
|
</tr>
|
||||||
<td style="border: 0px solid black;">Bis</td></tr><tr><td style="border: 0px solid black;">
|
<td style="border: 0px solid black;">Bis</td></tr><tr><td style="border: 0px solid black;">
|
||||||
<input name="Schicht-Bis" type="datetime-local" value="<?=htmlspecialchars($Bis??'')?>" required>
|
<input name="Schicht-Bis" type="datetime-local" value="<?=htmlspecialchars($Bis ?? '')?>" required>
|
||||||
</td>
|
</td>
|
||||||
<tr>
|
<tr>
|
||||||
</tr>
|
</tr>
|
||||||
<td style="border: 0px solid black;">Soll</td></tr><tr><td style="border: 0px solid black;">
|
<td style="border: 0px solid black;">Soll</td></tr><tr><td style="border: 0px solid black;">
|
||||||
<input name="Schicht-Soll" type="number" min=1 value="<?=htmlspecialchars((int)$Soll??'')?>" required>
|
<input name="Schicht-Soll" type="number" min=1 value="<?=htmlspecialchars((int)$Soll ?? '')?>" required>
|
||||||
</td>
|
</td>
|
||||||
<tr>
|
<tr>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -344,7 +327,7 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
mysqli_free_result( $db_erg );
|
mysqli_free_result($db_erg);
|
||||||
|
|
||||||
|
|
||||||
$_SESSION["DienstID"] = $DienstID;
|
$_SESSION["DienstID"] = $DienstID;
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
$db_link=ConnectDB();
|
$db_link = ConnectDB();
|
||||||
include '_login.php';
|
include '_login.php';
|
||||||
// das hier muss nicht unbedingt eine Adminseite sein
|
// das hier muss nicht unbedingt eine Adminseite sein
|
||||||
if($AdminStatus != 1) {
|
if($AdminStatus != 1) {
|
||||||
|
|
@ -43,21 +43,21 @@ $AdminID = $_SESSION["AdminID"];
|
||||||
$_SESSION["HelferID"] = $HelferID;
|
$_SESSION["HelferID"] = $HelferID;
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['ShowSchicht'])) {
|
if(isset($_POST['ShowSchicht'])) {
|
||||||
$SchichtID=$_POST['SchichtSearch'];
|
$SchichtID = $_POST['SchichtSearch'];
|
||||||
}
|
}
|
||||||
if(isset($_POST['SchichtSearch'])) {
|
if(isset($_POST['SchichtSearch'])) {
|
||||||
$SchichtID=$_POST['SchichtSearch'];
|
$SchichtID = $_POST['SchichtSearch'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['ShowSchichten'])) {
|
if(isset($_POST['ShowSchichten'])) {
|
||||||
$DienstID=$_POST['DienstSearch'];
|
$DienstID = $_POST['DienstSearch'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['DienstSearch'])) {
|
if(isset($_POST['DienstSearch'])) {
|
||||||
$DienstID=$_POST['DienstSearch'];
|
$DienstID = $_POST['DienstSearch'];
|
||||||
$SchichtID=0;
|
$SchichtID = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -74,19 +74,17 @@ echo "<br><br><table class='commontable' style='page-break-before:always'>";
|
||||||
<table class="commontable">
|
<table class="commontable">
|
||||||
<?php
|
<?php
|
||||||
$db_erg = AlleHelferSchichtenUebersicht($db_link);
|
$db_erg = AlleHelferSchichtenUebersicht($db_link);
|
||||||
$dauer=0;
|
$dauer = 0;
|
||||||
$i=0;
|
$i = 0;
|
||||||
$OldHelferName="";
|
$OldHelferName = "";
|
||||||
$EinzelDienstStunden="";
|
$EinzelDienstStunden = "";
|
||||||
$HelferUeberschrift="";
|
$HelferUeberschrift = "";
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$HelferName = $zeile["Name"];
|
$HelferName = $zeile["Name"];
|
||||||
$AliasHelferID = $zeile["AliasHelferID"];
|
$AliasHelferID = $zeile["AliasHelferID"];
|
||||||
//echo $HelferName." ".$AliasHelferID."<br>";
|
//echo $HelferName." ".$AliasHelferID."<br>";
|
||||||
if($HelferName!= $OldHelferName)
|
if($HelferName != $OldHelferName) {
|
||||||
{
|
if ($EinzelDienstStunden != "") {
|
||||||
if ($EinzelDienstStunden !=""){
|
|
||||||
// Neue Ueberschrift mit Helfernamen + Stunden
|
// Neue Ueberschrift mit Helfernamen + Stunden
|
||||||
echo "$HelferUeberschrift </th><th> <img style='width:30px;height:30px;' src='Bilder/PfeilRunter.jpeg'> $dauer Stunden</th>";
|
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 "<th ><div style='display:table'><form style='display:table-cell' action='AdminAlleSchichten.php' method='post'>";
|
||||||
|
|
@ -95,19 +93,19 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||||
echo "<form style='display:table-cell' action='AdminMeineSchichten.php' method='post'>";
|
echo "<form style='display:table-cell' action='AdminMeineSchichten.php' method='post'>";
|
||||||
echo "<button width='120px' name='AliasHelfer' value='". $OldAliasHelferID ."'>–</button></form>";
|
echo "<button width='120px' name='AliasHelfer' value='". $OldAliasHelferID ."'>–</button></form>";
|
||||||
echo "</div></th>";
|
echo "</div></th>";
|
||||||
$dauer=0;
|
$dauer = 0;
|
||||||
echo "$EinzelDienstStunden</td></tr>\n ";
|
echo "$EinzelDienstStunden</td></tr>\n ";
|
||||||
}
|
}
|
||||||
$EinzelDienstStunden="";
|
$EinzelDienstStunden = "";
|
||||||
$HelferUeberschrift="<tr class='header'><th width='15%'>".$HelferName;
|
$HelferUeberschrift = "<tr class='header'><th width='15%'>".$HelferName;
|
||||||
$OldHelferName=$HelferName;
|
$OldHelferName = $HelferName;
|
||||||
$OldAliasHelferID=$AliasHelferID;
|
$OldAliasHelferID = $AliasHelferID;
|
||||||
$i+=1;
|
$i += 1;
|
||||||
}
|
}
|
||||||
$EinzelDienstStunden.="<tr><td style='width:100px'> ".(int)$zeile["Dauer"]."</td><td>";
|
$EinzelDienstStunden .= "<tr><td style='width:100px'> ".(int)$zeile["Dauer"]."</td><td>";
|
||||||
$EinzelDienstStunden.= $zeile["Was"];
|
$EinzelDienstStunden .= $zeile["Was"];
|
||||||
$EinzelDienstStunden.= "</td></tr>";
|
$EinzelDienstStunden .= "</td></tr>";
|
||||||
$dauer=$dauer+(int)$zeile["Dauer"];
|
$dauer = $dauer + (int)$zeile["Dauer"];
|
||||||
|
|
||||||
}
|
}
|
||||||
echo "$EinzelDienstStunden";
|
echo "$EinzelDienstStunden";
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
$db_link=ConnectDB();
|
$db_link = ConnectDB();
|
||||||
include '_login.php';
|
include '_login.php';
|
||||||
|
|
||||||
if($AdminStatus != 1) {
|
if($AdminStatus != 1) {
|
||||||
|
|
@ -29,18 +29,16 @@ if($AdminStatus != 1) {
|
||||||
|
|
||||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['CloseInfo']))
|
if(isset($_POST['CloseInfo'])) {
|
||||||
{
|
unset($InfoMeineSchichtID);
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
UNSET($InfoAlleSchichtID);
|
|
||||||
}
|
}
|
||||||
if(isset($_POST['InfoMeineSchichtID']))
|
if(isset($_POST['InfoMeineSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||||
UNSET($InfoAlleSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||||
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$Wo = $zeile['Wo'];
|
$Wo = $zeile['Wo'];
|
||||||
|
|
@ -53,17 +51,16 @@ if(isset($_POST['InfoMeineSchichtID']))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isset($_GET['InfoAlleSchichtID']))
|
if(isset($_GET['InfoAlleSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoMeineSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||||
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$Wo = $zeile['Wo'];
|
$Wo = $zeile['Wo'];
|
||||||
$Dauer=$zeile['Dauer'];
|
$Dauer = $zeile['Dauer'];
|
||||||
$Leiter = $zeile['Name'];
|
$Leiter = $zeile['Name'];
|
||||||
$LeiterHandy = $zeile['Handy'];
|
$LeiterHandy = $zeile['Handy'];
|
||||||
$LeiterEmail = $zeile['Email'];
|
$LeiterEmail = $zeile['Email'];
|
||||||
|
|
@ -72,67 +69,62 @@ if(isset($_GET['InfoAlleSchichtID']))
|
||||||
|
|
||||||
|
|
||||||
// Beteiligte Helfer Holen
|
// Beteiligte Helfer Holen
|
||||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
$db_erg = BeteiligteHelfer($db_link, $InfoAlleSchichtID);
|
||||||
|
|
||||||
|
|
||||||
$x=0;
|
$x = 0;
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$MitHelferID[$x] = $zeile['HelferID'];
|
$MitHelferID[$x] = $zeile['HelferID'];
|
||||||
$MitHelfer[$x] = $zeile['Name'];
|
$MitHelfer[$x] = $zeile['Name'];
|
||||||
$MitHelferHandy[$x]= $zeile['Handy'];
|
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||||
$x++;
|
$x++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function HelferAuswahlButton($db_link,$AliasHelferID){
|
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
|
||||||
$db_erg = HelferListe($db_link);
|
|
||||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|
||||||
{
|
{
|
||||||
if ($AliasHelferID!=$zeile['HelferID'])
|
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>";
|
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo '</select></form>';
|
echo '</select></form>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['AliasHelfer'])) {
|
if(isset($_POST['AliasHelfer'])) {
|
||||||
$AliasHelferID=$_POST['AliasHelfer'];
|
$AliasHelferID = $_POST['AliasHelfer'];
|
||||||
echo "AliasHelfer: $AliasHelferID<br>";
|
echo "AliasHelfer: $AliasHelferID<br>";
|
||||||
}elseif(isset($_SESSION["AliasHelferID"])){
|
} elseif(isset($_SESSION["AliasHelferID"])) {
|
||||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||||
}else{
|
} else {
|
||||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||||
|
|
||||||
|
|
||||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||||
$AdminID = $_SESSION["AdminID"];
|
$AdminID = $_SESSION["AdminID"];
|
||||||
|
|
||||||
$db_erg=Helferdaten($db_link,$AliasHelferID);
|
$db_erg = Helferdaten($db_link, $AliasHelferID);
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
$HelferName = $zeile['Name'];
|
||||||
$HelferName=$zeile['Name'];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Schicht Löschen
|
/// Schicht Löschen
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
|
|
||||||
if(isset($_POST['Del'])) {
|
if(isset($_POST['Del'])) {
|
||||||
|
|
||||||
$messages = [];
|
$messages = [];
|
||||||
|
|
||||||
|
|
@ -149,7 +141,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||||
|
|
||||||
if(empty($messages)) {
|
if(empty($messages)) {
|
||||||
|
|
||||||
$db_erg = HelferVonSchichtLoeschen($db_link,$AliasHelferID,$EinzelSchichtID,$HelferID);
|
$db_erg = HelferVonSchichtLoeschen($db_link, $AliasHelferID, $EinzelSchichtID, $HelferID);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
|
|
@ -190,23 +182,19 @@ if(isset($_POST['sent'])) {
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
|
||||||
// Helfer Schicht zuweisen
|
// Helfer Schicht zuweisen
|
||||||
$db_erg = HelferSchichtZuweisen($db_link,$AliasHelferID,$SchichtId,$HelferID);
|
$db_erg = HelferSchichtZuweisen($db_link, $AliasHelferID, $SchichtId, $HelferID);
|
||||||
|
|
||||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||||
$HelferName = '';
|
$HelferName = '';
|
||||||
$HelferEmail = '';
|
$HelferEmail = '';
|
||||||
$HelferHandy = '';
|
$HelferHandy = '';
|
||||||
//die('<div class="Helfer wurde angelegt.</div>');
|
//die('<div class="Helfer wurde angelegt.</div>');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message)
|
foreach($messages as $message) {
|
||||||
{
|
|
||||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
|
|
@ -224,34 +212,32 @@ if(isset($_POST['sent'])) {
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
$db_erg = AlleSchichtenEinesHelfers($db_link,$AliasHelferID);
|
$db_erg = AlleSchichtenEinesHelfers($db_link, $AliasHelferID);
|
||||||
|
|
||||||
if ( ! $db_erg )
|
if (! $db_erg) {
|
||||||
{
|
|
||||||
echo "AlleSchichten des Helfes ungültige Abfrage";
|
echo "AlleSchichten des Helfes ungültige Abfrage";
|
||||||
die('Ungültige Abfrage: ' . mysqli_error());
|
die('Ungültige Abfrage: ' . mysqli_error());
|
||||||
}
|
}
|
||||||
|
|
||||||
$iSQLCount = mysqli_num_rows($db_erg);
|
$iSQLCount = mysqli_num_rows($db_erg);
|
||||||
//$iSQLCount = 3;
|
//$iSQLCount = 3;
|
||||||
|
|
||||||
echo '<table id="customers">';
|
echo '<table id="customers">';
|
||||||
|
|
||||||
echo "<thead>";
|
echo "<thead>";
|
||||||
echo "<tr>";
|
echo "<tr>";
|
||||||
echo "<th colspan=1>". "Schichten von $HelferName (".$iSQLCount." Schichten)</th>";
|
echo "<th colspan=1>". "Schichten von $HelferName (".$iSQLCount." Schichten)</th>";
|
||||||
//echo "</tr><tr>";
|
//echo "</tr><tr>";
|
||||||
//echo "<th></th>";
|
//echo "<th></th>";
|
||||||
echo "<th style='width:180px'>". "Von" . "</th>";
|
echo "<th style='width:180px'>". "Von" . "</th>";
|
||||||
echo "<th style='width:180px'>". "Bis" . "</th>";
|
echo "<th style='width:180px'>". "Bis" . "</th>";
|
||||||
echo "<th style='width:90px'>". "Del" . "</th>";
|
echo "<th style='width:90px'>". "Del" . "</th>";
|
||||||
echo "</tr>";
|
echo "</tr>";
|
||||||
echo "</thead>";
|
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="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="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||||
|
|
@ -270,13 +256,13 @@ $iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
||||||
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
||||||
|
|
||||||
echo '<table id="customers" onclick="window.location.href=\'AdminAlleSchichten.php\'">';
|
echo '<table id="customers" onclick="window.location.href=\'AdminAlleSchichten.php\'">';
|
||||||
echo "<tr>";
|
echo "<tr>";
|
||||||
echo "<th>". "Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
echo "<th>". "Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
||||||
echo "</tr>";
|
echo "</tr>";
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
|
|
||||||
|
|
||||||
mysqli_free_result( $db_erg );
|
mysqli_free_result($db_erg);
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
$db_link=ConnectDB();
|
$db_link = ConnectDB();
|
||||||
include '_login.php';
|
include '_login.php';
|
||||||
|
|
||||||
if($AdminStatus != 1) {
|
if($AdminStatus != 1) {
|
||||||
|
|
@ -15,34 +15,31 @@ if($AdminStatus != 1) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function HelferAuswahlButton($db_link,$AliasHelferID){
|
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
|
||||||
$db_erg = HelferListe($db_link);
|
|
||||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|
||||||
{
|
{
|
||||||
if ($AliasHelferID!=$zeile['HelferID'])
|
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>";
|
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo '</select></form>';
|
echo '</select></form>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['AliasHelfer'])) {
|
if(isset($_POST['AliasHelfer'])) {
|
||||||
$AliasHelferID=$_POST['AliasHelfer'];
|
$AliasHelferID = $_POST['AliasHelfer'];
|
||||||
}elseif(isset($_SESSION["AliasHelferID"])){
|
} elseif(isset($_SESSION["AliasHelferID"])) {
|
||||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||||
}else{
|
} else {
|
||||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||||
|
|
||||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||||
$AdminID = $_SESSION["AdminID"];
|
$AdminID = $_SESSION["AdminID"];
|
||||||
|
|
||||||
echo "Admin=$AdminID<br>";
|
echo "Admin=$AdminID<br>";
|
||||||
|
|
@ -75,8 +72,7 @@ if(isset($_POST['change'])) {
|
||||||
// Eingaben überprüfen:
|
// Eingaben überprüfen:
|
||||||
|
|
||||||
|
|
||||||
if(strlen($_POST['helfer-newpasswort'])<8 and $_POST['helfer-newpasswort']!="")
|
if(strlen($_POST['helfer-newpasswort']) < 8 and $_POST['helfer-newpasswort'] != "") {
|
||||||
{
|
|
||||||
$messages[] = 'Neues Passwort zu kurz';
|
$messages[] = 'Neues Passwort zu kurz';
|
||||||
}
|
}
|
||||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||||
|
|
@ -86,18 +82,15 @@ if(isset($_POST['change'])) {
|
||||||
$HelferEmail = $_POST['helfer-email'];
|
$HelferEmail = $_POST['helfer-email'];
|
||||||
$HelferHandy = $_POST['helfer-handy'];
|
$HelferHandy = $_POST['helfer-handy'];
|
||||||
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
||||||
if ($_POST['IsAdmin'])
|
if ($_POST['IsAdmin']) {
|
||||||
{
|
$HelferIsAdmin = 1;
|
||||||
$HelferIsAdmin=1;
|
|
||||||
//echo "is Admin<br>";
|
//echo "is Admin<br>";
|
||||||
}
|
} else {
|
||||||
else
|
$HelferIsAdmin = 0;
|
||||||
{
|
|
||||||
$HelferIsAdmin=0;
|
|
||||||
}
|
}
|
||||||
if(empty($messages)) {
|
if(empty($messages)) {
|
||||||
// Helferdaten Ändern
|
// Helferdaten Ändern
|
||||||
HelferdatenAendern($db_link,$HelferName,$HelferEmail,$HelferHandy,$HelferNewPasswort,$AliasHelferID,$HelferIsAdmin,$HelferID);
|
HelferdatenAendern($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $AliasHelferID, $HelferIsAdmin, $HelferID);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
|
|
@ -107,27 +100,25 @@ if(isset($_POST['change'])) {
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////
|
||||||
// Helfer Loeschen
|
// Helfer Loeschen
|
||||||
///////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
if(isset($_POST['del']))
|
if(isset($_POST['del'])) {
|
||||||
{
|
HelferLoeschen($db_link, $AliasHelferID, $AdminID);
|
||||||
HelferLoeschen($db_link,$AliasHelferID,$AdminID);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////
|
||||||
// Helferdate holen
|
// Helferdate holen
|
||||||
///////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
$db_erg = Helferdaten($db_link,$AliasHelferID);
|
$db_erg = Helferdaten($db_link, $AliasHelferID);
|
||||||
|
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$HelferName = $zeile['Name'];
|
$HelferName = $zeile['Name'];
|
||||||
$HelferEmail = $zeile['Email'];
|
$HelferEmail = $zeile['Email'];
|
||||||
$HelferHandy = $zeile['Handy'];
|
$HelferHandy = $zeile['Handy'];
|
||||||
|
|
@ -147,27 +138,27 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||||
<form method="post">
|
<form method="post">
|
||||||
<tr>
|
<tr>
|
||||||
<td>Name</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Email</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Handy</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Admin Passwort</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Neues Helfer Passwort</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|
@ -176,7 +167,9 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||||
<table id="customers">
|
<table id="customers">
|
||||||
<col style="width:20px">
|
<col style="width:20px">
|
||||||
<tr>
|
<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>
|
<td>ist Admin</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
|
||||||
|
|
@ -22,33 +22,31 @@
|
||||||
|
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
|
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
|
|
||||||
|
|
||||||
$db_link = mysqli_connect (
|
$db_link = mysqli_connect(
|
||||||
MYSQL_HOST,
|
MYSQL_HOST,
|
||||||
MYSQL_BENUTZER,
|
MYSQL_BENUTZER,
|
||||||
MYSQL_KENNWORT,
|
MYSQL_KENNWORT,
|
||||||
MYSQL_DATENBANK
|
MYSQL_DATENBANK
|
||||||
);
|
);
|
||||||
include '_login.php';
|
include '_login.php';
|
||||||
|
|
||||||
|
|
||||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['CloseInfo']))
|
if(isset($_POST['CloseInfo'])) {
|
||||||
{
|
unset($InfoMeineSchichtID);
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
UNSET($InfoAlleSchichtID);
|
|
||||||
}
|
}
|
||||||
if(isset($_POST['InfoMeineSchichtID']))
|
if(isset($_POST['InfoMeineSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||||
UNSET($InfoAlleSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||||
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$Wo = $zeile['Wo'];
|
$Wo = $zeile['Wo'];
|
||||||
|
|
@ -61,17 +59,16 @@ if(isset($_POST['InfoMeineSchichtID']))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isset($_GET['InfoAlleSchichtID']))
|
if(isset($_GET['InfoAlleSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoMeineSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||||
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$Wo = $zeile['Wo'];
|
$Wo = $zeile['Wo'];
|
||||||
$Dauer=$zeile['Dauer'];
|
$Dauer = $zeile['Dauer'];
|
||||||
$Leiter = $zeile['Name'];
|
$Leiter = $zeile['Name'];
|
||||||
$LeiterHandy = $zeile['Handy'];
|
$LeiterHandy = $zeile['Handy'];
|
||||||
$LeiterEmail = $zeile['Email'];
|
$LeiterEmail = $zeile['Email'];
|
||||||
|
|
@ -80,28 +77,24 @@ if(isset($_GET['InfoAlleSchichtID']))
|
||||||
|
|
||||||
|
|
||||||
// Beteiligte Helfer Holen
|
// Beteiligte Helfer Holen
|
||||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
$db_erg = BeteiligteHelfer($db_link, $InfoAlleSchichtID);
|
||||||
|
|
||||||
|
|
||||||
$x=0;
|
$x = 0;
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$MitHelferID[$x] = $zeile['HelferID'];
|
$MitHelferID[$x] = $zeile['HelferID'];
|
||||||
$MitHelfer[$x] = $zeile['Name'];
|
$MitHelfer[$x] = $zeile['Name'];
|
||||||
$MitHelferHandy[$x]= $zeile['Handy'];
|
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||||
$x++;
|
$x++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_GET['ZeitBereich']))
|
if(isset($_GET['ZeitBereich'])) {
|
||||||
{
|
|
||||||
$ZeitBereich = $_GET['ZeitBereich'];
|
$ZeitBereich = $_GET['ZeitBereich'];
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$ZeitBereich = 1;
|
$ZeitBereich = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -132,23 +125,19 @@ if(isset($_POST['plusschicht'])) {
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
|
||||||
// Helfer Schicht zuweisen
|
// Helfer Schicht zuweisen
|
||||||
$db_erg = HelferSchichtZuweisen($db_link,$HelferID,$SchichtId);
|
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
||||||
|
|
||||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||||
$HelferName = '';
|
$HelferName = '';
|
||||||
$HelferEmail = '';
|
$HelferEmail = '';
|
||||||
$HelferHandy = '';
|
$HelferHandy = '';
|
||||||
//die('<div class="Helfer wurde angelegt.</div>');
|
//die('<div class="Helfer wurde angelegt.</div>');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message)
|
foreach($messages as $message) {
|
||||||
{
|
|
||||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
|
|
@ -158,23 +147,19 @@ if(isset($_POST['plusschicht'])) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['minusschicht'])) {
|
if(isset($_POST['minusschicht'])) {
|
||||||
// Mich aus Schicht entfernen
|
// Mich aus Schicht entfernen
|
||||||
$messages = [];
|
$messages = [];
|
||||||
|
|
||||||
$SchichtID = $_POST['minusschicht'];
|
$SchichtID = $_POST['minusschicht'];
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
|
||||||
// Helfer aus Schicht entfernen
|
// Helfer aus Schicht entfernen
|
||||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link,$HelferID,$SchichtID);
|
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $HelferID, $SchichtID);
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message)
|
foreach($messages as $message) {
|
||||||
{
|
|
||||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
|
|
@ -191,45 +176,41 @@ if(isset($_POST['minusschicht'])) {
|
||||||
|
|
||||||
|
|
||||||
// Zusammenfassung Eigener Schichten
|
// Zusammenfassung Eigener Schichten
|
||||||
$db_erg = SchichtenSummeEinesHelfers($db_link,$HelferID);
|
$db_erg = SchichtenSummeEinesHelfers($db_link, $HelferID);
|
||||||
$zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC);
|
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||||
|
|
||||||
echo '<table class="commontable"><tr class="header"><th onclick="window.location.href=\'MeineSchichten.php\'">';
|
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 '<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">'. " Mein Dienstplan (";
|
||||||
echo $zeile['Anzahl'];
|
echo $zeile['Anzahl'];
|
||||||
echo " Schichten, ";
|
echo " Schichten, ";
|
||||||
echo $zeile['Dauer']/3600;
|
echo $zeile['Dauer'] / 3600;
|
||||||
echo " Stunden)";
|
echo " Stunden)";
|
||||||
echo '</th></tr></table><br><br>';
|
echo '</th></tr></table><br><br>';
|
||||||
/// Schichten Auswahl
|
/// Schichten Auswahl
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
$addschicht =$_SESSION["addschicht"];
|
$addschicht = $_SESSION["addschicht"];
|
||||||
$dienstsort =$_SESSION["dienstsort"];
|
$dienstsort = $_SESSION["dienstsort"];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='1')
|
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '1') {
|
||||||
{
|
$addschicht = '1';
|
||||||
$addschicht='1';
|
$dienstsort = '1';
|
||||||
$dienstsort='1';
|
|
||||||
}
|
}
|
||||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='2')
|
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '2') {
|
||||||
{
|
$addschicht = '2';
|
||||||
$addschicht='2';
|
$dienstsort = '2';
|
||||||
$dienstsort='2';
|
|
||||||
}
|
}
|
||||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='0')
|
if(isset($_POST['addschicht']) && $_POST['addschicht'] == '0') {
|
||||||
{
|
$addschicht = '0';
|
||||||
$addschicht='0';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$_SESSION["addschicht"] =$addschicht;
|
$_SESSION["addschicht"] = $addschicht;
|
||||||
$_SESSION["dienstsort"] =$dienstsort;
|
$_SESSION["dienstsort"] = $dienstsort;
|
||||||
|
|
||||||
//echo "<br>Detail=".$addschicht."<br>";
|
//echo "<br>Detail=".$addschicht."<br>";
|
||||||
|
|
||||||
if($addschicht=='0')
|
if($addschicht == '0') {
|
||||||
{
|
|
||||||
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
||||||
echo "<button name='addschicht' value='1'>Tage</button>";
|
echo "<button name='addschicht' value='1'>Tage</button>";
|
||||||
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
||||||
|
|
@ -237,37 +218,29 @@ if($addschicht=='0')
|
||||||
|
|
||||||
//echo "InfoAlleSchichtID ".$InfoAlleSchichtID;
|
//echo "InfoAlleSchichtID ".$InfoAlleSchichtID;
|
||||||
|
|
||||||
if($addschicht!='0')
|
if($addschicht != '0') {
|
||||||
{
|
|
||||||
//$db_erg = AlleSchichten($db_link,$dienstsort);
|
//$db_erg = AlleSchichten($db_link,$dienstsort);
|
||||||
//$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",$HelferLevel);
|
//$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",$HelferLevel);
|
||||||
if ($ZeitBereich==1) // Alle
|
if ($ZeitBereich == 1) { // Alle
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00", $HelferLevel);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2200-05-19 00:00:00",$HelferLevel);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==2) // Davor
|
if ($ZeitBereich == 2) { // Davor
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2023-05-18 00:00:00", $HelferLevel);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2023-05-18 00:00:00",$HelferLevel);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==3) // Do
|
if ($ZeitBereich == 3) { // Do
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-18 00:00:00", "2023-05-19 00:00:00", $HelferLevel);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",$HelferLevel);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==4) // Fr
|
if ($ZeitBereich == 4) { // Fr
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-19 00:00:00", "2023-05-20 00:00:00", $HelferLevel);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-19 00:00:00","2023-05-20 00:00:00",$HelferLevel);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==5) // Sa
|
if ($ZeitBereich == 5) { // Sa
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-20 00:00:00", "2023-05-21 00:00:00", $HelferLevel);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-20 00:00:00","2023-05-21 00:00:00",$HelferLevel);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==6) // So
|
if ($ZeitBereich == 6) { // So
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-21 00:00:00", "2023-05-22 00:00:00", $HelferLevel);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-21 00:00:00","2023-05-22 00:00:00",$HelferLevel);
|
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==7) // Danach
|
if ($ZeitBereich == 7) { // Danach
|
||||||
{
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-22 00:00:00", "2223-05-22 00:00:00", $HelferLevel);
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-22 00:00:00","2223-05-22 00:00:00",$HelferLevel);
|
|
||||||
}
|
}
|
||||||
// fuer Anzahlanzeige in Ueberschrift
|
// fuer Anzahlanzeige in Ueberschrift
|
||||||
$iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
$iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
||||||
|
|
@ -290,60 +263,39 @@ if($addschicht!='0')
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
echo "<tr class='header'>"; // Zeitbereich tr
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
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>";
|
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>". "Sa" . "</th>";
|
||||||
}
|
}
|
||||||
if ($ZeitBereich==6)
|
if ($ZeitBereich == 6) {
|
||||||
{
|
|
||||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
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>";
|
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=7\"'>". "Danach" . "</th>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -352,33 +304,27 @@ if($addschicht!='0')
|
||||||
$OldTag = "";
|
$OldTag = "";
|
||||||
$OldWas = "";
|
$OldWas = "";
|
||||||
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link,$HelferID);
|
$MeineDienste = SchichtIdArrayEinesHelfers($db_link, $HelferID);
|
||||||
//print_r($MeineDienste);
|
//print_r($MeineDienste);
|
||||||
|
|
||||||
echo '</table>';
|
echo '</table>';
|
||||||
echo '<table id="customers">';
|
echo '<table id="customers">';
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
if ($dienstsort=='1')
|
if ($dienstsort == '1') {
|
||||||
{
|
|
||||||
$Tag = $zeile['Tag'];
|
$Tag = $zeile['Tag'];
|
||||||
|
|
||||||
if ($Tag!=$OldTag)
|
if ($Tag != $OldTag) {
|
||||||
{
|
|
||||||
echo "<tr class='header'><th colspan='5' >";
|
echo "<tr class='header'><th colspan='5' >";
|
||||||
echo $Tag;
|
echo $Tag;
|
||||||
echo "</th></tr>";
|
echo "</th></tr>";
|
||||||
$OldTag = $Tag;
|
$OldTag = $Tag;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
|
|
||||||
if ($Was!=$OldWas)
|
if ($Was != $OldWas) {
|
||||||
{
|
|
||||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||||
echo $Was;
|
echo $Was;
|
||||||
echo "</th>";
|
echo "</th>";
|
||||||
|
|
@ -392,22 +338,19 @@ if($addschicht!='0')
|
||||||
$OldWas = $Was;
|
$OldWas = $Was;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$Color="red";
|
$Color = "red";
|
||||||
if ( $zeile['Ist'] > 0 )
|
if ($zeile['Ist'] > 0) {
|
||||||
{
|
$Color = "yellow";
|
||||||
$Color="yellow";
|
|
||||||
}
|
}
|
||||||
if ( $zeile['Ist'] >= $zeile['Soll'] )
|
if ($zeile['Ist'] >= $zeile['Soll']) {
|
||||||
{
|
$Color = "green";
|
||||||
$Color="green";
|
|
||||||
}
|
}
|
||||||
$Von = $zeile['Ab'];
|
$Von = $zeile['Ab'];
|
||||||
$Bis = $zeile['Bis'];
|
$Bis = $zeile['Bis'];
|
||||||
if ( substr($Von,0,2) == substr($Bis,0,2))
|
if (substr($Von, 0, 2) == substr($Bis, 0, 2)) {
|
||||||
{
|
$Bis = substr($Bis, 2);
|
||||||
$Bis = substr($Bis,2);
|
|
||||||
}
|
}
|
||||||
$Von = substr($Von,2);
|
$Von = substr($Von, 2);
|
||||||
|
|
||||||
// Meine Schichten gruen einfaerben
|
// Meine Schichten gruen einfaerben
|
||||||
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||||
|
|
@ -421,12 +364,9 @@ if($addschicht!='0')
|
||||||
|
|
||||||
echo '<tr '.$rowstyle.'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
echo '<tr '.$rowstyle.'onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||||
|
|
||||||
if ($dienstsort=='1')
|
if ($dienstsort == '1') {
|
||||||
{
|
|
||||||
echo "<td>". $zeile['Was'] . "</td>";
|
echo "<td>". $zeile['Was'] . "</td>";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "<td>". $zeile['Tag'] . "</td>";
|
echo "<td>". $zeile['Tag'] . "</td>";
|
||||||
}
|
}
|
||||||
echo "<td>". $Von . "</td>";
|
echo "<td>". $Von . "</td>";
|
||||||
|
|
@ -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');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
|
|
||||||
$db_link = mysqli_connect (
|
$db_link = mysqli_connect(
|
||||||
MYSQL_HOST,
|
MYSQL_HOST,
|
||||||
MYSQL_BENUTZER,
|
MYSQL_BENUTZER,
|
||||||
MYSQL_KENNWORT,
|
MYSQL_KENNWORT,
|
||||||
MYSQL_DATENBANK
|
MYSQL_DATENBANK
|
||||||
);
|
);
|
||||||
DatenbankAufDeutsch($db_link);
|
DatenbankAufDeutsch($db_link);
|
||||||
|
|
||||||
include '_login.php';
|
include '_login.php';
|
||||||
|
|
@ -45,16 +45,14 @@ include '_login.php';
|
||||||
|
|
||||||
echo '<table id="customers" >';
|
echo '<table id="customers" >';
|
||||||
|
|
||||||
$db_erg = GetDiensteChilds($db_link,0);
|
$db_erg = GetDiensteChilds($db_link, 0);
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
echo "<tr><th>";
|
echo "<tr><th>";
|
||||||
echo $zeile["Was"];
|
echo $zeile["Was"];
|
||||||
echo "</th></tr>";
|
echo "</th></tr>";
|
||||||
|
|
||||||
$db_erg2 = GetDiensteChilds($db_link,$zeile["DienstID"]);
|
$db_erg2 = GetDiensteChilds($db_link, $zeile["DienstID"]);
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg2, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg2, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
echo "<tr><td>";
|
echo "<tr><td>";
|
||||||
echo $zeile["Was"];
|
echo $zeile["Was"];
|
||||||
echo "</td></tr>";
|
echo "</td></tr>";
|
||||||
|
|
@ -67,28 +65,26 @@ echo "</table>";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2200-05-19 00:00:00");
|
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00");
|
||||||
|
|
||||||
$OldWas="";
|
$OldWas = "";
|
||||||
echo "<br><br><table id='customers' style='page-break-before:always'>";
|
echo "<br><br><table id='customers' style='page-break-before:always'>";
|
||||||
?>
|
?>
|
||||||
<tr>
|
<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>
|
<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>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$Was = $zeile["Was"];
|
$Was = $zeile["Was"];
|
||||||
|
|
||||||
if($Was!= $OldWas)
|
if($Was != $OldWas) {
|
||||||
{
|
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
//echo '<table id="customers" style="page-break-before:always">';
|
//echo '<table id="customers" style="page-break-before:always">';
|
||||||
echo '<table id="customers">';
|
echo '<table id="customers">';
|
||||||
echo "<tr><th colspan=3>";
|
echo "<tr><th colspan=3>";
|
||||||
echo $Was;
|
echo $Was;
|
||||||
echo "</th></tr>";
|
echo "</th></tr>";
|
||||||
$OldWas=$Was;
|
$OldWas = $Was;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -99,9 +95,8 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||||
echo $zeile["Bis"];
|
echo $zeile["Bis"];
|
||||||
echo "</td><td>";
|
echo "</td><td>";
|
||||||
|
|
||||||
$db_erg2 = BeteiligteHelfer($db_link,$zeile["SchichtID"]);
|
$db_erg2 = BeteiligteHelfer($db_link, $zeile["SchichtID"]);
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg2, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg2, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
|
|
||||||
echo $zeile["Name"];
|
echo $zeile["Name"];
|
||||||
echo " ";
|
echo " ";
|
||||||
|
|
@ -115,7 +110,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||||
|
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
|
|
||||||
$OldHelferName="";
|
$OldHelferName = "";
|
||||||
|
|
||||||
echo "<br><br><table id='customers' style='page-break-before:always'>";
|
echo "<br><br><table id='customers' style='page-break-before:always'>";
|
||||||
?>
|
?>
|
||||||
|
|
@ -124,19 +119,17 @@ echo "<br><br><table id='customers' style='page-break-before:always'>";
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
$db_erg = AlleHelferSchichtenUebersicht($db_link);
|
$db_erg = AlleHelferSchichtenUebersicht($db_link);
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$HelferName = $zeile["Name"];
|
$HelferName = $zeile["Name"];
|
||||||
|
|
||||||
if($HelferName!= $OldHelferName)
|
if($HelferName != $OldHelferName) {
|
||||||
{
|
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
//echo '<table id="customers" style="page-break-before:always">';
|
//echo '<table id="customers" style="page-break-before:always">';
|
||||||
echo '<table id="customers">';
|
echo '<table id="customers">';
|
||||||
echo "<tr><th colspan=3>";
|
echo "<tr><th colspan=3>";
|
||||||
echo $HelferName;
|
echo $HelferName;
|
||||||
echo "</th></tr>";
|
echo "</th></tr>";
|
||||||
$OldHelferName=$HelferName;
|
$OldHelferName = $HelferName;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -159,7 +152,7 @@ echo "</table>";
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
mysqli_free_result( $db_erg );
|
mysqli_free_result($db_erg);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,15 +15,15 @@
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
//$HelferID = $_SESSION["HelferId"];
|
//$HelferID = $_SESSION["HelferId"];
|
||||||
|
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
|
|
||||||
$db_link = mysqli_connect (
|
$db_link = mysqli_connect(
|
||||||
MYSQL_HOST,
|
MYSQL_HOST,
|
||||||
MYSQL_BENUTZER,
|
MYSQL_BENUTZER,
|
||||||
MYSQL_KENNWORT,
|
MYSQL_KENNWORT,
|
||||||
MYSQL_DATENBANK
|
MYSQL_DATENBANK
|
||||||
);
|
);
|
||||||
|
|
||||||
if(isset($_POST['sent'])) {
|
if(isset($_POST['sent'])) {
|
||||||
|
|
||||||
|
|
@ -33,8 +33,10 @@ if(isset($_POST['sent'])) {
|
||||||
$HelferEmail = $_POST['helfer-email'];
|
$HelferEmail = $_POST['helfer-email'];
|
||||||
$HelferHandy = $_POST['helfer-handy'];
|
$HelferHandy = $_POST['helfer-handy'];
|
||||||
$HelferLevel = $_POST['helfer-level'];
|
$HelferLevel = $_POST['helfer-level'];
|
||||||
$HelferPasswort = $_POST['helfer-passwort'];;
|
$HelferPasswort = $_POST['helfer-passwort'];
|
||||||
$HelferPasswort2 = $_POST['helfer-passwort2'];;
|
;
|
||||||
|
$HelferPasswort2 = $_POST['helfer-passwort2'];
|
||||||
|
;
|
||||||
|
|
||||||
//echo $HelferName;
|
//echo $HelferName;
|
||||||
//echo $HelferEmail;
|
//echo $HelferEmail;
|
||||||
|
|
@ -54,25 +56,21 @@ if(isset($_POST['sent'])) {
|
||||||
// $messages[] = 'Bitte prüfen Sie die eingegebene Handynummer';
|
// $messages[] = 'Bitte prüfen Sie die eingegebene Handynummer';
|
||||||
//}
|
//}
|
||||||
|
|
||||||
if($HelferPasswort!=$HelferPasswort2)
|
if($HelferPasswort != $HelferPasswort2) {
|
||||||
{
|
|
||||||
$messages[] = 'Passwörter stimmen nicht überein';
|
$messages[] = 'Passwörter stimmen nicht überein';
|
||||||
$HelferPasswort ="";
|
$HelferPasswort = "";
|
||||||
$HelferPasswort2 = "";
|
$HelferPasswort2 = "";
|
||||||
}
|
}
|
||||||
if(strlen($HelferPasswort)<8)
|
if(strlen($HelferPasswort) < 8) {
|
||||||
{
|
|
||||||
$messages[] = 'Passwörter zu kurz';
|
$messages[] = 'Passwörter zu kurz';
|
||||||
$HelferPasswort ="";
|
$HelferPasswort = "";
|
||||||
$HelferPasswort2 = "";
|
$HelferPasswort2 = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
$db_erg = CreateHelfer($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferPasswort, $HelferLevel);
|
||||||
$db_erg = CreateHelfer($db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);
|
if ($db_erg) {
|
||||||
if ( $db_erg )
|
|
||||||
{
|
|
||||||
//$insertID = mysql_insert_id();
|
//$insertID = mysql_insert_id();
|
||||||
//echo "InserId = ".$insertID;
|
//echo "InserId = ".$insertID;
|
||||||
|
|
||||||
|
|
@ -85,9 +83,7 @@ if(isset($_POST['sent'])) {
|
||||||
$HelferPasswort2 = '';
|
$HelferPasswort2 = '';
|
||||||
|
|
||||||
//die('<div class="Helfer wurde angelegt.</div>');
|
//die('<div class="Helfer wurde angelegt.</div>');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "Helfer konnte nicht Angelegt werden, möglichweise exisistiert die Emailadresse ".$HelferEmail." bereits.<br><br>";
|
echo "Helfer konnte nicht Angelegt werden, möglichweise exisistiert die Emailadresse ".$HelferEmail." bereits.<br><br>";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -116,30 +112,30 @@ if(isset($_POST['sent'])) {
|
||||||
<td>Name</td>
|
<td>Name</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr><td>
|
<tr><td>
|
||||||
<input name="helfer-name" type="text" value="<?=htmlspecialchars($HelferName??'')?>" required>
|
<input name="helfer-name" type="text" value="<?=htmlspecialchars($HelferName ?? '')?>" required>
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Email</td>
|
<td>Email</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr><td>
|
<tr><td>
|
||||||
<input name="helfer-email" type="email " value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
<input name="helfer-email" type="email " value="<?=htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Handy</td>
|
<td>Handy</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr><td>
|
<tr><td>
|
||||||
<input name="helfer-handy" type="tel" value="<?=htmlspecialchars($HelferHandy??'')?>" >
|
<input name="helfer-handy" type="tel" value="<?=htmlspecialchars($HelferHandy ?? '')?>" >
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Passwort</td></tr>
|
<td>Passwort</td></tr>
|
||||||
<tr><td>
|
<tr><td>
|
||||||
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferPasswort??'')?>" required>
|
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferPasswort ?? '')?>" required>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr><td>Passwort wiederholen </td></tr>
|
<tr><td>Passwort wiederholen </td></tr>
|
||||||
<tr><td>
|
<tr><td>
|
||||||
<input name="helfer-passwort2" type="password" value="<?=htmlspecialchars($HelferPasswort2??'')?>" required>
|
<input name="helfer-passwort2" type="password" value="<?=htmlspecialchars($HelferPasswort2 ?? '')?>" required>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr><td>Helferlevel </td></tr>
|
<tr><td>Helferlevel </td></tr>
|
||||||
|
|
@ -147,13 +143,15 @@ if(isset($_POST['sent'])) {
|
||||||
<select name="helfer-level">
|
<select name="helfer-level">
|
||||||
<?php
|
<?php
|
||||||
$db_erg = HelferLevel($db_link);
|
$db_erg = HelferLevel($db_link);
|
||||||
$selected="";
|
$selected = "";
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)) {
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
$HelferLevel = $zeile['HelferLevel'];
|
$HelferLevel = $zeile['HelferLevel'];
|
||||||
$HelferLevelBeschreibung = $zeile['HelferLevelBeschreibung'];
|
$HelferLevelBeschreibung = $zeile['HelferLevelBeschreibung'];
|
||||||
if($HelferLevel==1){ $selected = " selected " ;};
|
if($HelferLevel == 1) {
|
||||||
|
$selected = " selected " ;
|
||||||
|
};
|
||||||
echo "<option value='$HelferLevel' $selected>$HelferLevelBeschreibung</option>";
|
echo "<option value='$HelferLevel' $selected>$HelferLevelBeschreibung</option>";
|
||||||
$selected="";
|
$selected = "";
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
|
|
@ -171,7 +169,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)) {
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
mysqli_free_result( $db_erg );
|
mysqli_free_result($db_erg);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -4,42 +4,42 @@
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
|
|
||||||
if(isset($_GET['token']) ) {
|
if(isset($_GET['token'])) {
|
||||||
|
|
||||||
// E-Mail-Adresse des Nutzers
|
// E-Mail-Adresse des Nutzers
|
||||||
$encrypted_data = $_GET['token'];
|
$encrypted_data = $_GET['token'];
|
||||||
$encrypted_iv = $_GET['iv'];
|
$encrypted_iv = $_GET['iv'];
|
||||||
echo "token: $encrypted_data<br> \n";
|
echo "token: $encrypted_data<br> \n";
|
||||||
echo "iv: $encrypted_iv<br> \n";
|
echo "iv: $encrypted_iv<br> \n";
|
||||||
|
|
||||||
// Erstellen eines Cipher-Objekts für die Verschlüsselung
|
// Erstellen eines Cipher-Objekts für die Verschlüsselung
|
||||||
$cipher_method = "AES-256-CBC";
|
$cipher_method = "AES-256-CBC";
|
||||||
$iv_length = openssl_cipher_iv_length($cipher_method);
|
$iv_length = openssl_cipher_iv_length($cipher_method);
|
||||||
$iv = base64_decode($encrypted_iv);
|
$iv = base64_decode($encrypted_iv);
|
||||||
$cipher_options = OPENSSL_RAW_DATA;
|
$cipher_options = OPENSSL_RAW_DATA;
|
||||||
$cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
$cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
||||||
|
|
||||||
// Entschlüsseln des verschlüsselten Textes
|
// Entschlüsseln des verschlüsselten Textes
|
||||||
$decoded_cipher_text = base64_decode($encrypted_data);
|
$decoded_cipher_text = base64_decode($encrypted_data);
|
||||||
$iv = base64_decode($encrypted_iv);
|
$iv = base64_decode($encrypted_iv);
|
||||||
$iv = substr($decoded_cipher_text, 0, $iv_length);
|
$iv = substr($decoded_cipher_text, 0, $iv_length);
|
||||||
$cipher_text = substr($decoded_cipher_text, $iv_length);
|
$cipher_text = substr($decoded_cipher_text, $iv_length);
|
||||||
$decrypted_email = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
$decrypted_email = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||||
|
|
||||||
// Verifikationsstring überprüfen und entfernen
|
// Verifikationsstring überprüfen und entfernen
|
||||||
$verification_length = strlen($secret_verification);
|
$verification_length = strlen($secret_verification);
|
||||||
if(substr($decrypted_email, -$verification_length) == $secret_verification) {
|
if(substr($decrypted_email, -$verification_length) == $secret_verification) {
|
||||||
$decrypted_email = substr($decrypted_email, 0, -$verification_length);
|
$decrypted_email = substr($decrypted_email, 0, -$verification_length);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ausgabe der entschlüsselten E-Mail-Adresse
|
// Ausgabe der entschlüsselten E-Mail-Adresse
|
||||||
echo "E-Mail-Adresse: ", $decrypted_email, "<br>\n";
|
echo "E-Mail-Adresse: ", $decrypted_email, "<br>\n";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
echo "Kein gültiges Token!<br>";
|
echo "Kein gültiges Token!<br>";
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
$db_link=ConnectDB();
|
$db_link = ConnectDB();
|
||||||
include '_login.php';
|
include '_login.php';
|
||||||
include '_crypt.php';
|
include '_crypt.php';
|
||||||
|
|
||||||
|
|
@ -13,7 +13,8 @@ if($AdminStatus != 1) {
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
function validate_email($email) {
|
function validate_email($email)
|
||||||
|
{
|
||||||
// Prüfen, ob die Email-Adresse syntaktisch gültig ist
|
// Prüfen, ob die Email-Adresse syntaktisch gültig ist
|
||||||
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
|
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -38,25 +39,25 @@ function validate_email($email) {
|
||||||
|
|
||||||
// wird immer auf 2 (Teilnehmer) gesetzt und wird auch nicht gespeichert, wenn anders gesetzt
|
// wird immer auf 2 (Teilnehmer) gesetzt und wird auch nicht gespeichert, wenn anders gesetzt
|
||||||
// andere level muessen jedes Mal gesetzt werden
|
// andere level muessen jedes Mal gesetzt werden
|
||||||
$level=2;
|
$level = 2;
|
||||||
|
|
||||||
if(isset($_POST['helfer-status'])) {
|
if(isset($_POST['helfer-status'])) {
|
||||||
$level=$_POST['helfer-status'];
|
$level = $_POST['helfer-status'];
|
||||||
}
|
}
|
||||||
|
|
||||||
// nicht sicher, wo so ein default-text herkommen sollte
|
// nicht sicher, wo so ein default-text herkommen sollte
|
||||||
// oder ob es tatsächlich einen geben sollte
|
// oder ob es tatsächlich einen geben sollte
|
||||||
$email_subject="Drop am See beginnt bald!";
|
$email_subject = "Drop am See beginnt bald!";
|
||||||
if(isset($_POST['email-subject'])) {
|
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'])) {
|
if(isset($_POST['email-cc'])) {
|
||||||
$email_cc=$_POST['email-cc'];
|
$email_cc = $_POST['email-cc'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$email_text="
|
$email_text = "
|
||||||
Lieber Teilnehmer,
|
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.
|
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'])) {
|
if(isset($_POST['email-text'])) {
|
||||||
$email_text=$_POST['email-text'];
|
$email_text = $_POST['email-text'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$sendmail=0;
|
$sendmail = 0;
|
||||||
if(isset($_POST['sendmail'])) {
|
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>
|
<label for="helfer-status">Status des Accounts, den der Link erstellt:</label>
|
||||||
<select style="width:260px" id="helfer-status" name="helfer-status">
|
<select style="width:260px" id="helfer-status" name="helfer-status">
|
||||||
<!-- TODO: aus DB abfragen -->
|
<!-- TODO: aus DB abfragen -->
|
||||||
<option value="2"<?php if($level==2){echo "selected";}?>>Teilnehmer</option>
|
<option value="2"<?php if($level == 2) {
|
||||||
<option value="1" <?php if($level==1){echo "selected";}?>>Dauerhelfer</option>
|
echo "selected";
|
||||||
|
}?>>Teilnehmer</option>
|
||||||
|
<option value="1" <?php if($level == 1) {
|
||||||
|
echo "selected";
|
||||||
|
}?>>Dauerhelfer</option>
|
||||||
</select>
|
</select>
|
||||||
</p><p>
|
</p><p>
|
||||||
Subject der Email: <br>
|
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>
|
</p><p>
|
||||||
CC (Kopie) der Email geht an: <br>
|
CC (Kopie) der Email geht an: <br>
|
||||||
<input id="email-cc" name="email-cc" type="textbox" value="drophelfer@gmail.com">
|
<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):
|
Emailtext (XXtokenXX an die Stelle schreiben, an der der Link im Emailtext stehen soll):
|
||||||
</p><p>
|
</p><p>
|
||||||
<textarea id="email-text" name="email-text" rows="20" cols="80">
|
<textarea id="email-text" name="email-text" rows="20" cols="80">
|
||||||
<?=htmlspecialchars($email_text??'');?>
|
<?=htmlspecialchars($email_text ?? '');?>
|
||||||
</textarea>
|
</textarea>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
|
|
@ -155,13 +160,13 @@ if(isset($_POST['email-liste'])) {
|
||||||
//preg_split, um bei allen Leerzeichen zu trennen
|
//preg_split, um bei allen Leerzeichen zu trennen
|
||||||
$email_array = preg_split('/\s+/', $email_list); // Trennzeichen: 1 oder mehr Whitespace-Zeichen
|
$email_array = preg_split('/\s+/', $email_list); // Trennzeichen: 1 oder mehr Whitespace-Zeichen
|
||||||
foreach ($email_array as $email) {
|
foreach ($email_array as $email) {
|
||||||
$email=trim($email);
|
$email = trim($email);
|
||||||
$encrypted_data=encode_string($secret_key, $email,$level,$secret_verification);
|
$encrypted_data = encode_string($secret_key, $email, $level, $secret_verification);
|
||||||
$token_url = "$urlprefix?token=$encrypted_data";
|
$token_url = "$urlprefix?token=$encrypted_data";
|
||||||
// Ausgabe des verschluesselten Textes in der URL
|
// Ausgabe des verschluesselten Textes in der URL
|
||||||
$decrypted_data = decode_string($secret_key, urldecode($encrypted_data),$secret_verification);
|
$decrypted_data = decode_string($secret_key, urldecode($encrypted_data), $secret_verification);
|
||||||
$email_subst_text = str_replace('XXtokenXX', $token_url, $email_text);
|
$email_subst_text = str_replace('XXtokenXX', $token_url, $email_text);
|
||||||
if($sendmail != 1){
|
if($sendmail != 1) {
|
||||||
// keine Emails verschicken, wir gebeben die Inhalte unten als Text aus
|
// keine Emails verschicken, wir gebeben die Inhalte unten als Text aus
|
||||||
echo "Verschicken nicht ausgewählt. Zeige Emails an:<br>";
|
echo "Verschicken nicht ausgewählt. Zeige Emails an:<br>";
|
||||||
echo $sendmail ."<br>";
|
echo $sendmail ."<br>";
|
||||||
|
|
@ -172,13 +177,13 @@ if(isset($_POST['email-liste'])) {
|
||||||
echo "$email: <a href='$token_url'> $token_url</a> (check: ".$decrypted_data['email'].", lv: ".$decrypted_data['level'].")<br>";
|
echo "$email: <a href='$token_url'> $token_url</a> (check: ".$decrypted_data['email'].", lv: ".$decrypted_data['level'].")<br>";
|
||||||
} else {
|
} else {
|
||||||
// Email verschicken - send mail
|
// Email verschicken - send mail
|
||||||
$to=$decrypted_data['email'];
|
$to = $decrypted_data['email'];
|
||||||
$from="root";
|
$from = "root";
|
||||||
$headers = 'From: ' . $from. "\r\n";
|
$headers = 'From: ' . $from. "\r\n";
|
||||||
$headers .= 'CC: ' . $email_cc . "\r\n";
|
$headers .= 'CC: ' . $email_cc . "\r\n";
|
||||||
if (mail($to, $email_subject, $email_subst_text, $headers)) {
|
if (mail($to, $email_subject, $email_subst_text, $headers)) {
|
||||||
echo "Die E-Mail an $to wurde erfolgreich versendet.";
|
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);
|
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 {
|
} else {
|
||||||
echo "Beim Versenden der E-Mail an $to ist ein Fehler aufgetreten.";
|
echo "Beim Versenden der E-Mail an $to ist ein Fehler aufgetreten.";
|
||||||
}
|
}
|
||||||
|
|
@ -196,7 +201,7 @@ if(isset($_POST['email-liste'])) {
|
||||||
<!--Einzelne Email
|
<!--Einzelne Email
|
||||||
<p>
|
<p>
|
||||||
<form method="GET">
|
<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>
|
<button name="sent" value="1">Token generieren</button>
|
||||||
</form>
|
</form>
|
||||||
</p>
|
</p>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@
|
||||||
<title>Helfer Drop am See Home</title>
|
<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_desktop.css" media="screen and (min-width:781px)"/>
|
||||||
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
|
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
|
||||||
<meta http-equiv="Refresh" content="0; url=<?php require_once ('konfiguration.php'); echo INFORMATIONS_URL;?>" />
|
<meta http-equiv="Refresh" content="0; url=<?php require_once('konfiguration.php');
|
||||||
|
echo INFORMATIONS_URL;?>" />
|
||||||
<meta name="viewport" content="width=480" />
|
<meta name="viewport" content="width=480" />
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
|
||||||
|
|
@ -15,35 +15,33 @@
|
||||||
|
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
|
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
//require_once ('SQL.php');
|
//require_once ('SQL.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$db_link = mysqli_connect (
|
$db_link = mysqli_connect(
|
||||||
MYSQL_HOST,
|
MYSQL_HOST,
|
||||||
MYSQL_BENUTZER,
|
MYSQL_BENUTZER,
|
||||||
MYSQL_KENNWORT,
|
MYSQL_KENNWORT,
|
||||||
MYSQL_DATENBANK
|
MYSQL_DATENBANK
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['CloseInfo']))
|
if(isset($_POST['CloseInfo'])) {
|
||||||
{
|
unset($InfoMeineSchichtID);
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
UNSET($InfoAlleSchichtID);
|
|
||||||
}
|
}
|
||||||
if(isset($_POST['InfoMeineSchichtID']))
|
if(isset($_POST['InfoMeineSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||||
UNSET($InfoAlleSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||||
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$Wo = $zeile['Wo'];
|
$Wo = $zeile['Wo'];
|
||||||
|
|
@ -56,17 +54,16 @@ if(isset($_POST['InfoMeineSchichtID']))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isset($_GET['InfoAlleSchichtID']))
|
if(isset($_GET['InfoAlleSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoMeineSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||||
|
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$Wo = $zeile['Wo'];
|
$Wo = $zeile['Wo'];
|
||||||
$Dauer=$zeile['Dauer'];
|
$Dauer = $zeile['Dauer'];
|
||||||
$Leiter = $zeile['Name'];
|
$Leiter = $zeile['Name'];
|
||||||
$LeiterHandy = $zeile['Handy'];
|
$LeiterHandy = $zeile['Handy'];
|
||||||
$LeiterEmail = $zeile['Email'];
|
$LeiterEmail = $zeile['Email'];
|
||||||
|
|
@ -75,16 +72,15 @@ if(isset($_GET['InfoAlleSchichtID']))
|
||||||
|
|
||||||
|
|
||||||
// Beteiligte Helfer Holen
|
// Beteiligte Helfer Holen
|
||||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
$db_erg = BeteiligteHelfer($db_link, $InfoAlleSchichtID);
|
||||||
|
|
||||||
|
|
||||||
$x=0;
|
$x = 0;
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$MitHelferID[$x] = $zeile['HelferID'];
|
$MitHelferID[$x] = $zeile['HelferID'];
|
||||||
$MitHelfer[$x] = $zeile['Name'];
|
$MitHelfer[$x] = $zeile['Name'];
|
||||||
$MitHelferHandy[$x]= $zeile['Handy'];
|
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||||
$x++;
|
$x++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -94,16 +90,14 @@ if(isset($_GET['InfoAlleSchichtID']))
|
||||||
|
|
||||||
/// Logout
|
/// Logout
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['logout']))
|
if(isset($_POST['logout'])) {
|
||||||
{
|
|
||||||
unset($_SESSION["HelferID"]);
|
unset($_SESSION["HelferID"]);
|
||||||
//$_POST['login'] = 1;
|
//$_POST['login'] = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Login
|
/// Login
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['login']))
|
if(isset($_POST['login'])) {
|
||||||
{
|
|
||||||
$messages = [];
|
$messages = [];
|
||||||
// Eingaben überprüfen:
|
// Eingaben überprüfen:
|
||||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||||
|
|
@ -114,12 +108,9 @@ if(isset($_POST['login']))
|
||||||
$HelferEmail = $_POST['helfer-email'];
|
$HelferEmail = $_POST['helfer-email'];
|
||||||
$HelferPasswort = $_POST['helfer-passwort'];
|
$HelferPasswort = $_POST['helfer-passwort'];
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort, 0 );
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message) {
|
foreach($messages as $message) {
|
||||||
|
|
@ -132,10 +123,9 @@ if(isset($_POST['login']))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(!isset($_SESSION["HelferID"]))
|
if(!isset($_SESSION["HelferID"])) {
|
||||||
{
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<form method="post" action="#Info">
|
<form method="post" action="#Info">
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
|
|
@ -144,12 +134,12 @@ if(!isset($_SESSION["HelferID"]))
|
||||||
<table border="0" style="border: 0px solid black;">
|
<table border="0" style="border: 0px solid black;">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="border: 0px solid black;">Email</td></tr><tr><td style="border: 0px solid black;">
|
<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>
|
</td>
|
||||||
<tr>
|
<tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="border: 0px solid black;">Passwort</td></tr><tr><td style="border: 0px solid black;">
|
<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>
|
</td>
|
||||||
<tr>
|
<tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
@ -170,13 +160,12 @@ if(!isset($_SESSION["HelferID"]))
|
||||||
$HelferID = $_SESSION["HelferID"];
|
$HelferID = $_SESSION["HelferID"];
|
||||||
$AdminID = $_SESSION["AdminID"];
|
$AdminID = $_SESSION["AdminID"];
|
||||||
|
|
||||||
if(isset($_POST['HelferID']))
|
if(isset($_POST['HelferID'])) {
|
||||||
{
|
|
||||||
$HelferID = $_POST['HelferID'];
|
$HelferID = $_POST['HelferID'];
|
||||||
}
|
}
|
||||||
if(isset($_POST['ShowHelfer'])) {
|
if(isset($_POST['ShowHelfer'])) {
|
||||||
$HelferID=$_POST['HelperSearch'];
|
$HelferID = $_POST['HelperSearch'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$_SESSION["HelferID"] = $HelferID;
|
$_SESSION["HelferID"] = $HelferID;
|
||||||
|
|
||||||
|
|
@ -196,7 +185,7 @@ $_SESSION["HelferID"] = $HelferID;
|
||||||
/// Schicht Löschen
|
/// Schicht Löschen
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
|
|
||||||
if(isset($_POST['Del'])) {
|
if(isset($_POST['Del'])) {
|
||||||
|
|
||||||
$messages = [];
|
$messages = [];
|
||||||
|
|
||||||
|
|
@ -213,7 +202,7 @@ $_SESSION["HelferID"] = $HelferID;
|
||||||
|
|
||||||
if(empty($messages)) {
|
if(empty($messages)) {
|
||||||
|
|
||||||
$db_erg = HelferVonSchichtLoeschen($db_link,$HelferID,$EinzelSchichtID);
|
$db_erg = HelferVonSchichtLoeschen($db_link, $HelferID, $EinzelSchichtID);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
|
|
@ -254,23 +243,19 @@ if(isset($_POST['sent'])) {
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
|
||||||
// Helfer Schicht zuweisen
|
// Helfer Schicht zuweisen
|
||||||
$db_erg = HelferSchichtZuweisen($db_link,$HelferID,$SchichtId);
|
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
||||||
|
|
||||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||||
$HelferName = '';
|
$HelferName = '';
|
||||||
$HelferEmail = '';
|
$HelferEmail = '';
|
||||||
$HelferHandy = '';
|
$HelferHandy = '';
|
||||||
//die('<div class="Helfer wurde angelegt.</div>');
|
//die('<div class="Helfer wurde angelegt.</div>');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message)
|
foreach($messages as $message) {
|
||||||
{
|
|
||||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
|
|
@ -288,34 +273,32 @@ if(isset($_POST['sent'])) {
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
$db_erg = AlleSchichtenEinesHelfers($db_link,$HelferID);
|
$db_erg = AlleSchichtenEinesHelfers($db_link, $HelferID);
|
||||||
|
|
||||||
if ( ! $db_erg )
|
if (! $db_erg) {
|
||||||
{
|
|
||||||
echo "AlleSchichten des Helfes ungültige Abfrage";
|
echo "AlleSchichten des Helfes ungültige Abfrage";
|
||||||
die('Ungültige Abfrage: ' . mysqli_error());
|
die('Ungültige Abfrage: ' . mysqli_error());
|
||||||
}
|
}
|
||||||
|
|
||||||
$iSQLCount = mysqli_num_rows($db_erg);
|
$iSQLCount = mysqli_num_rows($db_erg);
|
||||||
//$iSQLCount = 3;
|
//$iSQLCount = 3;
|
||||||
|
|
||||||
echo '<table id="customers">';
|
echo '<table id="customers">';
|
||||||
|
|
||||||
echo "<thead>";
|
echo "<thead>";
|
||||||
echo "<tr>";
|
echo "<tr>";
|
||||||
echo "<th colspan=4>". "Meine Schichten (".$iSQLCount." Schichten)</th>";
|
echo "<th colspan=4>". "Meine Schichten (".$iSQLCount." Schichten)</th>";
|
||||||
echo "</tr><tr>";
|
echo "</tr><tr>";
|
||||||
echo "<th></th>";
|
echo "<th></th>";
|
||||||
echo "<th style='width:180px'>". "Von" . "</th>";
|
echo "<th style='width:180px'>". "Von" . "</th>";
|
||||||
echo "<th style='width:180px'>". "Bis" . "</th>";
|
echo "<th style='width:180px'>". "Bis" . "</th>";
|
||||||
echo "<th style='width:90px'>". "Del" . "</th>";
|
echo "<th style='width:90px'>". "Del" . "</th>";
|
||||||
echo "</tr>";
|
echo "</tr>";
|
||||||
echo "</thead>";
|
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="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="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||||
|
|
@ -334,13 +317,13 @@ $iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
||||||
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
$iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
||||||
|
|
||||||
echo '<table id="customers" onclick="window.location.href=\'AlleSchichten.php\'">';
|
echo '<table id="customers" onclick="window.location.href=\'AlleSchichten.php\'">';
|
||||||
echo "<tr>";
|
echo "<tr>";
|
||||||
echo "<th>".'<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">'. " Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
echo "<th>".'<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">'. " Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
||||||
echo "</tr>";
|
echo "</tr>";
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
|
|
||||||
|
|
||||||
mysqli_free_result( $db_erg );
|
mysqli_free_result($db_erg);
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -7,56 +7,55 @@
|
||||||
|
|
||||||
<!--meta name="viewport" content="width=480" /-->
|
<!--meta name="viewport" content="width=480" /-->
|
||||||
<?php
|
<?php
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
|
|
||||||
|
|
||||||
// if we are not logged in, we redirect in the header back to the main page
|
// if we are not logged in, we redirect in the header back to the main page
|
||||||
if(!isset($_SESSION["HelferID"]) || ! $_SESSION["HelferID"] > 0) {
|
if(!isset($_SESSION["HelferID"]) || ! $_SESSION["HelferID"] > 0) {
|
||||||
echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />
|
echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />
|
||||||
';
|
';
|
||||||
}
|
}
|
||||||
// print top of page if we are logged in and not redirecting
|
// print top of page if we are logged in and not redirecting
|
||||||
echo " </head> \n <body> \n";
|
echo " </head> \n <body> \n";
|
||||||
echo '<button name="BackHelferdaten" value="1" onclick="window.location.href = \'index.php\';"><b>↩</b></button><br>'."\n";
|
echo '<button name="BackHelferdaten" value="1" onclick="window.location.href = \'index.php\';"><b>↩</b></button><br>'."\n";
|
||||||
echo '<H1> Helferdaten - Log </H1>';
|
echo '<H1> Helferdaten - Log </H1>';
|
||||||
echo '<p>Hier werden alle Aktionen, die einen Helfer betreffen aufgelistet</p>';
|
echo '<p>Hier werden alle Aktionen, die einen Helfer betreffen aufgelistet</p>';
|
||||||
echo '<table id="customers">'."\n";
|
echo '<table id="customers">'."\n";
|
||||||
|
|
||||||
//check for admin status
|
//check for admin status
|
||||||
$HelferID = $_SESSION["HelferID"];
|
$HelferID = $_SESSION["HelferID"];
|
||||||
$AdminID = $_SESSION["AdminID"];
|
$AdminID = $_SESSION["AdminID"];
|
||||||
include '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);
|
||||||
DatenbankAufDeutsch($db_link);
|
DatenbankAufDeutsch($db_link);
|
||||||
|
|
||||||
$db_erg = Helferdaten($db_link,$HelferID);
|
$db_erg = Helferdaten($db_link, $HelferID);
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
$HelferName = $zeile['Name'];
|
||||||
$HelferName=$zeile['Name'];
|
$HelferIsAdmin = $zeile['Admin'];
|
||||||
$HelferIsAdmin=$zeile['Admin'];
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Wir suchen nach HelferID:<zahl> - wenn das Admin Flag gesetzt ist, kann man den Suchstring auf etwas anderes aendern
|
// Wir suchen nach HelferID:<zahl> - wenn das Admin Flag gesetzt ist, kann man den Suchstring auf etwas anderes aendern
|
||||||
$regex = "\(HelferID:$HelferID\)";
|
$regex = "\(HelferID:$HelferID\)";
|
||||||
if($HelferIsAdmin){
|
if($HelferIsAdmin) {
|
||||||
if(isset($_POST['suche']) || isset($_GET['suche'])){
|
if(isset($_POST['suche']) || isset($_GET['suche'])) {
|
||||||
$regex=$_POST['suche'].$_GET['suche'];
|
$regex = $_POST['suche'].$_GET['suche'];
|
||||||
}
|
}
|
||||||
echo "<form>";
|
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 "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 "Der Suchbegriff ist ein <a href='https://de.wikipedia.org/wiki/Regul%C3%A4rer_Ausdruck'>Regulärer Ausdruck</a><br><br>";
|
||||||
echo "</form>";
|
echo "</form>";
|
||||||
}
|
}
|
||||||
|
|
||||||
$regex = "/"."$regex"."/";
|
$regex = "/"."$regex"."/";
|
||||||
foreach(file(LOGFILE) as $line) {
|
foreach(file(LOGFILE) as $line) {
|
||||||
#echo "not: $line<br>\n";
|
#echo "not: $line<br>\n";
|
||||||
if(preg_match($regex,$line,$matches)){
|
if(preg_match($regex, $line, $matches)) {
|
||||||
echo "<tr><td> $line</td></tr>";
|
echo "<tr><td> $line</td></tr>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</table>
|
</table>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
579
html/SQL.php
579
html/SQL.php
File diff suppressed because it is too large
Load Diff
|
|
@ -2,21 +2,21 @@
|
||||||
<?php
|
<?php
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
|
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
include '_crypt.php';
|
include '_crypt.php';
|
||||||
|
|
||||||
|
|
||||||
$head="<!doctype html>
|
$head = "<!doctype html>
|
||||||
<head></head> <body> ";
|
<head></head> <body> ";
|
||||||
$foot="</body></html>";
|
$foot = "</body></html>";
|
||||||
|
|
||||||
$db_link = mysqli_connect (
|
$db_link = mysqli_connect(
|
||||||
MYSQL_HOST,
|
MYSQL_HOST,
|
||||||
MYSQL_BENUTZER,
|
MYSQL_BENUTZER,
|
||||||
MYSQL_KENNWORT,
|
MYSQL_KENNWORT,
|
||||||
MYSQL_DATENBANK
|
MYSQL_DATENBANK
|
||||||
);
|
);
|
||||||
# ist jetzt in _crypt.php, aber aus der anderen Datei, deshalb hier erst
|
# ist jetzt in _crypt.php, aber aus der anderen Datei, deshalb hier erst
|
||||||
# nur auskommentiert
|
# nur auskommentiert
|
||||||
#function Entschluessle($encrypted_data,$secret_verification,$secret_key){
|
#function Entschluessle($encrypted_data,$secret_verification,$secret_key){
|
||||||
|
|
@ -42,30 +42,30 @@ $db_link = mysqli_connect (
|
||||||
# return($decrypted_email);
|
# return($decrypted_email);
|
||||||
#}
|
#}
|
||||||
|
|
||||||
if(isset($_GET['token']) || isset($_POST['token']) ) {
|
if(isset($_GET['token']) || isset($_POST['token'])) {
|
||||||
// E-Mail-Adresse des Nutzers
|
// E-Mail-Adresse des Nutzers
|
||||||
$token = $_GET['token'];
|
$token = $_GET['token'];
|
||||||
//$email = Entschluessle($token,$secret_verification,$secret_key);
|
//$email = Entschluessle($token,$secret_verification,$secret_key);
|
||||||
$decrypted_data = decode_string($secret_key, $token, $secret_verification);
|
$decrypted_data = decode_string($secret_key, $token, $secret_verification);
|
||||||
//error_log("decrytped_data: ". $decrypted_data);
|
//error_log("decrytped_data: ". $decrypted_data);
|
||||||
$email=$decrypted_data['email'];
|
$email = $decrypted_data['email'];
|
||||||
$helfer_level=$decrypted_data['level'];
|
$helfer_level = $decrypted_data['level'];
|
||||||
$success=$decrypted_data['success'];
|
$success = $decrypted_data['success'];
|
||||||
//error_log("email: ".$email.",level: ".$helfer_level.",success: ".$success);
|
//error_log("email: ".$email.",level: ".$helfer_level.",success: ".$success);
|
||||||
} else {
|
} else {
|
||||||
echo "$head Kein Token angegeben!<br> $foot";
|
echo "$head Kein Token angegeben!<br> $foot";
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
if($success != 1) {
|
if($success != 1) {
|
||||||
// if ( $db_erg ) {
|
// if ( $db_erg ) {
|
||||||
// echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />';
|
// echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />';
|
||||||
// } else {
|
// } else {
|
||||||
echo "$head Kein gültiges Token!<br>$foot";
|
echo "$head Kein gültiges Token!<br>$foot";
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
//}
|
//}
|
||||||
//TODO: Variablendoppelung aufloesen und oben gleich einmal setzen
|
//TODO: Variablendoppelung aufloesen und oben gleich einmal setzen
|
||||||
if($success == 1 && $email != ""){
|
if($success == 1 && $email != "") {
|
||||||
// Ausgabe der entschlüsselten E-Mail-Adresse
|
// Ausgabe der entschlüsselten E-Mail-Adresse
|
||||||
//echo "E-Mail-Adresse: ", $email, "<br>\n";
|
//echo "E-Mail-Adresse: ", $email, "<br>\n";
|
||||||
//echo "Passwort: ",$token,"<br>\n";
|
//echo "Passwort: ",$token,"<br>\n";
|
||||||
|
|
@ -81,14 +81,14 @@ if($success == 1 && $email != ""){
|
||||||
}
|
}
|
||||||
error_log("2email: ".$HelferEmail.",level: ".$helfer_level.",success: ".$success);
|
error_log("2email: ".$HelferEmail.",level: ".$helfer_level.",success: ".$success);
|
||||||
// Helfer Anlegen, wenn er nicht existiert
|
// Helfer Anlegen, wenn er nicht existiert
|
||||||
if( ! HelferIstVorhanden($db_link,$HelferEmail) ) {
|
if(! HelferIstVorhanden($db_link, $HelferEmail)) {
|
||||||
error_log("Helfer ".$HelferEmail." nicht vorhanden, lege an");
|
error_log("Helfer ".$HelferEmail." nicht vorhanden, lege an");
|
||||||
error_log("CreateHelfer(db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);");
|
error_log("CreateHelfer(db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);");
|
||||||
$db_erg = 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-Versuch, entweder direkt nach Anlegen oder wenn existiert hat
|
||||||
// Login und auf Haupt-Seite gehen
|
// 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>';
|
echo '<html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,16 +16,16 @@ SESSION_START();
|
||||||
$HelferID = $_SESSION["HelferID"];
|
$HelferID = $_SESSION["HelferID"];
|
||||||
$AdminID = $_SESSION["AdminID"];
|
$AdminID = $_SESSION["AdminID"];
|
||||||
|
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
//require_once ('SQL.php');
|
//require_once ('SQL.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
|
|
||||||
$db_link = mysqli_connect (
|
$db_link = mysqli_connect(
|
||||||
MYSQL_HOST,
|
MYSQL_HOST,
|
||||||
MYSQL_BENUTZER,
|
MYSQL_BENUTZER,
|
||||||
MYSQL_KENNWORT,
|
MYSQL_KENNWORT,
|
||||||
MYSQL_DATENBANK
|
MYSQL_DATENBANK
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -40,8 +40,7 @@ if(isset($_POST['change'])) {
|
||||||
// Eingaben überprüfen:
|
// Eingaben überprüfen:
|
||||||
|
|
||||||
|
|
||||||
if(strlen($_POST['helfer-newpasswort'])<8 and $_POST['helfer-newpasswort']!="")
|
if(strlen($_POST['helfer-newpasswort']) < 8 and $_POST['helfer-newpasswort'] != "") {
|
||||||
{
|
|
||||||
$messages[] = 'Neues Passwort zu kurz';
|
$messages[] = 'Neues Passwort zu kurz';
|
||||||
}
|
}
|
||||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||||
|
|
@ -53,7 +52,7 @@ if(isset($_POST['change'])) {
|
||||||
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
||||||
if(empty($messages)) {
|
if(empty($messages)) {
|
||||||
// Helferdaten Ändern
|
// Helferdaten Ändern
|
||||||
HelferdatenAendern($db_link,$HelferName,$HelferEmail,$HelferHandy,$HelferNewPasswort,$HelferID);
|
HelferdatenAendern($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $HelferID);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
|
|
@ -63,7 +62,7 @@ if(isset($_POST['change'])) {
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -71,11 +70,10 @@ if(isset($_POST['change'])) {
|
||||||
// Helferdate holen
|
// Helferdate holen
|
||||||
///////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
$db_erg = Helferdaten($db_link,$HelferID);
|
$db_erg = Helferdaten($db_link, $HelferID);
|
||||||
|
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$HelferName = $zeile['Name'];
|
$HelferName = $zeile['Name'];
|
||||||
$HelferEmail = $zeile['Email'];
|
$HelferEmail = $zeile['Email'];
|
||||||
$HelferHandy = $zeile['Handy'];
|
$HelferHandy = $zeile['Handy'];
|
||||||
|
|
@ -83,16 +81,14 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||||
|
|
||||||
/// Logout
|
/// Logout
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['logout']))
|
if(isset($_POST['logout'])) {
|
||||||
{
|
|
||||||
unset($_SESSION["HelferID"]);
|
unset($_SESSION["HelferID"]);
|
||||||
//$_POST['login'] = 1;
|
//$_POST['login'] = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Login
|
/// Login
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['login']))
|
if(isset($_POST['login'])) {
|
||||||
{
|
|
||||||
$messages = [];
|
$messages = [];
|
||||||
// Eingaben überprüfen:
|
// Eingaben überprüfen:
|
||||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||||
|
|
@ -103,12 +99,9 @@ if(isset($_POST['login']))
|
||||||
$HelferEmail = $_POST['helfer-email'];
|
$HelferEmail = $_POST['helfer-email'];
|
||||||
$HelferPasswort = $_POST['helfer-passwort'];
|
$HelferPasswort = $_POST['helfer-passwort'];
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort, 0 );
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message) {
|
foreach($messages as $message) {
|
||||||
|
|
@ -131,27 +124,27 @@ if(isset($_POST['login']))
|
||||||
<form method="post">
|
<form method="post">
|
||||||
<tr>
|
<tr>
|
||||||
<td>Name</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Email</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Handy</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Altes Helfer Passwort</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Neues Helfer Passwort</td></tr><tr><td>
|
<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>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
<?php
|
<?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
|
// String verification anfuegen am Ende, um abgeschnittene URLs zu verhindern
|
||||||
$token_content = $email . '|' . $level . '|' . $verification;
|
$token_content = $email . '|' . $level . '|' . $verification;
|
||||||
|
|
||||||
|
|
@ -13,7 +15,7 @@ function encode_string($key, $email, $level, $verification) {
|
||||||
$cipher_text = openssl_encrypt($token_content, $cipher_method, $cipher_key, $cipher_options, $iv);
|
$cipher_text = openssl_encrypt($token_content, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||||
|
|
||||||
if(isset($debug)) {
|
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;
|
$cipher_text = $iv . $cipher_text;
|
||||||
|
|
@ -23,7 +25,8 @@ function encode_string($key, $email, $level, $verification) {
|
||||||
return $encrypted_data;
|
return $encrypted_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
function decode_string($key, $encrypted_data, $verification) {
|
function decode_string($key, $encrypted_data, $verification)
|
||||||
|
{
|
||||||
// Entschlüsseln des verschuesselten Textes
|
// Entschlüsseln des verschuesselten Textes
|
||||||
// erst base64 entfernen - urldecode muss wenn noetig vorher angewendet werden
|
// erst base64 entfernen - urldecode muss wenn noetig vorher angewendet werden
|
||||||
$decoded_cipher_text = base64_decode($encrypted_data);
|
$decoded_cipher_text = base64_decode($encrypted_data);
|
||||||
|
|
@ -35,13 +38,15 @@ function decode_string($key, $encrypted_data, $verification) {
|
||||||
$cipher_options = OPENSSL_RAW_DATA;
|
$cipher_options = OPENSSL_RAW_DATA;
|
||||||
$cipher_key = openssl_digest($key, 'SHA256', true);
|
$cipher_key = openssl_digest($key, 'SHA256', true);
|
||||||
|
|
||||||
if(isset($debug)){
|
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,' ');
|
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);
|
$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);
|
$verification_length = strlen($verification);
|
||||||
|
|
||||||
if(substr($decrypted_data, -$verification_length) == $verification) {
|
if(substr($decrypted_data, -$verification_length) == $verification) {
|
||||||
|
|
@ -58,4 +63,3 @@ function decode_string($key, $encrypted_data, $verification) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
/// Logout
|
/// Logout
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_GET['logout']) || isset($_POST['logout']))
|
if(isset($_GET['logout']) || isset($_POST['logout'])) {
|
||||||
{
|
|
||||||
// remove all session variables
|
// remove all session variables
|
||||||
session_unset();
|
session_unset();
|
||||||
|
|
||||||
|
|
@ -14,8 +13,7 @@ if(isset($_GET['logout']) || isset($_POST['logout']))
|
||||||
|
|
||||||
/// Login
|
/// Login
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['login']))
|
if(isset($_POST['login'])) {
|
||||||
{
|
|
||||||
$messages = [];
|
$messages = [];
|
||||||
// Eingaben überprüfen:
|
// Eingaben überprüfen:
|
||||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||||
|
|
@ -28,12 +26,9 @@ if(isset($_POST['login']))
|
||||||
$HelferEmail = $_POST['helfer-email'];
|
$HelferEmail = $_POST['helfer-email'];
|
||||||
$HelferPasswort = $_POST['helfer-passwort'];
|
$HelferPasswort = $_POST['helfer-passwort'];
|
||||||
|
|
||||||
if(empty($messages))
|
if(empty($messages)) {
|
||||||
{
|
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort, 0 );
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message) {
|
foreach($messages as $message) {
|
||||||
|
|
@ -44,10 +39,9 @@ if(isset($_POST['login']))
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!isset($_SESSION["HelferID"]))
|
if(!isset($_SESSION["HelferID"])) {
|
||||||
{
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<form method="post" action="#Info">
|
<form method="post" action="#Info">
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
|
|
@ -56,13 +50,13 @@ if(!isset($_SESSION["HelferID"]))
|
||||||
<table border="0" style="border: 0px solid black;">
|
<table border="0" style="border: 0px solid black;">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="border: 0px solid black;">Email</td></tr><tr><td style="border: 0px solid black;">
|
<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>
|
</td>
|
||||||
<tr>
|
<tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="border: 0px solid black;">Passwort</td></tr>
|
<td style="border: 0px solid black;">Passwort</td></tr>
|
||||||
<tr><td style="border: 0px solid black;">
|
<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;">
|
</td><td style="border: 0px solid black;">
|
||||||
<input type="button" value="Passwort zeigen" style="width:180px !important" onclick="showPassword('helfer-passwort')">
|
<input type="button" value="Passwort zeigen" style="width:180px !important" onclick="showPassword('helfer-passwort')">
|
||||||
</td>
|
</td>
|
||||||
|
|
@ -85,6 +79,6 @@ $HelferID = $_SESSION["HelferID"];
|
||||||
$HelferName = $_SESSION["HelferName"];
|
$HelferName = $_SESSION["HelferName"];
|
||||||
$AdminID = $_SESSION["AdminID"];
|
$AdminID = $_SESSION["AdminID"];
|
||||||
//TODO vereinheitlichen. index.php verwendet HelferIsAdmin
|
//TODO vereinheitlichen. index.php verwendet HelferIsAdmin
|
||||||
$HelferIsAdmin=$AdminStatus = $_SESSION["AdminStatus"];
|
$HelferIsAdmin = $AdminStatus = $_SESSION["AdminStatus"];
|
||||||
$HelferLevel= $_SESSION["HelferLevel"];
|
$HelferLevel = $_SESSION["HelferLevel"];
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once("../konfiguration.php");
|
require_once("../konfiguration.php");
|
||||||
$options=[];
|
$options = [];
|
||||||
$db = new PDO($dsn, MYSQL_BENUTZER, MYSQL_KENNWORT, $options);
|
$db = new PDO($dsn, MYSQL_BENUTZER, MYSQL_KENNWORT, $options);
|
||||||
|
|
||||||
function read($db, $requestParams){
|
function read($db, $requestParams)
|
||||||
|
{
|
||||||
$queryParams = [];
|
$queryParams = [];
|
||||||
$queryText = "
|
$queryText = "
|
||||||
select Schicht.SchichtID as id,
|
select Schicht.SchichtID as id,
|
||||||
|
|
@ -33,7 +35,7 @@ function read($db, $requestParams){
|
||||||
if (isset($requestParams["from"]) && isset($requestParams["to"])) {
|
if (isset($requestParams["from"]) && isset($requestParams["to"])) {
|
||||||
//error_log("timespan given. from: ".$requestParams["from"]." to: ".$requestParams["to"]);
|
//error_log("timespan given. from: ".$requestParams["from"]." to: ".$requestParams["to"]);
|
||||||
$queryText .= " WHERE `Schicht.Bis`>=? AND `Schicht.Von` < ?;";
|
$queryText .= " WHERE `Schicht.Bis`>=? AND `Schicht.Von` < ?;";
|
||||||
$queryParams = [filter_var($requestParams["from"],FILTER_SANITIZE_NUMBER_FLOAT), filter_var($requestParams["to"],FILTER_SANITIZE_NUMBER_FLOAT)];
|
$queryParams = [filter_var($requestParams["from"], FILTER_SANITIZE_NUMBER_FLOAT), filter_var($requestParams["to"], FILTER_SANITIZE_NUMBER_FLOAT)];
|
||||||
}
|
}
|
||||||
$query = $db->prepare($queryText);
|
$query = $db->prepare($queryText);
|
||||||
$query->execute($queryParams);
|
$query->execute($queryParams);
|
||||||
|
|
@ -54,4 +56,3 @@ switch ($_SERVER["REQUEST_METHOD"]) {
|
||||||
}
|
}
|
||||||
header("Content-Type: application/json");
|
header("Content-Type: application/json");
|
||||||
echo json_encode($result);
|
echo json_encode($result);
|
||||||
?>
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,16 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once("../konfiguration.php");
|
require_once("../konfiguration.php");
|
||||||
$options=[];
|
$options = [];
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
$db = new PDO($dsn, MYSQL_BENUTZER, MYSQL_KENNWORT, $options);
|
$db = new PDO($dsn, MYSQL_BENUTZER, MYSQL_KENNWORT, $options);
|
||||||
if(!isset($_SESSION["HelferID"])){ exit ; }
|
if(!isset($_SESSION["HelferID"])) {
|
||||||
|
exit ;
|
||||||
|
}
|
||||||
$HelferID = $_SESSION["HelferID"];
|
$HelferID = $_SESSION["HelferID"];
|
||||||
|
|
||||||
function read_from_db($db, $requestParams,$HelferID){
|
function read_from_db($db, $requestParams, $HelferID)
|
||||||
|
{
|
||||||
$queryParams = [];
|
$queryParams = [];
|
||||||
$queryText = "
|
$queryText = "
|
||||||
select Schicht.SchichtID as id,
|
select Schicht.SchichtID as id,
|
||||||
|
|
@ -34,14 +38,14 @@ function read_from_db($db, $requestParams,$HelferID){
|
||||||
|
|
||||||
$query = $db->prepare($queryText);
|
$query = $db->prepare($queryText);
|
||||||
$query->execute($queryParams);
|
$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();
|
$events = $query->fetchAll();
|
||||||
return $events;
|
return $events;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch ($_SERVER["REQUEST_METHOD"]) {
|
switch ($_SERVER["REQUEST_METHOD"]) {
|
||||||
case "GET":
|
case "GET":
|
||||||
$result = read_from_db($db, $_GET,$HelferID);
|
$result = read_from_db($db, $_GET, $HelferID);
|
||||||
break;
|
break;
|
||||||
case "POST":
|
case "POST":
|
||||||
// only if changes will be allowed
|
// only if changes will be allowed
|
||||||
|
|
@ -52,4 +56,3 @@ switch ($_SERVER["REQUEST_METHOD"]) {
|
||||||
}
|
}
|
||||||
header("Content-Type: application/json");
|
header("Content-Type: application/json");
|
||||||
echo json_encode($result);
|
echo json_encode($result);
|
||||||
?>
|
|
||||||
|
|
|
||||||
|
|
@ -13,15 +13,15 @@
|
||||||
<?php
|
<?php
|
||||||
SESSION_START();
|
SESSION_START();
|
||||||
|
|
||||||
require_once ('konfiguration.php');
|
require_once('konfiguration.php');
|
||||||
include 'SQL.php';
|
include 'SQL.php';
|
||||||
|
|
||||||
$db_link = mysqli_connect (
|
$db_link = mysqli_connect(
|
||||||
MYSQL_HOST,
|
MYSQL_HOST,
|
||||||
MYSQL_BENUTZER,
|
MYSQL_BENUTZER,
|
||||||
MYSQL_KENNWORT,
|
MYSQL_KENNWORT,
|
||||||
MYSQL_DATENBANK
|
MYSQL_DATENBANK
|
||||||
);
|
);
|
||||||
|
|
||||||
DatenbankAufDeutsch($db_link);
|
DatenbankAufDeutsch($db_link);
|
||||||
|
|
||||||
|
|
@ -48,12 +48,9 @@ include '_login.php';
|
||||||
<td > <img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;">
|
<td > <img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;">
|
||||||
<b>
|
<b>
|
||||||
<?php
|
<?php
|
||||||
if($HelferIsAdmin)
|
if($HelferIsAdmin) {
|
||||||
{
|
|
||||||
echo "Admin ";
|
echo "Admin ";
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "Helfer ";
|
echo "Helfer ";
|
||||||
}
|
}
|
||||||
echo $HelferName;
|
echo $HelferName;
|
||||||
|
|
@ -72,16 +69,15 @@ include '_login.php';
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
//$HelferID=72;
|
//$HelferID=72;
|
||||||
|
|
||||||
$db_erg = AlleSchichtenEinesHelfersVonJetzt($db_link,$HelferID);
|
$db_erg = AlleSchichtenEinesHelfersVonJetzt($db_link, $HelferID);
|
||||||
|
|
||||||
|
|
||||||
$iSQLCount = mysqli_num_rows($db_erg);
|
$iSQLCount = mysqli_num_rows($db_erg);
|
||||||
//$iSQLCount = 3;
|
//$iSQLCount = 3;
|
||||||
|
|
||||||
|
|
||||||
$iCount=0;
|
$iCount = 0;
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC) and $iCount<3)
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC) and $iCount < 3) {
|
||||||
{
|
|
||||||
echo "<li>". $zeile['Ab'] . " ". $zeile['Was'] . "</li>";
|
echo "<li>". $zeile['Ab'] . " ". $zeile['Was'] . "</li>";
|
||||||
$iCount++;
|
$iCount++;
|
||||||
}
|
}
|
||||||
|
|
@ -140,8 +136,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC) and $iCount<3)
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
if ($HelferIsAdmin)
|
if ($HelferIsAdmin) {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<tr onclick="window.location.href='Admin.php';">
|
<tr onclick="window.location.href='Admin.php';">
|
||||||
<td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Admin</b></td>
|
<td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Admin</b></td>
|
||||||
|
|
@ -149,7 +144,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC) and $iCount<3)
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr onclick="window.location.href='index.php?logout=1';">
|
<tr onclick="window.location.href='index.php?logout=1';">
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ require_once('/etc/helferdb_konfiguration.php');
|
||||||
date_default_timezone_set('Europe/Berlin');
|
date_default_timezone_set('Europe/Berlin');
|
||||||
setlocale(LC_TIME, "de_DE.UTF-8");
|
setlocale(LC_TIME, "de_DE.UTF-8");
|
||||||
$start_date = new DateTimeImmutable("2023-05-18");
|
$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
|
// 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
|
// 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
|
// muss nicht angepasst werden // no changes needed
|
||||||
// Zeitbereich: -1 davor, 0 kein Limit, 1-N Tag N der Con, 1000: nach der Con
|
// Zeitbereich: -1 davor, 0 kein Limit, 1-N Tag N der Con, 1000: nach der Con
|
||||||
$ZeitBereichWerte=range(-1,TAGE_DAUER);
|
$ZeitBereichWerte = range(-1, TAGE_DAUER);
|
||||||
array_push($ZeitBereichWerte,1000);
|
array_push($ZeitBereichWerte, 1000);
|
||||||
define('ZEITBEREICHWERTE', $ZeitBereichWerte);
|
define('ZEITBEREICHWERTE', $ZeitBereichWerte);
|
||||||
$TageNamenDeutsch=array("So","Mo","Di","Mi","Do","Fr","Sa");
|
$TageNamenDeutsch = array("So","Mo","Di","Mi","Do","Fr","Sa");
|
||||||
|
|
||||||
//Kalender-Konfiguration
|
//Kalender-Konfiguration
|
||||||
$dsn = "mysql:host=localhost;dbname=".MYSQL_DATENBANK; # dsn fuer Kalender
|
$dsn = "mysql:host=localhost;dbname=".MYSQL_DATENBANK; # dsn fuer Kalender
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue