Merge pull request #3 from iridos/php-codesniffer
PSR12 code standard with php code sniffer
This commit is contained in:
GitHub
commit
c601c3a7c3
|
|
@ -3,19 +3,15 @@ name: "CI"
|
|||
on: [workflow_dispatch, pull_request]
|
||||
|
||||
jobs:
|
||||
phpcs:
|
||||
phpcs_psr12:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0 # important!
|
||||
|
||||
# we may use whatever way to install phpcs, just specify the path on the next step
|
||||
# however, curl seems to be the fastest
|
||||
fetch-depth: 0
|
||||
- name: Install PHP_CodeSniffer
|
||||
run: |
|
||||
curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
|
||||
php phpcs.phar --version
|
||||
|
||||
run: sudo apt-get -y install php-codesniffer
|
||||
- name: Set phpcs to ignore warnings in return value
|
||||
run: sudo phpcs --config-set ignore_warnings_on_exit 1
|
||||
- name: Run phpcs
|
||||
run: php phpcs.phar --standard=PSR12 html
|
||||
run: phpcs --standard=PSR12 html
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
include '_login.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
require '_login.php';
|
||||
|
||||
if($AdminStatus != 1) {
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
|
|
@ -28,33 +28,29 @@ if($AdminStatus != 1) {
|
|||
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
$AliasHelferID=0;
|
||||
$AliasHelferID = 0;
|
||||
|
||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||
if(isset($_SESSION["AliasHelferID"]))
|
||||
{
|
||||
if (isset($_SESSION["AliasHelferID"])) {
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
}
|
||||
|
||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||
|
||||
if(isset($_POST["AliasHelfer"]))
|
||||
{
|
||||
if (isset($_POST["AliasHelfer"])) {
|
||||
$AliasHelferID = $_POST["AliasHelfer"];
|
||||
//echo "post<br>";
|
||||
}
|
||||
|
||||
if($AliasHelferID!=0)
|
||||
{
|
||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
||||
if ($AliasHelferID != 0) {
|
||||
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||
}
|
||||
//echo "AliasHelfer=$AliasHelferID <br>";
|
||||
|
||||
$db_erg = Helferdaten($db_link,$HelferID);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$HelferName=$zeile['Name'];
|
||||
$HelferIsAdmin=$zeile['Admin'];
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -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()">
|
||||
<?php
|
||||
$db_erg = HelferListe($db_link);
|
||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($AliasHelferID != $zeile['HelferID']) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</optionen>";
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
?>
|
||||
</select></form>
|
||||
</b>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
include '_login.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
require '_login.php';
|
||||
|
||||
if($AdminStatus != 1) {
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
|
|
@ -33,18 +33,33 @@ if($AdminStatus != 1) {
|
|||
|
||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['CloseInfo']))
|
||||
{
|
||||
UNSET($InfoMeineSchichtID);
|
||||
UNSET($InfoAlleSchichtID);
|
||||
if (isset($_POST['CloseInfo'])) {
|
||||
unset($InfoMeineSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
}
|
||||
if(isset($_POST['InfoMeineSchichtID']))
|
||||
{
|
||||
if (isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
}
|
||||
|
||||
|
||||
if (isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
|
|
@ -54,87 +69,58 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer=$zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
||||
$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'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x]= $zeile['Handy'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(isset($_GET['ZeitBereich']))
|
||||
{
|
||||
if (isset($_GET['ZeitBereich'])) {
|
||||
$ZeitBereich = $_GET['ZeitBereich'];
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$ZeitBereich = 1;
|
||||
}
|
||||
|
||||
function HelferAuswahlButton($db_link,$AliasHelferID){
|
||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
||||
$db_erg = HelferListe($db_link);
|
||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
||||
$db_erg = HelferListe($db_link);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($AliasHelferID != $zeile['HelferID']) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</optionen>";
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
}
|
||||
echo '</select></form>';
|
||||
echo '</select></form>';
|
||||
}
|
||||
|
||||
if(isset($_POST['AliasHelfer'])) {
|
||||
$AliasHelferID=$_POST['AliasHelfer'];
|
||||
}elseif(isset($_SESSION["AliasHelferID"])){
|
||||
if (isset($_POST['AliasHelfer'])) {
|
||||
$AliasHelferID = $_POST['AliasHelfer'];
|
||||
} elseif (isset($_SESSION["AliasHelferID"])) {
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
}else{
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
exit;
|
||||
} else {
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
exit;
|
||||
}
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
|
||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
||||
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
$db_erg=Helferdaten($db_link,$HelferID);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$HelferName=$zeile['Name'];
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
}
|
||||
|
||||
// Helferliste Anzeigen
|
||||
|
|
@ -152,8 +138,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
|
||||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if(isset($_POST['plusschicht'])) {
|
||||
|
||||
if (isset($_POST['plusschicht'])) {
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['plusschicht'];
|
||||
|
||||
|
|
@ -164,56 +149,42 @@ if(isset($_POST['plusschicht'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// 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
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(isset($_POST['minusschicht'])) {
|
||||
// Mich aus Schicht entfernen
|
||||
if (isset($_POST['minusschicht'])) {
|
||||
// Mich aus Schicht entfernen
|
||||
$messages = [];
|
||||
|
||||
$SchichtID = $_POST['minusschicht'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// Helfer aus Schicht entfernen
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link,$AliasHelferID,$SchichtID,$AdminID);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $AliasHelferID, $SchichtID, $AdminID);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -223,45 +194,41 @@ if(isset($_POST['minusschicht'])) {
|
|||
|
||||
|
||||
// Zusammenfassung Eigener Schichten
|
||||
$db_erg = SchichtenSummeEinesHelfers($db_link,$AliasHelferID);
|
||||
$zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC);
|
||||
$db_erg = SchichtenSummeEinesHelfers($db_link, $AliasHelferID);
|
||||
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||
|
||||
echo '<table id="customers"><tr class="header"><th onclick="window.location.href=\'AdminMeineSchichten.php\'">';
|
||||
echo " Dienstplan von $HelferName (Zusammenfassung)<br>";
|
||||
echo $zeile['Anzahl'];
|
||||
echo " Schichten insgesamt ";
|
||||
echo $zeile['Dauer']/3600;
|
||||
echo $zeile['Dauer'] / 3600;
|
||||
echo " Stunden";
|
||||
echo '</th></tr></table><br><br>';
|
||||
/// Schichten Auswahl
|
||||
////////////////////////////////////////////////////////
|
||||
$addschicht =$_SESSION["addschicht"];
|
||||
$dienstsort =$_SESSION["dienstsort"];
|
||||
$addschicht = $_SESSION["addschicht"];
|
||||
$dienstsort = $_SESSION["dienstsort"];
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='1')
|
||||
{
|
||||
$addschicht='1';
|
||||
$dienstsort='1';
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '1') {
|
||||
$addschicht = '1';
|
||||
$dienstsort = '1';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='2')
|
||||
{
|
||||
$addschicht='2';
|
||||
$dienstsort='2';
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '2') {
|
||||
$addschicht = '2';
|
||||
$dienstsort = '2';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='0')
|
||||
{
|
||||
$addschicht='0';
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '0') {
|
||||
$addschicht = '0';
|
||||
}
|
||||
|
||||
$_SESSION["addschicht"] =$addschicht;
|
||||
$_SESSION["dienstsort"] =$dienstsort;
|
||||
$_SESSION["addschicht"] = $addschicht;
|
||||
$_SESSION["dienstsort"] = $dienstsort;
|
||||
|
||||
//echo "<br>Detail=".$addschicht."<br>";
|
||||
|
||||
if($addschicht=='0')
|
||||
{
|
||||
if ($addschicht == '0') {
|
||||
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
||||
echo "<button name='addschicht' value='1'>Tage</button>";
|
||||
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
||||
|
|
@ -269,37 +236,29 @@ if($addschicht=='0')
|
|||
|
||||
//echo "InfoAlleSchichtID ".$InfoAlleSchichtID;
|
||||
|
||||
if($addschicht!='0')
|
||||
{
|
||||
if ($addschicht != '0') {
|
||||
//$db_erg = AlleSchichten($db_link,$dienstsort);
|
||||
//$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00");
|
||||
if ($ZeitBereich==1) // Alle
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2200-05-19 00:00:00",-1);
|
||||
if ($ZeitBereich == 1) { // Alle
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==2) // Davor
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2023-05-18 00:00:00",-1);
|
||||
if ($ZeitBereich == 2) { // Davor
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2023-05-18 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==3) // Do
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",-1);
|
||||
if ($ZeitBereich == 3) { // Do
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-18 00:00:00", "2023-05-19 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==4) // Fr
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-19 00:00:00","2023-05-20 00:00:00",-1);
|
||||
if ($ZeitBereich == 4) { // Fr
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-19 00:00:00", "2023-05-20 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==5) // Sa
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-20 00:00:00","2023-05-21 00:00:00",-1);
|
||||
if ($ZeitBereich == 5) { // Sa
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-20 00:00:00", "2023-05-21 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==6) // So
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-21 00:00:00","2023-05-22 00:00:00",-1);
|
||||
if ($ZeitBereich == 6) { // So
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-21 00:00:00", "2023-05-22 00:00:00", -1);
|
||||
}
|
||||
if ($ZeitBereich==7) // Danach
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-22 00:00:00","2223-05-22 00:00:00",-1);
|
||||
if ($ZeitBereich == 7) { // Danach
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-22 00:00:00", "2223-05-22 00:00:00", -1);
|
||||
}
|
||||
// fuer Anzahlanzeige in Ueberschrift
|
||||
$iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
||||
|
|
@ -310,7 +269,7 @@ if($addschicht!='0')
|
|||
echo '<table id="customers">';
|
||||
echo "<thead>";
|
||||
echo "<tr>";
|
||||
echo "</tr><th colspan='7'>". "Alle Schichten der Con (" . $iBelegteSchichtenCount."/".$iAlleSchichtenCount. ")</th></tr>";
|
||||
echo "</tr><th colspan='7'>" . "Alle Schichten der Con (" . $iBelegteSchichtenCount . "/" . $iAlleSchichtenCount . ")</th></tr>";
|
||||
|
||||
/*
|
||||
if ($dienstsort=='1')
|
||||
|
|
@ -322,61 +281,40 @@ if($addschicht!='0')
|
|||
echo "<th>". "Von" . "</th>";
|
||||
}
|
||||
*/
|
||||
if ($ZeitBereich==1)
|
||||
{
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>". "Alle" . "</th>";
|
||||
if ($ZeitBereich == 1) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>" . "Alle" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>" . "Alle" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>". "Alle" . "</th>";
|
||||
if ($ZeitBereich == 2) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>" . "Davor" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>" . "Davor" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==2)
|
||||
{
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>". "Davor" . "</th>";
|
||||
if ($ZeitBereich == 3) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>" . "Do" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>" . "Do" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>". "Davor" . "</th>";
|
||||
if ($ZeitBereich == 4) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>" . "Fr" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>" . "Fr" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==3)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>". "Do" . "</th>";
|
||||
if ($ZeitBereich == 5) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>" . "Sa" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>" . "Sa" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>". "Do" . "</th>";
|
||||
if ($ZeitBereich == 6) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>" . "So" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>" . "So" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==4)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>". "Fr" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>". "Fr" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==5)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>". "Sa" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>". "Sa" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==6)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==7)
|
||||
{
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>". "Danach" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>". "Danach" . "</th>";
|
||||
if ($ZeitBereich == 7) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>" . "Danach" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>" . "Danach" . "</th>";
|
||||
}
|
||||
//echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>". "Davor" . "</th>";
|
||||
//echo "<th style='width:50px'>". "Do" . "</th>";
|
||||
|
|
@ -390,35 +328,27 @@ if($addschicht!='0')
|
|||
|
||||
$OldTag = "";
|
||||
$OldWas = "";
|
||||
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link,$AliasHelferID);
|
||||
// um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link, $AliasHelferID);
|
||||
//print_r($MeineDienste);
|
||||
|
||||
echo '</table>';
|
||||
echo '<table id="customers">';
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($dienstsort == '1') {
|
||||
$Tag = $zeile['Tag'];
|
||||
|
||||
if ($Tag!=$OldTag)
|
||||
{
|
||||
if ($Tag != $OldTag) {
|
||||
echo "<tr class='header'><th colspan='5' >";
|
||||
echo $Tag;
|
||||
echo "</th></tr>";
|
||||
$OldTag = $Tag;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$Was = $zeile['Was'];
|
||||
|
||||
if ($Was!=$OldWas)
|
||||
{
|
||||
if ($Was != $OldWas) {
|
||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||
echo $Was;
|
||||
echo "</th>";
|
||||
|
|
@ -432,57 +362,48 @@ if($addschicht!='0')
|
|||
$OldWas = $Was;
|
||||
}
|
||||
}
|
||||
$Color="red";
|
||||
if ( $zeile['Ist'] > 0 )
|
||||
{
|
||||
$Color="yellow";
|
||||
$Color = "red";
|
||||
if ($zeile['Ist'] > 0) {
|
||||
$Color = "yellow";
|
||||
}
|
||||
if ( $zeile['Ist'] >= $zeile['Soll'] )
|
||||
{
|
||||
$Color="green";
|
||||
if ($zeile['Ist'] >= $zeile['Soll']) {
|
||||
$Color = "green";
|
||||
}
|
||||
$Von = $zeile['Ab'];
|
||||
$Bis = $zeile['Bis'];
|
||||
if ( substr($Von,0,2) == substr($Bis,0,2))
|
||||
{
|
||||
$Bis = substr($Bis,2);
|
||||
if (substr($Von, 0, 2) == substr($Bis, 0, 2)) {
|
||||
$Bis = substr($Bis, 2);
|
||||
}
|
||||
$Von = substr($Von,2);
|
||||
$Von = substr($Von, 2);
|
||||
|
||||
// Meine Schichten gruen einfaerben
|
||||
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||
if (in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||
$rowstyle = ' style="background-color:lightgreen" ';
|
||||
$regtext = 'Meine!';
|
||||
} else {
|
||||
// dummy-style, um SchichtID unsichtbar im Tag anzuzeigen
|
||||
$rowstyle = 'style="dummy:'.$zeile['SchichtID'].'"';
|
||||
$rowstyle = 'style="dummy:' . $zeile['SchichtID'] . '"';
|
||||
$regtext = '';
|
||||
}
|
||||
|
||||
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')
|
||||
{
|
||||
echo "<td>". $zeile['Was'] . "</td>";
|
||||
if ($dienstsort == '1') {
|
||||
echo "<td>" . $zeile['Was'] . "</td>";
|
||||
} else {
|
||||
echo "<td>" . $zeile['Tag'] . "</td>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<td>". $zeile['Tag'] . "</td>";
|
||||
}
|
||||
echo "<td>". $Von . "</td>";
|
||||
echo "<td>". $Bis . "</td>";
|
||||
echo "<td bgcolor='".$Color."'>". $zeile['Ist'] . "/";
|
||||
echo "". $zeile['Soll'] . "</td>";
|
||||
# buttons sind in der selben Zelle
|
||||
echo "<td width='30px'>" . "<button width='20px' name='plusschicht' value='". $zeile['SchichtID'] ."'>+</button>" ."";
|
||||
echo "" . " <button width='120px' name='minusschicht' value='". $zeile['SchichtID'] ."'>–</button> $regtext" ."</td>";
|
||||
echo "<td>" . $Von . "</td>";
|
||||
echo "<td>" . $Bis . "</td>";
|
||||
echo "<td bgcolor='" . $Color . "'>" . $zeile['Ist'] . "/";
|
||||
echo "" . $zeile['Soll'] . "</td>";
|
||||
// buttons sind in der selben Zelle
|
||||
echo "<td width='30px'>" . "<button width='20px' name='plusschicht' value='" . $zeile['SchichtID'] . "'>+</button>" . "";
|
||||
echo "" . " <button width='120px' name='minusschicht' value='" . $zeile['SchichtID'] . "'>–</button> $regtext" . "</td>";
|
||||
//echo "<td>$regtext</td>";
|
||||
echo "</tr>\n";
|
||||
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -491,7 +412,7 @@ if($addschicht!='0')
|
|||
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
include '_login.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
require '_login.php';
|
||||
|
||||
if($AdminStatus != 1) {
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
|
|
@ -29,110 +29,93 @@ if($AdminStatus != 1) {
|
|||
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
$DienstID =$_SESSION["DienstID"];
|
||||
$SchichtID =$_SESSION["SchichtID"];
|
||||
$DienstID = $_SESSION["DienstID"];
|
||||
$SchichtID = $_SESSION["SchichtID"];
|
||||
|
||||
|
||||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
if(isset($_POST['HelferID']))
|
||||
{
|
||||
if (isset($_POST['HelferID'])) {
|
||||
$HelferID = $_POST['HelferID'];
|
||||
}
|
||||
if(isset($_POST['ShowHelfer'])) {
|
||||
$HelferID=$_POST['HelperSearch'];
|
||||
}
|
||||
if (isset($_POST['ShowHelfer'])) {
|
||||
$HelferID = $_POST['HelperSearch'];
|
||||
}
|
||||
|
||||
$_SESSION["HelferID"] = $HelferID;
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['ChangeDienst'])) {
|
||||
if (isset($_POST['ChangeDienst'])) {
|
||||
$Was = $_POST['Dienst-Was'];
|
||||
$Wo = $_POST['Dienst-Wo'];
|
||||
$Info = $_POST['Dienst-Info'];
|
||||
$Leiter = $_POST['Dienst-Leiter'];
|
||||
$Gruppe = $_POST['Dienst-Gruppe'];
|
||||
$HelferLevel = $_POST['HelferLevel'];
|
||||
ChangeDienst($db_link, $DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel);
|
||||
}
|
||||
|
||||
$Was=$_POST['Dienst-Was'];
|
||||
$Wo=$_POST['Dienst-Wo'];
|
||||
$Info=$_POST['Dienst-Info'];
|
||||
$Leiter=$_POST['Dienst-Leiter'];
|
||||
$Gruppe=$_POST['Dienst-Gruppe'];
|
||||
$HelferLevel=$_POST['HelferLevel'];
|
||||
ChangeDienst($db_link,$DienstID,$Was,$Wo,$Info,$Leiter,$Gruppe,$HelferLevel);
|
||||
|
||||
}
|
||||
|
||||
if(isset($_POST['NewDienst'])) {
|
||||
|
||||
$Was=$_POST['Dienst-Was'];
|
||||
$Wo=$_POST['Dienst-Wo'];
|
||||
$Info=$_POST['Dienst-Info'];
|
||||
$Leiter=$_POST['Dienst-Leiter'];
|
||||
$Gruppe=$_POST['Dienst-Gruppe'];
|
||||
$HelferLevel=$_POST['HelferLevel'];
|
||||
NewDienst($db_link,$DienstID,$Was,$Wo,$Info,$Leiter,$Gruppe,$HelferLevel);
|
||||
|
||||
}
|
||||
if (isset($_POST['NewDienst'])) {
|
||||
$Was = $_POST['Dienst-Was'];
|
||||
$Wo = $_POST['Dienst-Wo'];
|
||||
$Info = $_POST['Dienst-Info'];
|
||||
$Leiter = $_POST['Dienst-Leiter'];
|
||||
$Gruppe = $_POST['Dienst-Gruppe'];
|
||||
$HelferLevel = $_POST['HelferLevel'];
|
||||
NewDienst($db_link, $DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel);
|
||||
}
|
||||
|
||||
|
||||
if(isset($_POST['DeleteDienst']))
|
||||
{
|
||||
|
||||
if (!DeleteDienst($db_link,$DienstID,false))
|
||||
{
|
||||
if (isset($_POST['DeleteDienst'])) {
|
||||
if (!DeleteDienst($db_link, $DienstID, false)) {
|
||||
echo "Erst Schichten des Dienstes Löschen!";
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(isset($_POST['ChangeSchicht'])) {
|
||||
if (isset($_POST['ChangeSchicht'])) {
|
||||
$Von = $_POST['Schicht-Von'];
|
||||
$Bis = $_POST['Schicht-Bis'];
|
||||
$Soll = $_POST['Schicht-Soll'];
|
||||
|
||||
$Von=$_POST['Schicht-Von'];
|
||||
$Bis=$_POST['Schicht-Bis'];
|
||||
$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'];
|
||||
$Bis = $_POST['Schicht-Bis'];
|
||||
$Soll = $_POST['Schicht-Soll'];
|
||||
|
||||
$Von=$_POST['Schicht-Von'];
|
||||
$Bis=$_POST['Schicht-Bis'];
|
||||
$Soll=$_POST['Schicht-Soll'];
|
||||
|
||||
NewSchicht($db_link,$DienstID,$Von,$Bis,$Soll);
|
||||
|
||||
}
|
||||
NewSchicht($db_link, $DienstID, $Von, $Bis, $Soll);
|
||||
}
|
||||
|
||||
|
||||
if(isset($_POST['DeleteSchicht'])) {
|
||||
|
||||
|
||||
if(!DeleteSchicht($db_link,$SchichtID,false))
|
||||
{
|
||||
if (isset($_POST['DeleteSchicht'])) {
|
||||
if (!DeleteSchicht($db_link, $SchichtID, false)) {
|
||||
echo "Erst Helfer aus Schicht austragen<br>";
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['ShowSchicht'])) {
|
||||
$SchichtID=$_POST['SchichtSearch'];
|
||||
}
|
||||
if(isset($_POST['SchichtSearch'])) {
|
||||
$SchichtID=$_POST['SchichtSearch'];
|
||||
}
|
||||
if (isset($_POST['ShowSchicht'])) {
|
||||
$SchichtID = $_POST['SchichtSearch'];
|
||||
}
|
||||
if (isset($_POST['SchichtSearch'])) {
|
||||
$SchichtID = $_POST['SchichtSearch'];
|
||||
}
|
||||
|
||||
if(isset($_POST['ShowSchichten'])) {
|
||||
$DienstID=$_POST['DienstSearch'];
|
||||
}
|
||||
if (isset($_POST['ShowSchichten'])) {
|
||||
$DienstID = $_POST['DienstSearch'];
|
||||
}
|
||||
|
||||
if(isset($_POST['DienstSearch'])) {
|
||||
$DienstID=$_POST['DienstSearch'];
|
||||
$SchichtID=0;
|
||||
}
|
||||
if (isset($_POST['DienstSearch'])) {
|
||||
$DienstID = $_POST['DienstSearch'];
|
||||
$SchichtID = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -150,30 +133,24 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
|
||||
$db_erg = GetDienste($db_link);
|
||||
|
||||
$Was="";
|
||||
$Wo="";
|
||||
$Info="";
|
||||
$Leiter="";
|
||||
$Gruppe="";
|
||||
$HelferLevel="";
|
||||
$Was = "";
|
||||
$Wo = "";
|
||||
$Info = "";
|
||||
$Leiter = "";
|
||||
$Gruppe = "";
|
||||
$HelferLevel = "";
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
if ($zeile['DienstID']!=$DienstID)
|
||||
{
|
||||
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
||||
$Was=$zeile['Was'];
|
||||
$Wo=$zeile['Wo'];
|
||||
$Info=$zeile['Info'];
|
||||
$Leiter=$zeile['Leiter'];
|
||||
$Gruppe=$zeile['ElternDienstID'];
|
||||
$HelferLevel=$zeile['HelferLevel'];
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($zeile['DienstID'] != $DienstID) {
|
||||
echo "<option value='" . $zeile['DienstID'] . "'>" . $zeile['Was'] . "</option>";
|
||||
} else {
|
||||
echo "<option value='" . $zeile['DienstID'] . "' selected='selected'>" . $zeile['Was'] . "</option>";
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Info = $zeile['Info'];
|
||||
$Leiter = $zeile['Leiter'];
|
||||
$Gruppe = $zeile['ElternDienstID'];
|
||||
$HelferLevel = $zeile['HelferLevel'];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -194,37 +171,31 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
<table border="0" id="customers">
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Was</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Dienst-Was" type="text" value="<?=htmlspecialchars($Was??'')?>">
|
||||
<input name="Dienst-Was" type="text" value="<?php echo htmlspecialchars($Was ?? '')?>">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Wo</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Dienst-Wo" type="text " value="<?=htmlspecialchars($Wo??'')?>">
|
||||
<input name="Dienst-Wo" type="text " value="<?php echo htmlspecialchars($Wo ?? '')?>">
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
<td style="border: 0px solid black;">Info</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Dienst-Info" type="text" value="<?=htmlspecialchars($Info??'')?>" >
|
||||
<input name="Dienst-Info" type="text" value="<?php echo htmlspecialchars($Info ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Leiter</td></tr><tr><td style="border: 0px solid black;">
|
||||
|
||||
<!-- <input name="Dienst-Leiter" type="text" value="<?=htmlspecialchars($Leiter??'')?>" > -->
|
||||
<!-- <input name="Dienst-Leiter" type="text" value="<?php echo htmlspecialchars($Leiter ?? '')?>" > -->
|
||||
<?php
|
||||
echo "<select name='Dienst-Leiter'>";
|
||||
$db_erg = HelferListe($db_link);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($zeile['HelferID']!=$Leiter)
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</option>";
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($zeile['HelferID'] != $Leiter) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</option>";
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</option>";
|
||||
}
|
||||
}
|
||||
echo "</select>";
|
||||
|
|
@ -237,19 +208,12 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
<?php
|
||||
//echo "#####".$Gruppe."#####";
|
||||
echo "<select name='Dienst-Gruppe'>";
|
||||
$db_erg = GetDiensteChilds($db_link,0);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
if ($zeile['DienstID']!=$Gruppe)
|
||||
{
|
||||
echo "<option value='".$zeile['DienstID']."'>".$zeile['Was']."</option>";
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['DienstID']."' selected='selected'>".$zeile['Was']."</option>";
|
||||
|
||||
$db_erg = GetDiensteChilds($db_link, 0);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($zeile['DienstID'] != $Gruppe) {
|
||||
echo "<option value='" . $zeile['DienstID'] . "'>" . $zeile['Was'] . "</option>";
|
||||
} else {
|
||||
echo "<option value='" . $zeile['DienstID'] . "' selected='selected'>" . $zeile['Was'] . "</option>";
|
||||
}
|
||||
}
|
||||
echo "</select>";
|
||||
|
|
@ -260,8 +224,12 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
<tr><td style="border: 0px solid black;">HelferLevel</td></tr>
|
||||
<tr><td style="border: 0px solid black;">
|
||||
<select name="HelferLevel">
|
||||
<option value="1" <?php if($HelferLevel==1){echo "selected";};?> >Dauerhelfer</option>
|
||||
<option value="2" <?php if($HelferLevel==2){echo "selected";};?> >Teilnehmer</option>
|
||||
<option value="1" <?php if ($HelferLevel == 1) {
|
||||
echo "selected";
|
||||
};?> >Dauerhelfer</option>
|
||||
<option value="2" <?php if ($HelferLevel == 2) {
|
||||
echo "selected";
|
||||
};?> >Teilnehmer</option>
|
||||
<?php //todo: Name aus HelferLevel-Tabelle erhalten?>
|
||||
</select>
|
||||
</td></tr>
|
||||
|
|
@ -282,25 +250,20 @@ echo "<p><noscript><button name='ShowSchichten' value='1'>Schichten Anzeigen</bu
|
|||
<?php
|
||||
|
||||
|
||||
$Soll=1;
|
||||
$db_erg = GetSchichtenEinesDienstes($db_link,$DienstID);
|
||||
$Soll = 1;
|
||||
$db_erg = GetSchichtenEinesDienstes($db_link, $DienstID);
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
if ($SchichtID == 0)
|
||||
{
|
||||
$SchichtID=$zeile['SchichtID'];
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($SchichtID == 0) {
|
||||
$SchichtID = $zeile['SchichtID'];
|
||||
}
|
||||
if ($zeile['SchichtID']!=$SchichtID)
|
||||
{
|
||||
echo "<option value='".$zeile['SchichtID']."'>".$zeile['TagVon']."</option>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['SchichtID']."' selected='selected'>".$zeile['TagVon']."</option>";
|
||||
$Von=$zeile['Von'];
|
||||
$Bis=$zeile['Bis'];
|
||||
$Soll=(int)$zeile['Soll'];
|
||||
if ($zeile['SchichtID'] != $SchichtID) {
|
||||
echo "<option value='" . $zeile['SchichtID'] . "'>" . $zeile['TagVon'] . "</option>";
|
||||
} else {
|
||||
echo "<option value='" . $zeile['SchichtID'] . "' selected='selected'>" . $zeile['TagVon'] . "</option>";
|
||||
$Von = $zeile['Von'];
|
||||
$Bis = $zeile['Bis'];
|
||||
$Soll = (int)$zeile['Soll'];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -317,17 +280,17 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
|
|||
<table border="0" id='customers'">
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Von</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Schicht-Von" type="datetime-local" value="<?=htmlspecialchars($Von??'')?>" required>
|
||||
<input name="Schicht-Von" type="datetime-local" value="<?php echo htmlspecialchars($Von ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</tr>
|
||||
<td style="border: 0px solid black;">Bis</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Schicht-Bis" type="datetime-local" value="<?=htmlspecialchars($Bis??'')?>" required>
|
||||
<input name="Schicht-Bis" type="datetime-local" value="<?php echo htmlspecialchars($Bis ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</tr>
|
||||
<td style="border: 0px solid black;">Soll</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="Schicht-Soll" type="number" min=1 value="<?=htmlspecialchars((int)$Soll??'')?>" required>
|
||||
<input name="Schicht-Soll" type="number" min=1 value="<?php echo htmlspecialchars((int)$Soll ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</tr>
|
||||
|
|
@ -344,7 +307,7 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
|
|||
<?php
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
$_SESSION["DienstID"] = $DienstID;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
include '_login.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
require '_login.php';
|
||||
// das hier muss nicht unbedingt eine Adminseite sein
|
||||
if($AdminStatus != 1) {
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
|
|
@ -43,21 +43,21 @@ $AdminID = $_SESSION["AdminID"];
|
|||
$_SESSION["HelferID"] = $HelferID;
|
||||
|
||||
|
||||
if(isset($_POST['ShowSchicht'])) {
|
||||
$SchichtID=$_POST['SchichtSearch'];
|
||||
}
|
||||
if(isset($_POST['SchichtSearch'])) {
|
||||
$SchichtID=$_POST['SchichtSearch'];
|
||||
}
|
||||
if (isset($_POST['ShowSchicht'])) {
|
||||
$SchichtID = $_POST['SchichtSearch'];
|
||||
}
|
||||
if (isset($_POST['SchichtSearch'])) {
|
||||
$SchichtID = $_POST['SchichtSearch'];
|
||||
}
|
||||
|
||||
if(isset($_POST['ShowSchichten'])) {
|
||||
$DienstID=$_POST['DienstSearch'];
|
||||
}
|
||||
if (isset($_POST['ShowSchichten'])) {
|
||||
$DienstID = $_POST['DienstSearch'];
|
||||
}
|
||||
|
||||
if(isset($_POST['DienstSearch'])) {
|
||||
$DienstID=$_POST['DienstSearch'];
|
||||
$SchichtID=0;
|
||||
}
|
||||
if (isset($_POST['DienstSearch'])) {
|
||||
$DienstID = $_POST['DienstSearch'];
|
||||
$SchichtID = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -74,41 +74,38 @@ echo "<br><br><table class='commontable' style='page-break-before:always'>";
|
|||
<table class="commontable">
|
||||
<?php
|
||||
$db_erg = AlleHelferSchichtenUebersicht($db_link);
|
||||
$dauer=0;
|
||||
$i=0;
|
||||
$OldHelferName="";
|
||||
$EinzelDienstStunden="";
|
||||
$HelferUeberschrift="";
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$dauer = 0;
|
||||
$i = 0;
|
||||
$OldHelferName = "";
|
||||
$EinzelDienstStunden = "";
|
||||
$HelferUeberschrift = "";
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile["Name"];
|
||||
$AliasHelferID = $zeile["AliasHelferID"];
|
||||
//echo $HelferName." ".$AliasHelferID."<br>";
|
||||
if($HelferName!= $OldHelferName)
|
||||
{
|
||||
if ($EinzelDienstStunden !=""){
|
||||
if ($HelferName != $OldHelferName) {
|
||||
if ($EinzelDienstStunden != "") {
|
||||
// Neue Ueberschrift mit Helfernamen + Stunden
|
||||
echo "$HelferUeberschrift </th><th> <img style='width:30px;height:30px;' src='Bilder/PfeilRunter.jpeg'> $dauer Stunden</th>";
|
||||
echo "<th ><div style='display:table'><form style='display:table-cell' action='AdminAlleSchichten.php' method='post'>";
|
||||
echo "<button width='120px' name='AliasHelfer' value='". $OldAliasHelferID ."'>+</button></form>\n";
|
||||
echo "<button width='120px' name='AliasHelfer' value='" . $OldAliasHelferID . "'>+</button></form>\n";
|
||||
echo " ";
|
||||
echo "<form style='display:table-cell' action='AdminMeineSchichten.php' method='post'>";
|
||||
echo "<button width='120px' name='AliasHelfer' value='". $OldAliasHelferID ."'>–</button></form>";
|
||||
echo "<button width='120px' name='AliasHelfer' value='" . $OldAliasHelferID . "'>–</button></form>";
|
||||
echo "</div></th>";
|
||||
$dauer=0;
|
||||
$dauer = 0;
|
||||
echo "$EinzelDienstStunden</td></tr>\n ";
|
||||
}
|
||||
$EinzelDienstStunden="";
|
||||
$HelferUeberschrift="<tr class='header'><th width='15%'>".$HelferName;
|
||||
$OldHelferName=$HelferName;
|
||||
$OldAliasHelferID=$AliasHelferID;
|
||||
$i+=1;
|
||||
$EinzelDienstStunden = "";
|
||||
$HelferUeberschrift = "<tr class='header'><th width='15%'>" . $HelferName;
|
||||
$OldHelferName = $HelferName;
|
||||
$OldAliasHelferID = $AliasHelferID;
|
||||
$i += 1;
|
||||
}
|
||||
$EinzelDienstStunden.="<tr><td style='width:100px'> ".(int)$zeile["Dauer"]."</td><td>";
|
||||
$EinzelDienstStunden.= $zeile["Was"];
|
||||
$EinzelDienstStunden.= "</td></tr>";
|
||||
$dauer=$dauer+(int)$zeile["Dauer"];
|
||||
|
||||
$EinzelDienstStunden .= "<tr><td style='width:100px'> " . (int)$zeile["Dauer"] . "</td><td>";
|
||||
$EinzelDienstStunden .= $zeile["Was"];
|
||||
$EinzelDienstStunden .= "</td></tr>";
|
||||
$dauer = $dauer + (int)$zeile["Dauer"];
|
||||
}
|
||||
echo "$EinzelDienstStunden";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
include '_login.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
require '_login.php';
|
||||
|
||||
if($AdminStatus != 1) {
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
|
|
@ -29,18 +29,33 @@ if($AdminStatus != 1) {
|
|||
|
||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['CloseInfo']))
|
||||
{
|
||||
UNSET($InfoMeineSchichtID);
|
||||
UNSET($InfoAlleSchichtID);
|
||||
if (isset($_POST['CloseInfo'])) {
|
||||
unset($InfoMeineSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
}
|
||||
if(isset($_POST['InfoMeineSchichtID']))
|
||||
{
|
||||
if (isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
}
|
||||
|
||||
|
||||
if (isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
|
|
@ -50,90 +65,63 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer=$zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
||||
$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'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x]= $zeile['Handy'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function HelferAuswahlButton($db_link,$AliasHelferID){
|
||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
||||
$db_erg = HelferListe($db_link);
|
||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
||||
$db_erg = HelferListe($db_link);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($AliasHelferID != $zeile['HelferID']) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</optionen>";
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
}
|
||||
echo '</select></form>';
|
||||
echo '</select></form>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['AliasHelfer'])) {
|
||||
$AliasHelferID=$_POST['AliasHelfer'];
|
||||
if (isset($_POST['AliasHelfer'])) {
|
||||
$AliasHelferID = $_POST['AliasHelfer'];
|
||||
echo "AliasHelfer: $AliasHelferID<br>";
|
||||
}elseif(isset($_SESSION["AliasHelferID"])){
|
||||
} elseif (isset($_SESSION["AliasHelferID"])) {
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
}else{
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
exit;
|
||||
} else {
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
exit;
|
||||
}
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
|
||||
|
||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
||||
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
$db_erg=Helferdaten($db_link,$AliasHelferID);
|
||||
$db_erg = Helferdaten($db_link, $AliasHelferID);
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$HelferName=$zeile['Name'];
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
}
|
||||
|
||||
/// Schicht Löschen
|
||||
////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['Del'])) {
|
||||
|
||||
if (isset($_POST['Del'])) {
|
||||
$messages = [];
|
||||
|
||||
$EinzelSchichtID = $_POST['Del'];
|
||||
|
|
@ -147,19 +135,16 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
|
||||
|
||||
|
||||
if(empty($messages)) {
|
||||
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link,$AliasHelferID,$EinzelSchichtID,$HelferID);
|
||||
|
||||
if (empty($messages)) {
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link, $AliasHelferID, $EinzelSchichtID, $HelferID);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -178,8 +163,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
|
||||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if(isset($_POST['sent'])) {
|
||||
|
||||
if (isset($_POST['sent'])) {
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['sent'];
|
||||
|
||||
|
|
@ -190,29 +174,23 @@ if(isset($_POST['sent'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// 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
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -224,10 +202,9 @@ 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";
|
||||
die('Ungültige Abfrage: ' . mysqli_error());
|
||||
}
|
||||
|
|
@ -239,28 +216,25 @@ echo '<table id="customers">';
|
|||
|
||||
echo "<thead>";
|
||||
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 "<th></th>";
|
||||
echo "<th style='width:180px'>". "Von" . "</th>";
|
||||
echo "<th style='width:180px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Del" . "</th>";
|
||||
echo "<th style='width:180px'>" . "Von" . "</th>";
|
||||
echo "<th style='width:180px'>" . "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>" . "Del" . "</th>";
|
||||
echo "</tr>";
|
||||
echo "</thead>";
|
||||
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
//echo '<tr title="Details anzeigen" onclick="parent.DetailsSchichten.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
echo '<tr title="Details anzeigen" onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
echo "<td>". $zeile['Was'] . "</td>";
|
||||
echo "<td>". $zeile['Ab'] . "</td>";
|
||||
echo "<td>". $zeile['Bis'] . "</td>";
|
||||
echo "<td>". "<p><button title='Schicht entfernen' name='Del' value='". $zeile['EinzelSchichtID'] ."'>-</button></p>" . "</td>";
|
||||
echo '<tr title="Details anzeigen" onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID=' . $zeile['SchichtID'] . '#Info\';" >';
|
||||
echo "<td>" . $zeile['Was'] . "</td>";
|
||||
echo "<td>" . $zeile['Ab'] . "</td>";
|
||||
echo "<td>" . $zeile['Bis'] . "</td>";
|
||||
echo "<td>" . "<p><button title='Schicht entfernen' name='Del' value='" . $zeile['EinzelSchichtID'] . "'>-</button></p>" . "</td>";
|
||||
echo "</tr>";
|
||||
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
|
|
@ -271,12 +245,12 @@ $iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
|||
|
||||
echo '<table id="customers" onclick="window.location.href=\'AdminAlleSchichten.php\'">';
|
||||
echo "<tr>";
|
||||
echo "<th>". "Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
||||
echo "<th>" . "Alle Schichten der Con (" . $iBelegteSchichtenCount . "/" . $iAlleSchichtenCount . ")</th>";
|
||||
echo "</tr>";
|
||||
echo "</table>";
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,48 +1,42 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
include '_login.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
require '_login.php';
|
||||
|
||||
if($AdminStatus != 1) {
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
function HelferAuswahlButton($db_link,$AliasHelferID){
|
||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
||||
$db_erg = HelferListe($db_link);
|
||||
while($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
function HelferAuswahlButton($db_link, $AliasHelferID)
|
||||
{
|
||||
if ($AliasHelferID!=$zeile['HelferID'])
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."'>".$zeile['Name']."</optionen>";
|
||||
echo '<b>Helfer wählen:<b> <form style="display:inline-block;" method=post><select style="height:33px;width:350px;" name="AliasHelfer" id="AliasHelfer" onchange="submit()">';
|
||||
$db_erg = HelferListe($db_link);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($AliasHelferID != $zeile['HelferID']) {
|
||||
echo "<option value='" . $zeile['HelferID'] . "'>" . $zeile['Name'] . "</optionen>";
|
||||
} else {
|
||||
echo "<option value='" . $zeile['HelferID'] . "' selected='selected'>" . $zeile['Name'] . "</optionen>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<option value='".$zeile['HelferID']."' selected='selected'>".$zeile['Name']."</optionen>";
|
||||
}
|
||||
}
|
||||
echo '</select></form>';
|
||||
echo '</select></form>';
|
||||
}
|
||||
|
||||
if(isset($_POST['AliasHelfer'])) {
|
||||
$AliasHelferID=$_POST['AliasHelfer'];
|
||||
}elseif(isset($_SESSION["AliasHelferID"])){
|
||||
if (isset($_POST['AliasHelfer'])) {
|
||||
$AliasHelferID = $_POST['AliasHelfer'];
|
||||
} elseif (isset($_SESSION["AliasHelferID"])) {
|
||||
$AliasHelferID = $_SESSION["AliasHelferID"];
|
||||
}else{
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
} else {
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
exit;
|
||||
}
|
||||
HelferAuswahlButton($db_link,$AliasHelferID);
|
||||
HelferAuswahlButton($db_link, $AliasHelferID);
|
||||
|
||||
$_SESSION["AliasHelferID"]=$AliasHelferID;
|
||||
$_SESSION["AliasHelferID"] = $AliasHelferID;
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
echo "Admin=$AdminID<br>";
|
||||
|
|
@ -68,15 +62,14 @@ echo "Alias=$AliasHelferID<br>";
|
|||
/// Helferdaten Aendern
|
||||
////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['change'])) {
|
||||
if (isset($_POST['change'])) {
|
||||
$messages = [];
|
||||
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
|
||||
if(strlen($_POST['helfer-newpasswort'])<8 and $_POST['helfer-newpasswort']!="")
|
||||
{
|
||||
if (strlen($_POST['helfer-newpasswort']) < 8 and $_POST['helfer-newpasswort'] != "") {
|
||||
$messages[] = 'Neues Passwort zu kurz';
|
||||
}
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -86,53 +79,46 @@ if(isset($_POST['change'])) {
|
|||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
||||
if ($_POST['IsAdmin'])
|
||||
{
|
||||
$HelferIsAdmin=1;
|
||||
if ($_POST['IsAdmin']) {
|
||||
$HelferIsAdmin = 1;
|
||||
//echo "is Admin<br>";
|
||||
} else {
|
||||
$HelferIsAdmin = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
$HelferIsAdmin=0;
|
||||
}
|
||||
if(empty($messages)) {
|
||||
if (empty($messages)) {
|
||||
// Helferdaten Ändern
|
||||
HelferdatenAendern($db_link,$HelferName,$HelferEmail,$HelferHandy,$HelferNewPasswort,$AliasHelferID,$HelferIsAdmin,$HelferID);
|
||||
|
||||
HelferdatenAendern($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $AliasHelferID, $HelferIsAdmin, $HelferID);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////
|
||||
// Helfer Loeschen
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['del']))
|
||||
{
|
||||
HelferLoeschen($db_link,$AliasHelferID,$AdminID);
|
||||
if (isset($_POST['del'])) {
|
||||
HelferLoeschen($db_link, $AliasHelferID, $AdminID);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
// Helferdate holen
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
$db_erg = Helferdaten($db_link,$AliasHelferID);
|
||||
$db_erg = Helferdaten($db_link, $AliasHelferID);
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferEmail = $zeile['Email'];
|
||||
$HelferHandy = $zeile['Handy'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -147,27 +133,27 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
<form method="post">
|
||||
<tr>
|
||||
<td>Name</td></tr><tr><td>
|
||||
<input name="helfer-name" type="text" value="<?=htmlspecialchars($HelferName??'')?>" required>
|
||||
<input name="helfer-name" type="text" value="<?php echo htmlspecialchars($HelferName ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Email</td></tr><tr><td>
|
||||
<input name="helfer-email" type="email " value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="email " value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Handy</td></tr><tr><td>
|
||||
<input name="helfer-handy" type="tel" value="<?=htmlspecialchars($HelferHandy??'')?>" >
|
||||
<input name="helfer-handy" type="tel" value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Admin Passwort</td></tr><tr><td>
|
||||
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferPasswort??'')?>" >
|
||||
<input name="helfer-passwort" type="password" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Neues Helfer Passwort</td></tr><tr><td>
|
||||
<input name="helfer-newpasswort" type="text" value="<?=htmlspecialchars($HelferPasswort??'')?>" >
|
||||
<input name="helfer-newpasswort" type="text" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
@ -176,7 +162,9 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
<table id="customers">
|
||||
<col style="width:20px">
|
||||
<tr>
|
||||
<td><input type="checkbox" name="IsAdmin" value=1 align="right" <?php if($HelferIsAdmin==1){echo" checked";}?>></td>
|
||||
<td><input type="checkbox" name="IsAdmin" value=1 align="right" <?php if ($HelferIsAdmin == 1) {
|
||||
echo" checked";
|
||||
}?>></td>
|
||||
<td>ist Admin</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -22,33 +22,48 @@
|
|||
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
include '_login.php';
|
||||
);
|
||||
require '_login.php';
|
||||
|
||||
|
||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['CloseInfo']))
|
||||
{
|
||||
UNSET($InfoMeineSchichtID);
|
||||
UNSET($InfoAlleSchichtID);
|
||||
if (isset($_POST['CloseInfo'])) {
|
||||
unset($InfoMeineSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
}
|
||||
if(isset($_POST['InfoMeineSchichtID']))
|
||||
{
|
||||
if (isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
}
|
||||
|
||||
|
||||
if (isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
|
|
@ -58,50 +73,25 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer=$zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
||||
$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'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x]= $zeile['Handy'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(isset($_GET['ZeitBereich']))
|
||||
{
|
||||
if (isset($_GET['ZeitBereich'])) {
|
||||
$ZeitBereich = $_GET['ZeitBereich'];
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$ZeitBereich = 1;
|
||||
}
|
||||
|
||||
|
|
@ -120,8 +110,7 @@ else
|
|||
|
||||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if(isset($_POST['plusschicht'])) {
|
||||
|
||||
if (isset($_POST['plusschicht'])) {
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['plusschicht'];
|
||||
|
||||
|
|
@ -132,56 +121,42 @@ if(isset($_POST['plusschicht'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// 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
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(isset($_POST['minusschicht'])) {
|
||||
// Mich aus Schicht entfernen
|
||||
if (isset($_POST['minusschicht'])) {
|
||||
// Mich aus Schicht entfernen
|
||||
$messages = [];
|
||||
|
||||
$SchichtID = $_POST['minusschicht'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// Helfer aus Schicht entfernen
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link,$HelferID,$SchichtID);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $HelferID, $SchichtID);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -191,45 +166,41 @@ if(isset($_POST['minusschicht'])) {
|
|||
|
||||
|
||||
// Zusammenfassung Eigener Schichten
|
||||
$db_erg = SchichtenSummeEinesHelfers($db_link,$HelferID);
|
||||
$zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC);
|
||||
$db_erg = SchichtenSummeEinesHelfers($db_link, $HelferID);
|
||||
$zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC);
|
||||
|
||||
echo '<table class="commontable"><tr class="header"><th onclick="window.location.href=\'MeineSchichten.php\'">';
|
||||
echo '<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">'. " Mein Dienstplan (";
|
||||
echo '<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">' . " Mein Dienstplan (";
|
||||
echo $zeile['Anzahl'];
|
||||
echo " Schichten, ";
|
||||
echo $zeile['Dauer']/3600;
|
||||
echo $zeile['Dauer'] / 3600;
|
||||
echo " Stunden)";
|
||||
echo '</th></tr></table><br><br>';
|
||||
/// Schichten Auswahl
|
||||
////////////////////////////////////////////////////////
|
||||
$addschicht =$_SESSION["addschicht"];
|
||||
$dienstsort =$_SESSION["dienstsort"];
|
||||
$addschicht = $_SESSION["addschicht"];
|
||||
$dienstsort = $_SESSION["dienstsort"];
|
||||
|
||||
|
||||
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='1')
|
||||
{
|
||||
$addschicht='1';
|
||||
$dienstsort='1';
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '1') {
|
||||
$addschicht = '1';
|
||||
$dienstsort = '1';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='2')
|
||||
{
|
||||
$addschicht='2';
|
||||
$dienstsort='2';
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '2') {
|
||||
$addschicht = '2';
|
||||
$dienstsort = '2';
|
||||
}
|
||||
if(isset($_POST['addschicht']) && $_POST['addschicht']=='0')
|
||||
{
|
||||
$addschicht='0';
|
||||
if (isset($_POST['addschicht']) && $_POST['addschicht'] == '0') {
|
||||
$addschicht = '0';
|
||||
}
|
||||
|
||||
$_SESSION["addschicht"] =$addschicht;
|
||||
$_SESSION["dienstsort"] =$dienstsort;
|
||||
$_SESSION["addschicht"] = $addschicht;
|
||||
$_SESSION["dienstsort"] = $dienstsort;
|
||||
|
||||
//echo "<br>Detail=".$addschicht."<br>";
|
||||
|
||||
if($addschicht=='0')
|
||||
{
|
||||
if ($addschicht == '0') {
|
||||
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
||||
echo "<button name='addschicht' value='1'>Tage</button>";
|
||||
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
||||
|
|
@ -237,37 +208,29 @@ if($addschicht=='0')
|
|||
|
||||
//echo "InfoAlleSchichtID ".$InfoAlleSchichtID;
|
||||
|
||||
if($addschicht!='0')
|
||||
{
|
||||
if ($addschicht != '0') {
|
||||
//$db_erg = AlleSchichten($db_link,$dienstsort);
|
||||
//$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",$HelferLevel);
|
||||
if ($ZeitBereich==1) // Alle
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2200-05-19 00:00:00",$HelferLevel);
|
||||
if ($ZeitBereich == 1) { // Alle
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2200-05-19 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==2) // Davor
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2000-05-18 00:00:00","2023-05-18 00:00:00",$HelferLevel);
|
||||
if ($ZeitBereich == 2) { // Davor
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2000-05-18 00:00:00", "2023-05-18 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==3) // Do
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-18 00:00:00","2023-05-19 00:00:00",$HelferLevel);
|
||||
if ($ZeitBereich == 3) { // Do
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-18 00:00:00", "2023-05-19 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==4) // Fr
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-19 00:00:00","2023-05-20 00:00:00",$HelferLevel);
|
||||
if ($ZeitBereich == 4) { // Fr
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-19 00:00:00", "2023-05-20 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==5) // Sa
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-20 00:00:00","2023-05-21 00:00:00",$HelferLevel);
|
||||
if ($ZeitBereich == 5) { // Sa
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-20 00:00:00", "2023-05-21 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==6) // So
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-21 00:00:00","2023-05-22 00:00:00",$HelferLevel);
|
||||
if ($ZeitBereich == 6) { // So
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-21 00:00:00", "2023-05-22 00:00:00", $HelferLevel);
|
||||
}
|
||||
if ($ZeitBereich==7) // Danach
|
||||
{
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link,"2023-05-22 00:00:00","2223-05-22 00:00:00",$HelferLevel);
|
||||
if ($ZeitBereich == 7) { // Danach
|
||||
$db_erg = AlleSchichtenImZeitbereich($db_link, "2023-05-22 00:00:00", "2223-05-22 00:00:00", $HelferLevel);
|
||||
}
|
||||
// fuer Anzahlanzeige in Ueberschrift
|
||||
$iAlleSchichtenCount = AlleSchichtenCount($db_link);
|
||||
|
|
@ -277,7 +240,7 @@ if($addschicht!='0')
|
|||
//echo "<p><button name='addschicht' value='0'><b>↩</b></button></p>";
|
||||
echo '<table id="customers">';
|
||||
echo "<tr class='header'>";
|
||||
echo "<th colspan='7'>". "Alle Schichten der Con (" . $iBelegteSchichtenCount."/".$iAlleSchichtenCount. ")</th></tr>";
|
||||
echo "<th colspan='7'>" . "Alle Schichten der Con (" . $iBelegteSchichtenCount . "/" . $iAlleSchichtenCount . ")</th></tr>";
|
||||
|
||||
/*
|
||||
if ($dienstsort=='1')
|
||||
|
|
@ -290,95 +253,66 @@ if($addschicht!='0')
|
|||
}
|
||||
*/
|
||||
echo "<tr class='header'>"; // Zeitbereich tr
|
||||
if ($ZeitBereich==1)
|
||||
{
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>". "Alle" . "</th>";
|
||||
if ($ZeitBereich == 1) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>" . "Alle" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>" . "Alle" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=1\"'>". "Alle" . "</th>";
|
||||
if ($ZeitBereich == 2) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>" . "Davor" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>" . "Davor" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==2)
|
||||
{
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>". "Davor" . "</th>";
|
||||
if ($ZeitBereich == 3) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>" . "Do" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>" . "Do" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=2\"'>". "Davor" . "</th>";
|
||||
if ($ZeitBereich == 4) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>" . "Fr" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>" . "Fr" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==3)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>". "Do" . "</th>";
|
||||
if ($ZeitBereich == 5) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>" . "Sa" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>" . "Sa" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=3\"'>". "Do" . "</th>";
|
||||
if ($ZeitBereich == 6) {
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>" . "So" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>" . "So" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==4)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>". "Fr" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=4\"'>". "Fr" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==5)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>". "Sa" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=5\"'>". "Sa" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==6)
|
||||
{
|
||||
echo "<th style='width:50px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:50px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=6\"'>". "So" . "</th>";
|
||||
}
|
||||
if ($ZeitBereich==7)
|
||||
{
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>". "Danach" . "</th>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>". "Danach" . "</th>";
|
||||
if ($ZeitBereich == 7) {
|
||||
echo "<th style='width:100px; background-color:#0000FF' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>" . "Danach" . "</th>";
|
||||
} else {
|
||||
echo "<th style='width:100px' onclick='window.location.href=\"AlleSchichten.php?ZeitBereich=7\"'>" . "Danach" . "</th>";
|
||||
}
|
||||
|
||||
echo "</tr>"; //Zeitbereich tr
|
||||
|
||||
$OldTag = "";
|
||||
$OldWas = "";
|
||||
# um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link,$HelferID);
|
||||
// um Zeilen mit von mir belegten Schichten hervorzuheben
|
||||
$MeineDienste = SchichtIdArrayEinesHelfers($db_link, $HelferID);
|
||||
//print_r($MeineDienste);
|
||||
|
||||
echo '</table>';
|
||||
echo '<table id="customers">';
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
|
||||
if ($dienstsort=='1')
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
if ($dienstsort == '1') {
|
||||
$Tag = $zeile['Tag'];
|
||||
|
||||
if ($Tag!=$OldTag)
|
||||
{
|
||||
if ($Tag != $OldTag) {
|
||||
echo "<tr class='header'><th colspan='5' >";
|
||||
echo $Tag;
|
||||
echo "</th></tr>";
|
||||
$OldTag = $Tag;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$Was = $zeile['Was'];
|
||||
|
||||
if ($Was!=$OldWas)
|
||||
{
|
||||
if ($Was != $OldWas) {
|
||||
echo "<tr class='header'><th colspan='7' style='width:100%'>";
|
||||
echo $Was;
|
||||
echo "</th>";
|
||||
|
|
@ -392,57 +326,48 @@ if($addschicht!='0')
|
|||
$OldWas = $Was;
|
||||
}
|
||||
}
|
||||
$Color="red";
|
||||
if ( $zeile['Ist'] > 0 )
|
||||
{
|
||||
$Color="yellow";
|
||||
$Color = "red";
|
||||
if ($zeile['Ist'] > 0) {
|
||||
$Color = "yellow";
|
||||
}
|
||||
if ( $zeile['Ist'] >= $zeile['Soll'] )
|
||||
{
|
||||
$Color="green";
|
||||
if ($zeile['Ist'] >= $zeile['Soll']) {
|
||||
$Color = "green";
|
||||
}
|
||||
$Von = $zeile['Ab'];
|
||||
$Bis = $zeile['Bis'];
|
||||
if ( substr($Von,0,2) == substr($Bis,0,2))
|
||||
{
|
||||
$Bis = substr($Bis,2);
|
||||
if (substr($Von, 0, 2) == substr($Bis, 0, 2)) {
|
||||
$Bis = substr($Bis, 2);
|
||||
}
|
||||
$Von = substr($Von,2);
|
||||
$Von = substr($Von, 2);
|
||||
|
||||
// Meine Schichten gruen einfaerben
|
||||
if(in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||
if (in_array($zeile['SchichtID'], $MeineDienste)) {
|
||||
$rowstyle = ' style="background-color:lightgreen" ';
|
||||
$regtext = 'Meine!';
|
||||
} else {
|
||||
// dummy-style, um SchichtID unsichtbar im Tag anzuzeigen
|
||||
$rowstyle = 'dbinfo="SchichtID:'.$zeile['SchichtID'].';helferlvl:'.$HelferLevel.'" ';
|
||||
$rowstyle = 'dbinfo="SchichtID:' . $zeile['SchichtID'] . ';helferlvl:' . $HelferLevel . '" ';
|
||||
$regtext = '';
|
||||
}
|
||||
|
||||
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')
|
||||
{
|
||||
echo "<td>". $zeile['Was'] . "</td>";
|
||||
if ($dienstsort == '1') {
|
||||
echo "<td>" . $zeile['Was'] . "</td>";
|
||||
} else {
|
||||
echo "<td>" . $zeile['Tag'] . "</td>";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<td>". $zeile['Tag'] . "</td>";
|
||||
}
|
||||
echo "<td>". $Von . "</td>";
|
||||
echo "<td>". $Bis . "</td>";
|
||||
echo "<td bgcolor='".$Color."'>". $zeile['Ist'] . "/";
|
||||
echo "". $zeile['Soll'] . "</td>";
|
||||
# buttons sind in der selben Zelle
|
||||
echo "<td width='30px'>" . "<button width='20px' name='plusschicht' value='". $zeile['SchichtID'] ."'>+</button>" ."";
|
||||
echo "" . " <button width='120px' name='minusschicht' value='". $zeile['SchichtID'] ."'>–</button> $regtext" ."</td>";
|
||||
echo "<td>" . $Von . "</td>";
|
||||
echo "<td>" . $Bis . "</td>";
|
||||
echo "<td bgcolor='" . $Color . "'>" . $zeile['Ist'] . "/";
|
||||
echo "" . $zeile['Soll'] . "</td>";
|
||||
// buttons sind in der selben Zelle
|
||||
echo "<td width='30px'>" . "<button width='20px' name='plusschicht' value='" . $zeile['SchichtID'] . "'>+</button>" . "";
|
||||
echo "" . " <button width='120px' name='minusschicht' value='" . $zeile['SchichtID'] . "'>–</button> $regtext" . "</td>";
|
||||
//echo "<td>$regtext</td>";
|
||||
echo "</tr>\n";
|
||||
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -451,7 +376,7 @@ if($addschicht!='0')
|
|||
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -18,18 +18,18 @@
|
|||
|
||||
SESSION_START();
|
||||
|
||||
require_once('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
);
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
|
||||
|
||||
?>
|
||||
|
|
@ -45,21 +45,18 @@ include '_login.php';
|
|||
|
||||
echo '<table id="customers" >';
|
||||
|
||||
$db_erg = GetDiensteChilds($db_link,0);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$db_erg = GetDiensteChilds($db_link, 0);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
echo "<tr><th>";
|
||||
echo $zeile["Was"];
|
||||
echo "</th></tr>";
|
||||
|
||||
$db_erg2 = GetDiensteChilds($db_link,$zeile["DienstID"]);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg2, MYSQLI_ASSOC))
|
||||
{
|
||||
$db_erg2 = GetDiensteChilds($db_link, $zeile["DienstID"]);
|
||||
while ($zeile = mysqli_fetch_array($db_erg2, MYSQLI_ASSOC)) {
|
||||
echo "<tr><td>";
|
||||
echo $zeile["Was"];
|
||||
echo "</td></tr>";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
echo "</table>";
|
||||
|
|
@ -67,30 +64,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'>";
|
||||
?>
|
||||
<tr>
|
||||
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>↩</b></button> <b>Übersicht Schichten der Dienste DAS 2023</b></th>
|
||||
</tr>
|
||||
<?php
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$Was = $zeile["Was"];
|
||||
|
||||
if($Was!= $OldWas)
|
||||
{
|
||||
if ($Was != $OldWas) {
|
||||
echo "</table>";
|
||||
//echo '<table id="customers" style="page-break-before:always">';
|
||||
echo '<table id="customers">';
|
||||
echo "<tr><th colspan=3>";
|
||||
echo $Was;
|
||||
echo "</th></tr>";
|
||||
$OldWas=$Was;
|
||||
|
||||
|
||||
$OldWas = $Was;
|
||||
}
|
||||
|
||||
echo "<tr><td style='width:100px'>";
|
||||
|
|
@ -99,23 +92,19 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
echo $zeile["Bis"];
|
||||
echo "</td><td>";
|
||||
|
||||
$db_erg2 = BeteiligteHelfer($db_link,$zeile["SchichtID"]);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg2, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
$db_erg2 = BeteiligteHelfer($db_link, $zeile["SchichtID"]);
|
||||
while ($zeile = mysqli_fetch_array($db_erg2, MYSQLI_ASSOC)) {
|
||||
echo $zeile["Name"];
|
||||
echo " ";
|
||||
echo $zeile["Handy"];
|
||||
echo ",";
|
||||
}
|
||||
echo "</td></tr>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
echo "</table>";
|
||||
|
||||
$OldHelferName="";
|
||||
$OldHelferName = "";
|
||||
|
||||
echo "<br><br><table id='customers' style='page-break-before:always'>";
|
||||
?>
|
||||
|
|
@ -124,21 +113,17 @@ echo "<br><br><table id='customers' style='page-break-before:always'>";
|
|||
</tr>
|
||||
<?php
|
||||
$db_erg = AlleHelferSchichtenUebersicht($db_link);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile["Name"];
|
||||
|
||||
if($HelferName!= $OldHelferName)
|
||||
{
|
||||
if ($HelferName != $OldHelferName) {
|
||||
echo "</table>";
|
||||
//echo '<table id="customers" style="page-break-before:always">';
|
||||
echo '<table id="customers">';
|
||||
echo "<tr><th colspan=3>";
|
||||
echo $HelferName;
|
||||
echo "</th></tr>";
|
||||
$OldHelferName=$HelferName;
|
||||
|
||||
|
||||
$OldHelferName = $HelferName;
|
||||
}
|
||||
|
||||
echo "<tr><td style='width:100px'>";
|
||||
|
|
@ -146,8 +131,6 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
echo "</td><td>";
|
||||
echo $zeile["Was"];
|
||||
echo "</td></tr>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -159,7 +142,7 @@ echo "</table>";
|
|||
|
||||
<?php
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
?>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,26 +15,27 @@
|
|||
SESSION_START();
|
||||
//$HelferID = $_SESSION["HelferId"];
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
|
||||
if(isset($_POST['sent'])) {
|
||||
);
|
||||
|
||||
if (isset($_POST['sent'])) {
|
||||
$messages = [];
|
||||
|
||||
$HelferName = $_POST['helfer-name'];
|
||||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferLevel = $_POST['helfer-level'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];;
|
||||
$HelferPasswort2 = $_POST['helfer-passwort2'];;
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
;
|
||||
$HelferPasswort2 = $_POST['helfer-passwort2'];
|
||||
;
|
||||
|
||||
//echo $HelferName;
|
||||
//echo $HelferEmail;
|
||||
|
|
@ -46,7 +47,7 @@ if(isset($_POST['sent'])) {
|
|||
// $messages[] = 'Bitte prüfen Sie die eingegebenen Namen';
|
||||
//}
|
||||
|
||||
if(!filter_var($HelferEmail, FILTER_VALIDATE_EMAIL)) {
|
||||
if (!filter_var($HelferEmail, FILTER_VALIDATE_EMAIL)) {
|
||||
$messages[] = 'Bitte prüfen Sie die eingegebene E-Mail-Adresse.';
|
||||
}
|
||||
|
||||
|
|
@ -54,30 +55,26 @@ if(isset($_POST['sent'])) {
|
|||
// $messages[] = 'Bitte prüfen Sie die eingegebene Handynummer';
|
||||
//}
|
||||
|
||||
if($HelferPasswort!=$HelferPasswort2)
|
||||
{
|
||||
if ($HelferPasswort != $HelferPasswort2) {
|
||||
$messages[] = 'Passwörter stimmen nicht überein';
|
||||
$HelferPasswort ="";
|
||||
$HelferPasswort = "";
|
||||
$HelferPasswort2 = "";
|
||||
}
|
||||
if(strlen($HelferPasswort)<8)
|
||||
{
|
||||
if (strlen($HelferPasswort) < 8) {
|
||||
$messages[] = 'Passwörter zu kurz';
|
||||
$HelferPasswort ="";
|
||||
$HelferPasswort = "";
|
||||
$HelferPasswort2 = "";
|
||||
}
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
$db_erg = CreateHelfer($db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);
|
||||
if ( $db_erg )
|
||||
{
|
||||
if (empty($messages)) {
|
||||
$db_erg = CreateHelfer($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferPasswort, $HelferLevel);
|
||||
if ($db_erg) {
|
||||
//$insertID = mysql_insert_id();
|
||||
//echo "InserId = ".$insertID;
|
||||
|
||||
// Erfolg vermelden und Skript beenden, damit Formular nicht erneut ausgegeben wird
|
||||
echo "Helfer mit Emailadresse ".$HelferEmail." Angelegt.<br><br>";
|
||||
echo "Helfer mit Emailadresse " . $HelferEmail . " Angelegt.<br><br>";
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
|
|
@ -85,21 +82,17 @@ if(isset($_POST['sent'])) {
|
|||
$HelferPasswort2 = '';
|
||||
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "Helfer konnte nicht Angelegt werden, möglichweise exisistiert die Emailadresse ".$HelferEmail." bereits.<br><br>";
|
||||
} else {
|
||||
echo "Helfer konnte nicht Angelegt werden, möglichweise exisistiert die Emailadresse " . $HelferEmail . " bereits.<br><br>";
|
||||
}
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -116,30 +109,30 @@ if(isset($_POST['sent'])) {
|
|||
<td>Name</td>
|
||||
</tr>
|
||||
<tr><td>
|
||||
<input name="helfer-name" type="text" value="<?=htmlspecialchars($HelferName??'')?>" required>
|
||||
<input name="helfer-name" type="text" value="<?php echo htmlspecialchars($HelferName ?? '')?>" required>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td>Email</td>
|
||||
</tr>
|
||||
<tr><td>
|
||||
<input name="helfer-email" type="email " value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="email " value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td>Handy</td>
|
||||
</tr>
|
||||
<tr><td>
|
||||
<input name="helfer-handy" type="tel" value="<?=htmlspecialchars($HelferHandy??'')?>" >
|
||||
<input name="helfer-handy" type="tel" value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Passwort</td></tr>
|
||||
<tr><td>
|
||||
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferPasswort??'')?>" required>
|
||||
<input name="helfer-passwort" type="password" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr><td>Passwort wiederholen </td></tr>
|
||||
<tr><td>
|
||||
<input name="helfer-passwort2" type="password" value="<?=htmlspecialchars($HelferPasswort2??'')?>" required>
|
||||
<input name="helfer-passwort2" type="password" value="<?php echo htmlspecialchars($HelferPasswort2 ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr><td>Helferlevel </td></tr>
|
||||
|
|
@ -147,13 +140,15 @@ if(isset($_POST['sent'])) {
|
|||
<select name="helfer-level">
|
||||
<?php
|
||||
$db_erg = HelferLevel($db_link);
|
||||
$selected="";
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)) {
|
||||
$selected = "";
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferLevel = $zeile['HelferLevel'];
|
||||
$HelferLevelBeschreibung = $zeile['HelferLevelBeschreibung'];
|
||||
if($HelferLevel==1){ $selected = " selected " ;};
|
||||
if ($HelferLevel == 1) {
|
||||
$selected = " selected " ;
|
||||
};
|
||||
echo "<option value='$HelferLevel' $selected>$HelferLevelBeschreibung</option>";
|
||||
$selected="";
|
||||
$selected = "";
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
|
|
@ -171,7 +166,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)) {
|
|||
|
||||
<?php
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
?>
|
||||
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -4,42 +4,39 @@
|
|||
<body>
|
||||
|
||||
<?php
|
||||
require_once ('konfiguration.php');
|
||||
require_once 'konfiguration.php';
|
||||
|
||||
if(isset($_GET['token']) ) {
|
||||
if (isset($_GET['token'])) {
|
||||
// E-Mail-Adresse des Nutzers
|
||||
$encrypted_data = $_GET['token'];
|
||||
$encrypted_iv = $_GET['iv'];
|
||||
echo "token: $encrypted_data<br> \n";
|
||||
echo "iv: $encrypted_iv<br> \n";
|
||||
|
||||
// E-Mail-Adresse des Nutzers
|
||||
$encrypted_data = $_GET['token'];
|
||||
$encrypted_iv = $_GET['iv'];
|
||||
echo "token: $encrypted_data<br> \n";
|
||||
echo "iv: $encrypted_iv<br> \n";
|
||||
// Erstellen eines Cipher-Objekts für die Verschlüsselung
|
||||
$cipher_method = "AES-256-CBC";
|
||||
$iv_length = openssl_cipher_iv_length($cipher_method);
|
||||
$iv = base64_decode($encrypted_iv);
|
||||
$cipher_options = OPENSSL_RAW_DATA;
|
||||
$cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
||||
|
||||
// Erstellen eines Cipher-Objekts für die Verschlüsselung
|
||||
$cipher_method = "AES-256-CBC";
|
||||
$iv_length = openssl_cipher_iv_length($cipher_method);
|
||||
$iv = base64_decode($encrypted_iv);
|
||||
$cipher_options = OPENSSL_RAW_DATA;
|
||||
$cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
||||
// Entschlüsseln des verschlüsselten Textes
|
||||
$decoded_cipher_text = base64_decode($encrypted_data);
|
||||
$iv = base64_decode($encrypted_iv);
|
||||
$iv = substr($decoded_cipher_text, 0, $iv_length);
|
||||
$cipher_text = substr($decoded_cipher_text, $iv_length);
|
||||
$decrypted_email = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
|
||||
// Entschlüsseln des verschlüsselten Textes
|
||||
$decoded_cipher_text = base64_decode($encrypted_data);
|
||||
$iv = base64_decode($encrypted_iv);
|
||||
$iv = substr($decoded_cipher_text, 0, $iv_length);
|
||||
$cipher_text = substr($decoded_cipher_text, $iv_length);
|
||||
$decrypted_email = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
|
||||
// Verifikationsstring überprüfen und entfernen
|
||||
$verification_length = strlen($secret_verification);
|
||||
if(substr($decrypted_email, -$verification_length) == $secret_verification) {
|
||||
// Verifikationsstring überprüfen und entfernen
|
||||
$verification_length = strlen($secret_verification);
|
||||
if (substr($decrypted_email, -$verification_length) == $secret_verification) {
|
||||
$decrypted_email = substr($decrypted_email, 0, -$verification_length);
|
||||
}
|
||||
|
||||
// Ausgabe der entschlüsselten E-Mail-Adresse
|
||||
echo "E-Mail-Adresse: ", $decrypted_email, "<br>\n";
|
||||
}
|
||||
|
||||
// Ausgabe der entschlüsselten E-Mail-Adresse
|
||||
echo "E-Mail-Adresse: ", $decrypted_email, "<br>\n";
|
||||
} else {
|
||||
|
||||
echo "Kein gültiges Token!<br>";
|
||||
echo "Kein gültiges Token!<br>";
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
<?php
|
||||
// Login und Admin Status testen. Wenn kein Admin-Status, Weiterleiten auf index.php und beenden
|
||||
SESSION_START();
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
$db_link=ConnectDB();
|
||||
include '_login.php';
|
||||
include '_crypt.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
$db_link = ConnectDB();
|
||||
require '_login.php';
|
||||
require '_crypt.php';
|
||||
|
||||
if($AdminStatus != 1) {
|
||||
if ($AdminStatus != 1) {
|
||||
//Seite nur fuer Admins. Weiter zu index.php und exit, wenn kein Admin
|
||||
echo '<!doctype html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
}
|
||||
|
||||
function validate_email($email) {
|
||||
function validate_email($email)
|
||||
{
|
||||
// Prüfen, ob die Email-Adresse syntaktisch gültig ist
|
||||
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
|
||||
return false;
|
||||
|
|
@ -38,25 +39,25 @@ function validate_email($email) {
|
|||
|
||||
// wird immer auf 2 (Teilnehmer) gesetzt und wird auch nicht gespeichert, wenn anders gesetzt
|
||||
// andere level muessen jedes Mal gesetzt werden
|
||||
$level=2;
|
||||
$level = 2;
|
||||
|
||||
if(isset($_POST['helfer-status'])) {
|
||||
$level=$_POST['helfer-status'];
|
||||
if (isset($_POST['helfer-status'])) {
|
||||
$level = $_POST['helfer-status'];
|
||||
}
|
||||
|
||||
// nicht sicher, wo so ein default-text herkommen sollte
|
||||
// oder ob es tatsächlich einen geben sollte
|
||||
$email_subject="Drop am See beginnt bald!";
|
||||
if(isset($_POST['email-subject'])) {
|
||||
$email_subject=$_POST['email-subject'];
|
||||
$email_subject = "Drop am See beginnt bald!";
|
||||
if (isset($_POST['email-subject'])) {
|
||||
$email_subject = $_POST['email-subject'];
|
||||
}
|
||||
|
||||
$email_cc="drophelfer@gmail.com";
|
||||
if(isset($_POST['email-cc'])) {
|
||||
$email_cc=$_POST['email-cc'];
|
||||
$email_cc = "drophelfer@gmail.com";
|
||||
if (isset($_POST['email-cc'])) {
|
||||
$email_cc = $_POST['email-cc'];
|
||||
}
|
||||
|
||||
$email_text="
|
||||
$email_text = "
|
||||
Lieber Teilnehmer,
|
||||
trage dich bitte mit folgendem Link für eine Stunde pro Person als Helfer bei uns ein.Wir verschicken eine Mail pro Emailaddresse, also bitte für alle, die mit dieser Emailaddresse angemeldet sind.
|
||||
|
||||
|
|
@ -70,13 +71,13 @@ Viele Grüße,
|
|||
dein Drop am See Team
|
||||
";
|
||||
|
||||
if(isset($_POST['email-text'])) {
|
||||
$email_text=$_POST['email-text'];
|
||||
if (isset($_POST['email-text'])) {
|
||||
$email_text = $_POST['email-text'];
|
||||
}
|
||||
|
||||
$sendmail=0;
|
||||
if(isset($_POST['sendmail'])) {
|
||||
$sendmail=$_POST['sendmail'];
|
||||
$sendmail = 0;
|
||||
if (isset($_POST['sendmail'])) {
|
||||
$sendmail = $_POST['sendmail'];
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -112,12 +113,16 @@ Als Passwort wird das Token gesetzt. Man kann sich mit dem Link danach wieder in
|
|||
<label for="helfer-status">Status des Accounts, den der Link erstellt:</label>
|
||||
<select style="width:260px" id="helfer-status" name="helfer-status">
|
||||
<!-- TODO: aus DB abfragen -->
|
||||
<option value="2"<?php if($level==2){echo "selected";}?>>Teilnehmer</option>
|
||||
<option value="1" <?php if($level==1){echo "selected";}?>>Dauerhelfer</option>
|
||||
<option value="2"<?php if ($level == 2) {
|
||||
echo "selected";
|
||||
}?>>Teilnehmer</option>
|
||||
<option value="1" <?php if ($level == 1) {
|
||||
echo "selected";
|
||||
}?>>Dauerhelfer</option>
|
||||
</select>
|
||||
</p><p>
|
||||
Subject der Email: <br>
|
||||
<input id="email-subject" name="email-subject" type="textbox" value="<?=htmlspecialchars($email_subject??'');?>">
|
||||
<input id="email-subject" name="email-subject" type="textbox" value="<?php echo htmlspecialchars($email_subject ?? '');?>">
|
||||
</p><p>
|
||||
CC (Kopie) der Email geht an: <br>
|
||||
<input id="email-cc" name="email-cc" type="textbox" value="drophelfer@gmail.com">
|
||||
|
|
@ -125,7 +130,7 @@ Als Passwort wird das Token gesetzt. Man kann sich mit dem Link danach wieder in
|
|||
Emailtext (XXtokenXX an die Stelle schreiben, an der der Link im Emailtext stehen soll):
|
||||
</p><p>
|
||||
<textarea id="email-text" name="email-text" rows="20" cols="80">
|
||||
<?=htmlspecialchars($email_text??'');?>
|
||||
<?php echo htmlspecialchars($email_text ?? '');?>
|
||||
</textarea>
|
||||
</p>
|
||||
<p>
|
||||
|
|
@ -142,7 +147,7 @@ Liste von Emails, an die Anschreiben verschickt wird (Eine Email pro Zeile, nur
|
|||
</p>
|
||||
<?php
|
||||
|
||||
if(isset($_POST['email-liste'])) {
|
||||
if (isset($_POST['email-liste'])) {
|
||||
// TODO: check if email-text contains tokentext to substitute
|
||||
// TODO: check if subject is set
|
||||
// get email addresses from textarea
|
||||
|
|
@ -155,30 +160,30 @@ if(isset($_POST['email-liste'])) {
|
|||
//preg_split, um bei allen Leerzeichen zu trennen
|
||||
$email_array = preg_split('/\s+/', $email_list); // Trennzeichen: 1 oder mehr Whitespace-Zeichen
|
||||
foreach ($email_array as $email) {
|
||||
$email=trim($email);
|
||||
$encrypted_data=encode_string($secret_key, $email,$level,$secret_verification);
|
||||
$email = trim($email);
|
||||
$encrypted_data = encode_string($secret_key, $email, $level, $secret_verification);
|
||||
$token_url = "$urlprefix?token=$encrypted_data";
|
||||
// Ausgabe des verschluesselten Textes in der URL
|
||||
$decrypted_data = decode_string($secret_key, urldecode($encrypted_data),$secret_verification);
|
||||
$decrypted_data = decode_string($secret_key, urldecode($encrypted_data), $secret_verification);
|
||||
$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
|
||||
echo "Verschicken nicht ausgewählt. Zeige Emails an:<br>";
|
||||
echo $sendmail ."<br>";
|
||||
echo $sendmail . "<br>";
|
||||
echo "=======================================<br>";
|
||||
echo "To: ".$decrypted_data['email']." (level: ".$decrypted_data['level']."):<br>";
|
||||
echo "CC: ".$email_cc."<br>";
|
||||
echo "<pre>".$email_subst_text."</pre><br>";
|
||||
echo "$email: <a href='$token_url'> $token_url</a> (check: ".$decrypted_data['email'].", lv: ".$decrypted_data['level'].")<br>";
|
||||
echo "To: " . $decrypted_data['email'] . " (level: " . $decrypted_data['level'] . "):<br>";
|
||||
echo "CC: " . $email_cc . "<br>";
|
||||
echo "<pre>" . $email_subst_text . "</pre><br>";
|
||||
echo "$email: <a href='$token_url'> $token_url</a> (check: " . $decrypted_data['email'] . ", lv: " . $decrypted_data['level'] . ")<br>";
|
||||
} else {
|
||||
// Email verschicken - send mail
|
||||
$to=$decrypted_data['email'];
|
||||
$from="root";
|
||||
$headers = 'From: ' . $from. "\r\n";
|
||||
$to = $decrypted_data['email'];
|
||||
$from = "root";
|
||||
$headers = 'From: ' . $from . "\r\n";
|
||||
$headers .= 'CC: ' . $email_cc . "\r\n";
|
||||
if (mail($to, $email_subject, $email_subst_text, $headers)) {
|
||||
echo "Die E-Mail an $to wurde erfolgreich versendet.";
|
||||
error_log(date('Y-m-d H:i') . "(AdminID:$AdminID) Name: $HelferName (HelferID:$HelferID) hat Email mit Link verschickt an: $to mit CC an: $email_cc\n",3,LOGFILE);
|
||||
error_log(date('Y-m-d H:i') . "(AdminID:$AdminID) Name: $HelferName (HelferID:$HelferID) hat Email mit Link verschickt an: $to mit CC an: $email_cc\n", 3, LOGFILE);
|
||||
} else {
|
||||
echo "Beim Versenden der E-Mail an $to ist ein Fehler aufgetreten.";
|
||||
}
|
||||
|
|
@ -196,7 +201,7 @@ if(isset($_POST['email-liste'])) {
|
|||
<!--Einzelne Email
|
||||
<p>
|
||||
<form method="GET">
|
||||
<input id="helfer-email" name="helfer-email" type="textbox" value="<?=htmlspecialchars($HelferEmail??'')?>">
|
||||
<input id="helfer-email" name="helfer-email" type="textbox" value="<?php echo htmlspecialchars($HelferEmail ?? '')?>">
|
||||
<button name="sent" value="1">Token generieren</button>
|
||||
</form>
|
||||
</p>
|
||||
|
|
@ -204,15 +209,15 @@ if(isset($_POST['email-liste'])) {
|
|||
|
||||
<?php
|
||||
//single email
|
||||
#if(isset($_GET['helfer-email'])) {
|
||||
# $email = $_GET['helfer-email'];
|
||||
# echo "email: $email <br> \n";
|
||||
# // encode
|
||||
# $encrypted_data=encode_string($secret_key, $email,$secret_verification);
|
||||
# $decrypted_data = decode_string($secret_key, $encrypted_data,$secret_verification);
|
||||
# // Ausgabe des verschlüsselten Textesin der URL
|
||||
# echo "$email: <a href='$linktext'> $urlprefix/$linktext</a>(check: $decrypted_data ) <br>";
|
||||
# exit;
|
||||
#}
|
||||
// if(isset($_GET['helfer-email'])) {
|
||||
// $email = $_GET['helfer-email'];
|
||||
// echo "email: $email <br> \n";
|
||||
// // encode
|
||||
// $encrypted_data=encode_string($secret_key, $email,$secret_verification);
|
||||
// $decrypted_data = decode_string($secret_key, $encrypted_data,$secret_verification);
|
||||
// // Ausgabe des verschlüsselten Textesin der URL
|
||||
// echo "$email: <a href='$linktext'> $urlprefix/$linktext</a>(check: $decrypted_data ) <br>";
|
||||
// exit;
|
||||
// }
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
<title>Helfer Drop am See Home</title>
|
||||
<link rel="stylesheet" href="css/style_desktop.css" media="screen and (min-width:781px)"/>
|
||||
<link rel="stylesheet" href="css/style_mobile.css" media="screen and (max-width:780px)"/>
|
||||
<meta http-equiv="Refresh" content="0; url=<?php require_once ('konfiguration.php'); echo INFORMATIONS_URL;?>" />
|
||||
<meta http-equiv="Refresh" content="0; url=<?php require_once 'konfiguration.php';
|
||||
echo INFORMATIONS_URL;?>" />
|
||||
<meta name="viewport" content="width=480" />
|
||||
</head>
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -15,35 +15,50 @@
|
|||
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once 'konfiguration.php';
|
||||
//require_once ('SQL.php');
|
||||
include 'SQL.php';
|
||||
require 'SQL.php';
|
||||
|
||||
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
);
|
||||
|
||||
|
||||
|
||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['CloseInfo']))
|
||||
{
|
||||
UNSET($InfoMeineSchichtID);
|
||||
UNSET($InfoAlleSchichtID);
|
||||
if (isset($_POST['CloseInfo'])) {
|
||||
unset($InfoMeineSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
}
|
||||
if(isset($_POST['InfoMeineSchichtID']))
|
||||
{
|
||||
if (isset($_POST['InfoMeineSchichtID'])) {
|
||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||
UNSET($InfoAlleSchichtID);
|
||||
unset($InfoAlleSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoMeineSchichtID);
|
||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer = $zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
}
|
||||
|
||||
|
||||
if (isset($_GET['InfoAlleSchichtID'])) {
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
unset($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
|
|
@ -53,57 +68,33 @@ if(isset($_POST['InfoMeineSchichtID']))
|
|||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(isset($_GET['InfoAlleSchichtID']))
|
||||
{
|
||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||
UNSET($InfoMeineSchichtID);
|
||||
//echo "<b>". $SchichtID . "</b><br>";
|
||||
|
||||
$zeile = DetailSchicht($db_link,$InfoAlleSchichtID);
|
||||
|
||||
$Was = $zeile['Was'];
|
||||
$Wo = $zeile['Wo'];
|
||||
$Dauer=$zeile['Dauer'];
|
||||
$Leiter = $zeile['Name'];
|
||||
$LeiterHandy = $zeile['Handy'];
|
||||
$LeiterEmail = $zeile['Email'];
|
||||
$Info = $zeile['Info'];
|
||||
|
||||
|
||||
|
||||
// Beteiligte Helfer Holen
|
||||
$db_erg = BeteiligteHelfer($db_link,$InfoAlleSchichtID);
|
||||
$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'];
|
||||
$MitHelfer[$x] = $zeile['Name'];
|
||||
$MitHelferHandy[$x]= $zeile['Handy'];
|
||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||
$x++;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// Logout
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['logout']))
|
||||
{
|
||||
if (isset($_POST['logout'])) {
|
||||
unset($_SESSION["HelferID"]);
|
||||
//$_POST['login'] = 1;
|
||||
}
|
||||
|
||||
/// Login
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['login']))
|
||||
{
|
||||
if (isset($_POST['login'])) {
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -114,28 +105,22 @@ if(isset($_POST['login']))
|
|||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort, 0 );
|
||||
}
|
||||
else
|
||||
{
|
||||
if (empty($messages)) {
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(!isset($_SESSION["HelferID"]))
|
||||
{
|
||||
|
||||
?>
|
||||
if (!isset($_SESSION["HelferID"])) {
|
||||
?>
|
||||
<form method="post" action="#Info">
|
||||
|
||||
<fieldset>
|
||||
|
|
@ -144,12 +129,12 @@ if(!isset($_SESSION["HelferID"]))
|
|||
<table border="0" style="border: 0px solid black;">
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Email</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="helfer-email" type="text" value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="text" value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Passwort</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferHandy??'')?>" required>
|
||||
<input name="helfer-passwort" type="password" value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
</table>
|
||||
|
|
@ -161,7 +146,7 @@ if(!isset($_SESSION["HelferID"]))
|
|||
|
||||
|
||||
</form>
|
||||
<?php
|
||||
<?php
|
||||
exit;
|
||||
}
|
||||
|
||||
|
|
@ -170,13 +155,12 @@ if(!isset($_SESSION["HelferID"]))
|
|||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
if(isset($_POST['HelferID']))
|
||||
{
|
||||
if (isset($_POST['HelferID'])) {
|
||||
$HelferID = $_POST['HelferID'];
|
||||
}
|
||||
if(isset($_POST['ShowHelfer'])) {
|
||||
$HelferID=$_POST['HelperSearch'];
|
||||
}
|
||||
if (isset($_POST['ShowHelfer'])) {
|
||||
$HelferID = $_POST['HelperSearch'];
|
||||
}
|
||||
|
||||
$_SESSION["HelferID"] = $HelferID;
|
||||
|
||||
|
|
@ -196,8 +180,7 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
/// Schicht Löschen
|
||||
////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['Del'])) {
|
||||
|
||||
if (isset($_POST['Del'])) {
|
||||
$messages = [];
|
||||
|
||||
$EinzelSchichtID = $_POST['Del'];
|
||||
|
|
@ -211,19 +194,16 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
|
||||
|
||||
|
||||
if(empty($messages)) {
|
||||
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link,$HelferID,$EinzelSchichtID);
|
||||
|
||||
if (empty($messages)) {
|
||||
$db_erg = HelferVonSchichtLoeschen($db_link, $HelferID, $EinzelSchichtID);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -242,8 +222,7 @@ $_SESSION["HelferID"] = $HelferID;
|
|||
|
||||
// Neu Schicht fuer Helfer Eintragen
|
||||
///////////////////////////////////////////////////////////
|
||||
if(isset($_POST['sent'])) {
|
||||
|
||||
if (isset($_POST['sent'])) {
|
||||
$messages = [];
|
||||
$SchichtId = $_POST['sent'];
|
||||
|
||||
|
|
@ -254,29 +233,23 @@ if(isset($_POST['sent'])) {
|
|||
// }
|
||||
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
if (empty($messages)) {
|
||||
// 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
|
||||
$HelferName = '';
|
||||
$HelferEmail = '';
|
||||
$HelferHandy = '';
|
||||
//die('<div class="Helfer wurde angelegt.</div>');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message)
|
||||
{
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// Ausgabe auf Deutsch umstellen
|
||||
|
|
@ -288,10 +261,9 @@ 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";
|
||||
die('Ungültige Abfrage: ' . mysqli_error());
|
||||
}
|
||||
|
|
@ -303,28 +275,25 @@ echo '<table id="customers">';
|
|||
|
||||
echo "<thead>";
|
||||
echo "<tr>";
|
||||
echo "<th colspan=4>". "Meine Schichten (".$iSQLCount." Schichten)</th>";
|
||||
echo "<th colspan=4>" . "Meine Schichten (" . $iSQLCount . " Schichten)</th>";
|
||||
echo "</tr><tr>";
|
||||
echo "<th></th>";
|
||||
echo "<th style='width:180px'>". "Von" . "</th>";
|
||||
echo "<th style='width:180px'>". "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>". "Del" . "</th>";
|
||||
echo "<th style='width:180px'>" . "Von" . "</th>";
|
||||
echo "<th style='width:180px'>" . "Bis" . "</th>";
|
||||
echo "<th style='width:90px'>" . "Del" . "</th>";
|
||||
echo "</tr>";
|
||||
echo "</thead>";
|
||||
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
//echo '<tr title="Details anzeigen" onclick="parent.DetailsSchichten.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
echo '<tr title="Details anzeigen" onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$zeile['SchichtID'].'#Info\';" >';
|
||||
echo "<td>". $zeile['Was'] . "</td>";
|
||||
echo "<td>". $zeile['Ab'] . "</td>";
|
||||
echo "<td>". $zeile['Bis'] . "</td>";
|
||||
echo "<td>". "<button title='Schicht entfernen' name='Del' value='". $zeile['EinzelSchichtID'] ."'>-</button>" . "</td>";
|
||||
echo '<tr title="Details anzeigen" onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID=' . $zeile['SchichtID'] . '#Info\';" >';
|
||||
echo "<td>" . $zeile['Was'] . "</td>";
|
||||
echo "<td>" . $zeile['Ab'] . "</td>";
|
||||
echo "<td>" . $zeile['Bis'] . "</td>";
|
||||
echo "<td>" . "<button title='Schicht entfernen' name='Del' value='" . $zeile['EinzelSchichtID'] . "'>-</button>" . "</td>";
|
||||
echo "</tr>";
|
||||
|
||||
}
|
||||
echo "</table>";
|
||||
|
||||
|
|
@ -335,12 +304,12 @@ $iBelegteSchichtenCount = AlleBelegteSchichtenCount($db_link);
|
|||
|
||||
echo '<table id="customers" onclick="window.location.href=\'AlleSchichten.php\'">';
|
||||
echo "<tr>";
|
||||
echo "<th>".'<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">'. " Alle Schichten der Con (".$iBelegteSchichtenCount."/".$iAlleSchichtenCount.")</th>";
|
||||
echo "<th>" . '<img src="Bilder/PfeilRechts2.png" style="width:30px;height:30px;align:middle;">' . " Alle Schichten der Con (" . $iBelegteSchichtenCount . "/" . $iAlleSchichtenCount . ")</th>";
|
||||
echo "</tr>";
|
||||
echo "</table>";
|
||||
|
||||
|
||||
mysqli_free_result( $db_erg );
|
||||
mysqli_free_result($db_erg);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -7,56 +7,55 @@
|
|||
|
||||
<!--meta name="viewport" content="width=480" /-->
|
||||
<?php
|
||||
require_once ('konfiguration.php');
|
||||
require_once 'konfiguration.php';
|
||||
SESSION_START();
|
||||
|
||||
|
||||
// if we are not logged in, we redirect in the header back to the main page
|
||||
if(!isset($_SESSION["HelferID"]) || ! $_SESSION["HelferID"] > 0) {
|
||||
if (!isset($_SESSION["HelferID"]) || ! $_SESSION["HelferID"] > 0) {
|
||||
echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />
|
||||
';
|
||||
}
|
||||
// print top of page if we are logged in and not redirecting
|
||||
echo " </head> \n <body> \n";
|
||||
echo '<button name="BackHelferdaten" value="1" onclick="window.location.href = \'index.php\';"><b>↩</b></button><br>'."\n";
|
||||
echo '<button name="BackHelferdaten" value="1" onclick="window.location.href = \'index.php\';"><b>↩</b></button><br>' . "\n";
|
||||
echo '<H1> Helferdaten - Log </H1>';
|
||||
echo '<p>Hier werden alle Aktionen, die einen Helfer betreffen aufgelistet</p>';
|
||||
echo '<table id="customers">'."\n";
|
||||
echo '<table id="customers">' . "\n";
|
||||
|
||||
//check for admin status
|
||||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
include 'SQL.php';
|
||||
$db_link = mysqli_connect ( MYSQL_HOST, MYSQL_BENUTZER, MYSQL_KENNWORT, MYSQL_DATENBANK );
|
||||
require 'SQL.php';
|
||||
$db_link = mysqli_connect(MYSQL_HOST, MYSQL_BENUTZER, MYSQL_KENNWORT, MYSQL_DATENBANK);
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
$db_erg = Helferdaten($db_link,$HelferID);
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
$HelferName=$zeile['Name'];
|
||||
$HelferIsAdmin=$zeile['Admin'];
|
||||
}
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferIsAdmin = $zeile['Admin'];
|
||||
}
|
||||
|
||||
// Wir suchen nach HelferID:<zahl> - wenn das Admin Flag gesetzt ist, kann man den Suchstring auf etwas anderes aendern
|
||||
$regex = "\(HelferID:$HelferID\)";
|
||||
if($HelferIsAdmin){
|
||||
if(isset($_POST['suche']) || isset($_GET['suche'])){
|
||||
$regex=$_POST['suche'].$_GET['suche'];
|
||||
if ($HelferIsAdmin) {
|
||||
if (isset($_POST['suche']) || isset($_GET['suche'])) {
|
||||
$regex = $_POST['suche'] . $_GET['suche'];
|
||||
}
|
||||
echo "<form>";
|
||||
echo "Nur Admins: Suchbegriff (Per Default der selbe Suchtext, wie bei nicht-Admin Helfern):<input name='suche' type='text' size=35 value='$regex'><br> \n";
|
||||
echo "Der Suchbegriff ist ein <a href='https://de.wikipedia.org/wiki/Regul%C3%A4rer_Ausdruck'>Regulärer Ausdruck</a><br><br>";
|
||||
echo "</form>";
|
||||
}
|
||||
}
|
||||
|
||||
$regex = "/"."$regex"."/";
|
||||
foreach(file(LOGFILE) as $line) {
|
||||
#echo "not: $line<br>\n";
|
||||
if(preg_match($regex,$line,$matches)){
|
||||
$regex = "/" . "$regex" . "/";
|
||||
foreach (file(LOGFILE) as $line) {
|
||||
// echo "not: $line<br>\n";
|
||||
if (preg_match($regex, $line, $matches)) {
|
||||
echo "<tr><td> $line</td></tr>";
|
||||
}
|
||||
}
|
||||
?>
|
||||
}
|
||||
?>
|
||||
</table>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
711
html/SQL.php
711
html/SQL.php
File diff suppressed because it is too large
Load Diff
|
|
@ -2,70 +2,70 @@
|
|||
<?php
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
include '_crypt.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
require '_crypt.php';
|
||||
|
||||
|
||||
$head="<!doctype html>
|
||||
$head = "<!doctype html>
|
||||
<head></head> <body> ";
|
||||
$foot="</body></html>";
|
||||
$foot = "</body></html>";
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
# ist jetzt in _crypt.php, aber aus der anderen Datei, deshalb hier erst
|
||||
# nur auskommentiert
|
||||
#function Entschluessle($encrypted_data,$secret_verification,$secret_key){
|
||||
#
|
||||
# // Erstellen eines Cipher-Objekts für die Verschlüsselung
|
||||
# $cipher_method = "AES-256-CBC";
|
||||
# $iv_length = openssl_cipher_iv_length($cipher_method);
|
||||
# $cipher_options = OPENSSL_RAW_DATA;
|
||||
# $cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
||||
#
|
||||
# // Entschlüsseln des verschlüsselten Textes
|
||||
# // zuerst base64 entfernen. *kein* urldecode, das passiert durch get/post automatisch
|
||||
# $decoded_cipher_text = base64_decode($encrypted_data);
|
||||
# $iv = substr($decoded_cipher_text, 0, $iv_length);
|
||||
# $cipher_text = substr($decoded_cipher_text, $iv_length);
|
||||
# $decrypted_email = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
#
|
||||
# // Verifikationsstring überprüfen und entfernen
|
||||
# $verification_length = strlen($secret_verification);
|
||||
# if(substr($decrypted_email, -$verification_length) == $secret_verification) {
|
||||
# $decrypted_email = substr($decrypted_email, 0, -$verification_length);
|
||||
# }
|
||||
# return($decrypted_email);
|
||||
#}
|
||||
);
|
||||
// ist jetzt in _crypt.php, aber aus der anderen Datei, deshalb hier erst
|
||||
// nur auskommentiert
|
||||
// function Entschluessle($encrypted_data,$secret_verification,$secret_key){
|
||||
//
|
||||
// // Erstellen eines Cipher-Objekts für die Verschlüsselung
|
||||
// $cipher_method = "AES-256-CBC";
|
||||
// $iv_length = openssl_cipher_iv_length($cipher_method);
|
||||
// $cipher_options = OPENSSL_RAW_DATA;
|
||||
// $cipher_key = openssl_digest($secret_key, 'SHA256', true);
|
||||
//
|
||||
// // Entschlüsseln des verschlüsselten Textes
|
||||
// // zuerst base64 entfernen. *kein* urldecode, das passiert durch get/post automatisch
|
||||
// $decoded_cipher_text = base64_decode($encrypted_data);
|
||||
// $iv = substr($decoded_cipher_text, 0, $iv_length);
|
||||
// $cipher_text = substr($decoded_cipher_text, $iv_length);
|
||||
// $decrypted_email = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
//
|
||||
// // Verifikationsstring überprüfen und entfernen
|
||||
// $verification_length = strlen($secret_verification);
|
||||
// if(substr($decrypted_email, -$verification_length) == $secret_verification) {
|
||||
// $decrypted_email = substr($decrypted_email, 0, -$verification_length);
|
||||
// }
|
||||
// return($decrypted_email);
|
||||
// }
|
||||
|
||||
if(isset($_GET['token']) || isset($_POST['token']) ) {
|
||||
if (isset($_GET['token']) || isset($_POST['token'])) {
|
||||
// E-Mail-Adresse des Nutzers
|
||||
$token = $_GET['token'];
|
||||
//$email = Entschluessle($token,$secret_verification,$secret_key);
|
||||
$decrypted_data = decode_string($secret_key, $token, $secret_verification);
|
||||
//error_log("decrytped_data: ". $decrypted_data);
|
||||
$email=$decrypted_data['email'];
|
||||
$helfer_level=$decrypted_data['level'];
|
||||
$success=$decrypted_data['success'];
|
||||
$email = $decrypted_data['email'];
|
||||
$helfer_level = $decrypted_data['level'];
|
||||
$success = $decrypted_data['success'];
|
||||
//error_log("email: ".$email.",level: ".$helfer_level.",success: ".$success);
|
||||
} else {
|
||||
echo "$head Kein Token angegeben!<br> $foot";
|
||||
exit;
|
||||
}
|
||||
if($success != 1) {
|
||||
// if ( $db_erg ) {
|
||||
// echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />';
|
||||
// } else {
|
||||
if ($success != 1) {
|
||||
// if ( $db_erg ) {
|
||||
// echo ' <meta http-equiv="Refresh" content="0; URL=index.php" />';
|
||||
// } else {
|
||||
echo "$head Kein gültiges Token!<br>$foot";
|
||||
exit;
|
||||
}
|
||||
}
|
||||
//}
|
||||
//TODO: Variablendoppelung aufloesen und oben gleich einmal setzen
|
||||
if($success == 1 && $email != ""){
|
||||
if ($success == 1 && $email != "") {
|
||||
// Ausgabe der entschlüsselten E-Mail-Adresse
|
||||
//echo "E-Mail-Adresse: ", $email, "<br>\n";
|
||||
//echo "Passwort: ",$token,"<br>\n";
|
||||
|
|
@ -75,21 +75,20 @@ if($success == 1 && $email != ""){
|
|||
$HelferHandy = "";
|
||||
$HelferPasswort = $token;
|
||||
|
||||
if(!filter_var($HelferEmail, FILTER_VALIDATE_EMAIL)) {
|
||||
if (!filter_var($HelferEmail, FILTER_VALIDATE_EMAIL)) {
|
||||
echo 'Problem mit E-Mail-Adresse.';
|
||||
exit;
|
||||
}
|
||||
error_log("2email: ".$HelferEmail.",level: ".$helfer_level.",success: ".$success);
|
||||
error_log("2email: " . $HelferEmail . ",level: " . $helfer_level . ",success: " . $success);
|
||||
// Helfer Anlegen, wenn er nicht existiert
|
||||
if( ! HelferIstVorhanden($db_link,$HelferEmail) ) {
|
||||
error_log("Helfer ".$HelferEmail." nicht vorhanden, lege an");
|
||||
if (! HelferIstVorhanden($db_link, $HelferEmail)) {
|
||||
error_log("Helfer " . $HelferEmail . " nicht vorhanden, lege an");
|
||||
error_log("CreateHelfer(db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);");
|
||||
$db_erg = CreateHelfer($db_link,$HelferName,$HelferEmail, $HelferHandy,$HelferPasswort,$HelferLevel);
|
||||
$db_erg = CreateHelfer($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferPasswort, $HelferLevel);
|
||||
}
|
||||
// Login-Versuch, entweder direkt nach Anlegen oder wenn existiert hat
|
||||
// Login und auf Haupt-Seite gehen
|
||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort,0);
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
echo '<html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@ SESSION_START();
|
|||
$HelferID = $_SESSION["HelferID"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
require_once 'konfiguration.php';
|
||||
//require_once ('SQL.php');
|
||||
include 'SQL.php';
|
||||
require 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
);
|
||||
|
||||
|
||||
|
||||
|
|
@ -33,15 +33,14 @@ $db_link = mysqli_connect (
|
|||
/// Helferdaten Aendern
|
||||
////////////////////////////////////////////////////////
|
||||
|
||||
if(isset($_POST['change'])) {
|
||||
if (isset($_POST['change'])) {
|
||||
$messages = [];
|
||||
|
||||
|
||||
// Eingaben überprüfen:
|
||||
|
||||
|
||||
if(strlen($_POST['helfer-newpasswort'])<8 and $_POST['helfer-newpasswort']!="")
|
||||
{
|
||||
if (strlen($_POST['helfer-newpasswort']) < 8 and $_POST['helfer-newpasswort'] != "") {
|
||||
$messages[] = 'Neues Passwort zu kurz';
|
||||
}
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -51,19 +50,18 @@ if(isset($_POST['change'])) {
|
|||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferHandy = $_POST['helfer-handy'];
|
||||
$HelferNewPasswort = $_POST['helfer-newpasswort'];
|
||||
if(empty($messages)) {
|
||||
if (empty($messages)) {
|
||||
// Helferdaten Ändern
|
||||
HelferdatenAendern($db_link,$HelferName,$HelferEmail,$HelferHandy,$HelferNewPasswort,$HelferID);
|
||||
|
||||
HelferdatenAendern($db_link, $HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $HelferID);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -71,11 +69,10 @@ if(isset($_POST['change'])) {
|
|||
// Helferdate holen
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
$db_erg = Helferdaten($db_link,$HelferID);
|
||||
$db_erg = Helferdaten($db_link, $HelferID);
|
||||
|
||||
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
||||
{
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||
$HelferName = $zeile['Name'];
|
||||
$HelferEmail = $zeile['Email'];
|
||||
$HelferHandy = $zeile['Handy'];
|
||||
|
|
@ -83,16 +80,14 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
|||
|
||||
/// Logout
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['logout']))
|
||||
{
|
||||
if (isset($_POST['logout'])) {
|
||||
unset($_SESSION["HelferID"]);
|
||||
//$_POST['login'] = 1;
|
||||
}
|
||||
|
||||
/// Login
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['login']))
|
||||
{
|
||||
if (isset($_POST['login'])) {
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -103,20 +98,16 @@ if(isset($_POST['login']))
|
|||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort, 0 );
|
||||
}
|
||||
else
|
||||
{
|
||||
if (empty($messages)) {
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -131,27 +122,27 @@ if(isset($_POST['login']))
|
|||
<form method="post">
|
||||
<tr>
|
||||
<td>Name</td></tr><tr><td>
|
||||
<input name="helfer-name" type="text" value="<?=htmlspecialchars($HelferName??'')?>" required>
|
||||
<input name="helfer-name" type="text" value="<?php echo htmlspecialchars($HelferName ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Email</td></tr><tr><td>
|
||||
<input name="helfer-email" type="email " value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="email " value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Handy</td></tr><tr><td>
|
||||
<input name="helfer-handy" type="tel" value="<?=htmlspecialchars($HelferHandy??'')?>" >
|
||||
<input name="helfer-handy" type="tel" value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Altes Helfer Passwort</td></tr><tr><td>
|
||||
<input name="helfer-passwort" type="password" value="<?=htmlspecialchars($HelferPasswort??'')?>" >
|
||||
<input name="helfer-passwort" type="password" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Neues Helfer Passwort</td></tr><tr><td>
|
||||
<input name="helfer-newpasswort" type="text" value="<?=htmlspecialchars($HelferPasswort??'')?>" >
|
||||
<input name="helfer-newpasswort" type="text" value="<?php echo htmlspecialchars($HelferPasswort ?? '')?>" >
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<?php
|
||||
function encode_string($key, $email, $level, $verification) {
|
||||
|
||||
function encode_string($key, $email, $level, $verification)
|
||||
{
|
||||
// String verification anfuegen am Ende, um abgeschnittene URLs zu verhindern
|
||||
$token_content = $email . '|' . $level . '|' . $verification;
|
||||
|
||||
|
|
@ -12,8 +14,8 @@ function encode_string($key, $email, $level, $verification) {
|
|||
$cipher_key = openssl_digest($key, 'SHA256', true);
|
||||
$cipher_text = openssl_encrypt($token_content, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
|
||||
if(isset($debug)) {
|
||||
echo "<br>encode: cipher:".chunk_split(bin2hex($cipher_text),4,' ')." <br>iv:".chunk_split(bin2hex($iv),4,' ')." <br>iv_length:$iv_length<br>cipher_key ".chunk_split(bin2hex($cipher_key),4,' ')."<br>";
|
||||
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>";
|
||||
}
|
||||
|
||||
$cipher_text = $iv . $cipher_text;
|
||||
|
|
@ -23,7 +25,8 @@ function encode_string($key, $email, $level, $verification) {
|
|||
return $encrypted_data;
|
||||
}
|
||||
|
||||
function decode_string($key, $encrypted_data, $verification) {
|
||||
function decode_string($key, $encrypted_data, $verification)
|
||||
{
|
||||
// Entschlüsseln des verschuesselten Textes
|
||||
// erst base64 entfernen - urldecode muss wenn noetig vorher angewendet werden
|
||||
$decoded_cipher_text = base64_decode($encrypted_data);
|
||||
|
|
@ -35,16 +38,18 @@ function decode_string($key, $encrypted_data, $verification) {
|
|||
$cipher_options = OPENSSL_RAW_DATA;
|
||||
$cipher_key = openssl_digest($key, 'SHA256', true);
|
||||
|
||||
if(isset($debug)){
|
||||
echo "<br>decode: cipher:".chunk_split(bin2hex($cipher_text),4,' '). " <br>iv:".chunk_split(bin2hex($iv),4,' '). " <br>iv_length:$iv_length<br>cipher_key ". chunk_split(bin2hex($cipher_key),4,' ');
|
||||
if (isset($debug)) {
|
||||
echo "<br>decode: cipher:" . chunk_split(bin2hex($cipher_text), 4, ' ') . " <br>iv:" . chunk_split(bin2hex($iv), 4, ' ') . " <br>iv_length:$iv_length<br>cipher_key " . chunk_split(bin2hex($cipher_key), 4, ' ');
|
||||
}
|
||||
|
||||
$decrypted_data = openssl_decrypt($cipher_text, $cipher_method, $cipher_key, $cipher_options, $iv);
|
||||
|
||||
if(isset($debug)){echo "<br> decrypted_data " . $decrypted_data." end<br>";}
|
||||
if (isset($debug)) {
|
||||
echo "<br> decrypted_data " . $decrypted_data . " end<br>";
|
||||
}
|
||||
$verification_length = strlen($verification);
|
||||
|
||||
if(substr($decrypted_data, -$verification_length) == $verification) {
|
||||
if (substr($decrypted_data, -$verification_length) == $verification) {
|
||||
list($email, $level, $verification_code) = explode('|', $decrypted_data);
|
||||
return array(
|
||||
'email' => $email,
|
||||
|
|
@ -58,4 +63,3 @@ function decode_string($key, $encrypted_data, $verification) {
|
|||
);
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,18 @@
|
|||
<?php
|
||||
/// Logout
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_GET['logout']) || isset($_POST['logout']))
|
||||
{
|
||||
if (isset($_GET['logout']) || isset($_POST['logout'])) {
|
||||
// remove all session variables
|
||||
session_unset();
|
||||
|
||||
// destroy the session
|
||||
session_destroy();
|
||||
echo '<!doctype html><html><head><meta http-equiv="Refresh" content="0; URL=index.php" /></head></html>';
|
||||
|
||||
}
|
||||
|
||||
/// Login
|
||||
////////////////////////////////////////////////////////
|
||||
if(isset($_POST['login']))
|
||||
{
|
||||
if (isset($_POST['login'])) {
|
||||
$messages = [];
|
||||
// Eingaben überprüfen:
|
||||
//if(!preg_match('/^[a-zA-Z]+[a-zA-Z0-9._]+$/', $HelferName)) {
|
||||
|
|
@ -28,26 +25,20 @@ if(isset($_POST['login']))
|
|||
$HelferEmail = $_POST['helfer-email'];
|
||||
$HelferPasswort = $_POST['helfer-passwort'];
|
||||
|
||||
if(empty($messages))
|
||||
{
|
||||
HelferLogin($db_link,$HelferEmail,$HelferPasswort, 0 );
|
||||
}
|
||||
else
|
||||
{
|
||||
if (empty($messages)) {
|
||||
HelferLogin($db_link, $HelferEmail, $HelferPasswort, 0);
|
||||
} else {
|
||||
// Fehlermeldungen ausgeben:
|
||||
echo '<div class="error"><ul>';
|
||||
foreach($messages as $message) {
|
||||
echo '<li>'.htmlspecialchars($message).'</li>';
|
||||
foreach ($messages as $message) {
|
||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||
}
|
||||
echo '</ul></div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(!isset($_SESSION["HelferID"]))
|
||||
{
|
||||
|
||||
?>
|
||||
if (!isset($_SESSION["HelferID"])) {
|
||||
?>
|
||||
<form method="post" action="#Info">
|
||||
|
||||
<fieldset>
|
||||
|
|
@ -56,13 +47,13 @@ if(!isset($_SESSION["HelferID"]))
|
|||
<table border="0" style="border: 0px solid black;">
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Email</td></tr><tr><td style="border: 0px solid black;">
|
||||
<input name="helfer-email" type="text" size=35 value="<?=htmlspecialchars($HelferEmail??'')?>" required>
|
||||
<input name="helfer-email" type="text" size=35 value="<?php echo htmlspecialchars($HelferEmail ?? '')?>" required>
|
||||
</td>
|
||||
<tr>
|
||||
<tr>
|
||||
<td style="border: 0px solid black;">Passwort</td></tr>
|
||||
<tr><td style="border: 0px solid black;">
|
||||
<input name="helfer-passwort" id="helfer-passwort" type="password" size=35 value="<?=htmlspecialchars($HelferHandy??'')?>" required>
|
||||
<input name="helfer-passwort" id="helfer-passwort" type="password" size=35 value="<?php echo htmlspecialchars($HelferHandy ?? '')?>" required>
|
||||
</td><td style="border: 0px solid black;">
|
||||
<input type="button" value="Passwort zeigen" style="width:180px !important" onclick="showPassword('helfer-passwort')">
|
||||
</td>
|
||||
|
|
@ -76,7 +67,7 @@ if(!isset($_SESSION["HelferID"]))
|
|||
|
||||
|
||||
</form>
|
||||
<?php
|
||||
<?php
|
||||
exit;
|
||||
}
|
||||
|
||||
|
|
@ -85,6 +76,6 @@ $HelferID = $_SESSION["HelferID"];
|
|||
$HelferName = $_SESSION["HelferName"];
|
||||
$AdminID = $_SESSION["AdminID"];
|
||||
//TODO vereinheitlichen. index.php verwendet HelferIsAdmin
|
||||
$HelferIsAdmin=$AdminStatus = $_SESSION["AdminStatus"];
|
||||
$HelferLevel= $_SESSION["HelferLevel"];
|
||||
$HelferIsAdmin = $AdminStatus = $_SESSION["AdminStatus"];
|
||||
$HelferLevel = $_SESSION["HelferLevel"];
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
<?php
|
||||
require_once("../konfiguration.php");
|
||||
$options=[];
|
||||
|
||||
require_once "../konfiguration.php";
|
||||
$options = [];
|
||||
$db = new PDO($dsn, MYSQL_BENUTZER, MYSQL_KENNWORT, $options);
|
||||
|
||||
function read($db, $requestParams){
|
||||
function read($db, $requestParams)
|
||||
{
|
||||
$queryParams = [];
|
||||
$queryText = "
|
||||
select Schicht.SchichtID as id,
|
||||
|
|
@ -33,7 +35,7 @@ function read($db, $requestParams){
|
|||
if (isset($requestParams["from"]) && isset($requestParams["to"])) {
|
||||
//error_log("timespan given. from: ".$requestParams["from"]." to: ".$requestParams["to"]);
|
||||
$queryText .= " WHERE `Schicht.Bis`>=? AND `Schicht.Von` < ?;";
|
||||
$queryParams = [filter_var($requestParams["from"],FILTER_SANITIZE_NUMBER_FLOAT), filter_var($requestParams["to"],FILTER_SANITIZE_NUMBER_FLOAT)];
|
||||
$queryParams = [filter_var($requestParams["from"], FILTER_SANITIZE_NUMBER_FLOAT), filter_var($requestParams["to"], FILTER_SANITIZE_NUMBER_FLOAT)];
|
||||
}
|
||||
$query = $db->prepare($queryText);
|
||||
$query->execute($queryParams);
|
||||
|
|
@ -54,4 +56,3 @@ switch ($_SERVER["REQUEST_METHOD"]) {
|
|||
}
|
||||
header("Content-Type: application/json");
|
||||
echo json_encode($result);
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
<?php
|
||||
require_once("../konfiguration.php");
|
||||
$options=[];
|
||||
|
||||
require_once "../konfiguration.php";
|
||||
$options = [];
|
||||
SESSION_START();
|
||||
$db = new PDO($dsn, MYSQL_BENUTZER, MYSQL_KENNWORT, $options);
|
||||
if(!isset($_SESSION["HelferID"])){ exit ; }
|
||||
if (!isset($_SESSION["HelferID"])) {
|
||||
exit ;
|
||||
}
|
||||
$HelferID = $_SESSION["HelferID"];
|
||||
|
||||
function read_from_db($db, $requestParams,$HelferID){
|
||||
function read_from_db($db, $requestParams, $HelferID)
|
||||
{
|
||||
$queryParams = [];
|
||||
$queryText = "
|
||||
select Schicht.SchichtID as id,
|
||||
|
|
@ -34,14 +38,14 @@ function read_from_db($db, $requestParams,$HelferID){
|
|||
|
||||
$query = $db->prepare($queryText);
|
||||
$query->execute($queryParams);
|
||||
error_log(date('Y-m-d H:i ') . print_r($queryText,true),3,"/var/log/dropamsee/debug.log");
|
||||
error_log(date('Y-m-d H:i ') . print_r($queryText, true), 3, "/var/log/dropamsee/debug.log");
|
||||
$events = $query->fetchAll();
|
||||
return $events;
|
||||
}
|
||||
|
||||
switch ($_SERVER["REQUEST_METHOD"]) {
|
||||
case "GET":
|
||||
$result = read_from_db($db, $_GET,$HelferID);
|
||||
$result = read_from_db($db, $_GET, $HelferID);
|
||||
break;
|
||||
case "POST":
|
||||
// only if changes will be allowed
|
||||
|
|
@ -52,4 +56,3 @@ switch ($_SERVER["REQUEST_METHOD"]) {
|
|||
}
|
||||
header("Content-Type: application/json");
|
||||
echo json_encode($result);
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -13,19 +13,19 @@
|
|||
<?php
|
||||
SESSION_START();
|
||||
|
||||
require_once ('konfiguration.php');
|
||||
include 'SQL.php';
|
||||
require_once 'konfiguration.php';
|
||||
require 'SQL.php';
|
||||
|
||||
$db_link = mysqli_connect (
|
||||
$db_link = mysqli_connect(
|
||||
MYSQL_HOST,
|
||||
MYSQL_BENUTZER,
|
||||
MYSQL_KENNWORT,
|
||||
MYSQL_DATENBANK
|
||||
);
|
||||
);
|
||||
|
||||
DatenbankAufDeutsch($db_link);
|
||||
|
||||
include '_login.php';
|
||||
require '_login.php';
|
||||
|
||||
// wird von _login.php miterledigt
|
||||
// TODO: hier wird HelferIsAdmin verwendet, woanders ist es AdminStatus
|
||||
|
|
@ -48,14 +48,11 @@ include '_login.php';
|
|||
<td > <img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;">
|
||||
<b>
|
||||
<?php
|
||||
if($HelferIsAdmin)
|
||||
{
|
||||
if ($HelferIsAdmin) {
|
||||
echo "Admin ";
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
echo "Helfer ";
|
||||
}
|
||||
}
|
||||
echo $HelferName;
|
||||
?>
|
||||
</b> </td>
|
||||
|
|
@ -72,17 +69,16 @@ include '_login.php';
|
|||
////////////////////////////////////////////////////////
|
||||
//$HelferID=72;
|
||||
|
||||
$db_erg = AlleSchichtenEinesHelfersVonJetzt($db_link,$HelferID);
|
||||
$db_erg = AlleSchichtenEinesHelfersVonJetzt($db_link, $HelferID);
|
||||
|
||||
|
||||
$iSQLCount = mysqli_num_rows($db_erg);
|
||||
//$iSQLCount = 3;
|
||||
|
||||
|
||||
$iCount=0;
|
||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC) and $iCount<3)
|
||||
{
|
||||
echo "<li>". $zeile['Ab'] . " ". $zeile['Was'] . "</li>";
|
||||
$iCount = 0;
|
||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC) and $iCount < 3) {
|
||||
echo "<li>" . $zeile['Ab'] . " " . $zeile['Was'] . "</li>";
|
||||
$iCount++;
|
||||
}
|
||||
|
||||
|
|
@ -140,8 +136,7 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC) and $iCount<3)
|
|||
|
||||
</tr>
|
||||
<?php
|
||||
if ($HelferIsAdmin)
|
||||
{
|
||||
if ($HelferIsAdmin) {
|
||||
?>
|
||||
<tr onclick="window.location.href='Admin.php';">
|
||||
<td><img src="Bilder/PfeilRechts2.jpeg" style="width:30px;height:30px;"><b> Admin</b></td>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
function showPassword(id) {
|
||||
function showPassword(id)
|
||||
{
|
||||
var x = document.getElementById(id);
|
||||
if (x.type === "password") {
|
||||
x.type = "text";
|
||||
|
|
@ -25,22 +26,30 @@ function showPassword(id) {
|
|||
//
|
||||
|
||||
//// collapse column rows that are not header
|
||||
function collapse_table_rows(){
|
||||
$(document).ready(function() {
|
||||
function collapse_table_rows()
|
||||
{
|
||||
$(document).ready(
|
||||
function () {
|
||||
$('tr:not(.header)').hide();
|
||||
|
||||
$('tr.header').click(function() {
|
||||
$(this).find('span').text(function(_, value) {
|
||||
$('tr.header').click(
|
||||
function () {
|
||||
$(this).find('span').text(
|
||||
function (_, value) {
|
||||
return value == '-' ? '+' : '-'
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
$(this).nextUntil('tr.header').slideToggle(100, function() {});
|
||||
});
|
||||
});
|
||||
$(this).nextUntil('tr.header').slideToggle(100, function () {});
|
||||
}
|
||||
);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function expand_all_table_rows(){
|
||||
function expand_all_table_rows()
|
||||
{
|
||||
|
||||
$('tr:not(.header)').hide(); // make all collapsed so that slideToggle doesnt close opened ones
|
||||
$('tr:not(.header)').slideToggle(100, function() {});
|
||||
$('tr:not(.header)').slideToggle(100, function () {});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,52 +1,49 @@
|
|||
|
||||
<?php
|
||||
// datenbank-defines extern
|
||||
require_once('/etc/helferdb_konfiguration.php');
|
||||
require_once '/etc/helferdb_konfiguration.php';
|
||||
// die folgenden Zeilen ohne Kommentarzeichen nach /etc/helferdb_konfiguration.php
|
||||
// kopieren und an die eigene Datenbank anpassen
|
||||
#define( 'MYSQL_HOST', 'localhost' );
|
||||
#define( 'MYSQL_BENUTZER', 'benutzername_der_datenbank' );
|
||||
#define( 'MYSQL_KENNWORT', 'passwort_des_db_nutzers' );
|
||||
#define( 'MYSQL_DATENBANK', 'name_der_datenbank' );
|
||||
#define( 'LOGFILE', "/pfad/zu/einer/www-schreibbaren/datei");
|
||||
#define( VERANSTALTUNGSNAME, "dubbelcon");
|
||||
#define( INFORMATIONS_URL, "http://drop-am-see.de/Gelaende");
|
||||
// define( 'MYSQL_HOST', 'localhost' );
|
||||
// define( 'MYSQL_BENUTZER', 'benutzername_der_datenbank' );
|
||||
// define( 'MYSQL_KENNWORT', 'passwort_des_db_nutzers' );
|
||||
// define( 'MYSQL_DATENBANK', 'name_der_datenbank' );
|
||||
// define( 'LOGFILE', "/pfad/zu/einer/www-schreibbaren/datei");
|
||||
// define( VERANSTALTUNGSNAME, "dubbelcon");
|
||||
// define( INFORMATIONS_URL, "http://drop-am-see.de/Gelaende");
|
||||
|
||||
date_default_timezone_set('Europe/Berlin');
|
||||
setlocale(LC_TIME, "de_DE.UTF-8");
|
||||
$start_date = new DateTimeImmutable("2023-05-18");
|
||||
define ('TAGE_DAUER', 4);
|
||||
define('TAGE_DAUER', 4);
|
||||
|
||||
// Geheimer Schlüssel für die Verschlüsselung von Tokens
|
||||
// das ist das Passwort, mit dem sich aus den Tokens auch wieder der Username/Email extrahieren lässt
|
||||
|
||||
# $secret_key = "irgendwasZufaelliges";
|
||||
// $secret_key = "irgendwasZufaelliges";
|
||||
// Geheimes Wort, das an die Email angehaengt wird, um zu ueberpruefen, dass die Addresse nicht abgeschnitten ist
|
||||
// das Wort darf kein "|" enthalten, das wird als Trenner verwendet
|
||||
|
||||
# $secret_verification = "irgendwasanderes,istegalwas";
|
||||
// $secret_verification = "irgendwasanderes,istegalwas";
|
||||
// urlprefix: https Addresse des php Scripts, das die Tokens empfaengt und einen Account anlegt
|
||||
// volle URL, da sie u.a. per Email ersetzt wird
|
||||
|
||||
# $urlprefix="https://meinserver.de/2023dev/UrlLogin.php";
|
||||
// $urlprefix="https://meinserver.de/2023dev/UrlLogin.php";
|
||||
|
||||
|
||||
|
||||
|
||||
// muss nicht angepasst werden // no changes needed
|
||||
// Zeitbereich: -1 davor, 0 kein Limit, 1-N Tag N der Con, 1000: nach der Con
|
||||
$ZeitBereichWerte=range(-1,TAGE_DAUER);
|
||||
array_push($ZeitBereichWerte,1000);
|
||||
$ZeitBereichWerte = range(-1, TAGE_DAUER);
|
||||
array_push($ZeitBereichWerte, 1000);
|
||||
define('ZEITBEREICHWERTE', $ZeitBereichWerte);
|
||||
$TageNamenDeutsch=array("So","Mo","Di","Mi","Do","Fr","Sa");
|
||||
$TageNamenDeutsch = array("So","Mo","Di","Mi","Do","Fr","Sa");
|
||||
|
||||
//Kalender-Konfiguration
|
||||
$dsn = "mysql:host=localhost;dbname=".MYSQL_DATENBANK; # dsn fuer Kalender
|
||||
$dsn = "mysql:host=localhost;dbname=" . MYSQL_DATENBANK; // dsn fuer Kalender
|
||||
$options = array(
|
||||
PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'",
|
||||
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
|
||||
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
|
||||
);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue