whupfeld/melder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sidebar

Browse Source
This commit is contained in:
Walter Hupfeld 2024-03-15 19:46:25 +01:00
parent e325b14ee7
commit 0d5fb5e5da
13 changed files with 77 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/configuration.php
View File

@ -23,7 +23,7 @@
<link href="../css/font-awesome.min.css" rel="stylesheet"> <link href="../css/font-awesome.min.css" rel="stylesheet">
<script src="../js/jquery.min.js"></script> <script src="../js/jquery.min.js"></script>
<title>Konfigruation</title> <title>Konfiguration</title>
<style> <style>
.leftlabel { width: 10em;} .leftlabel { width: 10em;}
input[type="text"] { width: 18em;} input[type="text"] { width: 18em;}
@ -91,9 +91,11 @@
<input type="checkbox" id="districtSelection" name="districtSelection" <?= ($boolDistrictSelection) ? "checked=\"checked\"" :"" ?> > <input type="checkbox" id="districtSelection" name="districtSelection" <?= ($boolDistrictSelection) ? "checked=\"checked\"" :"" ?> >
<label for="districtSelection">Auswahl Kreise in Navigation</label><br> <label for="districtSelection">Auswahl Kreise in Navigation</label><br>
<input type="checkbox" id="approve" name="approve" <?= ($boolApprove) ? "checked=\"checked\"" :"" ?> > <input type="checkbox" id="approve" name="approve" <?= ($boolApprove) ? "checked=\"checked\"" :"" ?> >
<label for="approve">Eingaben genehmigen</label> <label for="approve">Eingaben genehmigen</label><br>
<input type="checkbox" id="sidebar" name="sidebar" <?= ($boolSidebar) ? "checked=\"checked\"" :"" ?> >
<label for="sidebar">Sidebar anzeigen</label>
<br> <br>
<label class="leftlabel">Uplaod-Pfad:</label> <label class="leftlabel">Upload-Pfad:</label>
<input type="text" class="wide" name="uploaddir" id="uploaddir" value="<?=$uploaddir?>"> <input type="text" class="wide" name="uploaddir" id="uploaddir" value="<?=$uploaddir?>">
</div> </div>
</div> </div>

3
admin/configuration_chk.php
View File

@ -17,7 +17,7 @@
$boolDefect = (isset($_POST['defect'])) ? "1" : "0"; $boolDefect = (isset($_POST['defect'])) ? "1" : "0";
$boolDistrictSelection = (isset($_POST['districtSelection'])) ? "1" : "0"; $boolDistrictSelection = (isset($_POST['districtSelection'])) ? "1" : "0";
$boolApprove = (isset($_POST['approve'])) ? "1" : "0"; $boolApprove = (isset($_POST['approve'])) ? "1" : "0";
$boolSidebar = (isset($_POST['sidebar'])) ? "1" : "0";
$strUploaddir = $_POST['uploaddir']; $strUploaddir = $_POST['uploaddir'];
$strTitle = $_POST['title']; $strTitle = $_POST['title'];
@ -45,6 +45,7 @@
$db->query("UPDATE `config` SET `value`= '$boolDefect' WHERE `key`='boolDefect'"); $db->query("UPDATE `config` SET `value`= '$boolDefect' WHERE `key`='boolDefect'");
$db->query("UPDATE `config` SET `value`= '$boolUpload' WHERE `key`='boolUpload'"); $db->query("UPDATE `config` SET `value`= '$boolUpload' WHERE `key`='boolUpload'");
$db->query("UPDATE `config` SET `value`= '$boolApprove' WHERE `key`='boolApprove'"); $db->query("UPDATE `config` SET `value`= '$boolApprove' WHERE `key`='boolApprove'");
$db->query("UPDATE `config` SET `value`= '$boolSidebar' WHERE `key`='boolSidebar'");
$db->query("UPDATE `config` SET `value`= '$boolDistrictSelection' WHERE `key`='boolDistrictSelection'"); $db->query("UPDATE `config` SET `value`= '$boolDistrictSelection' WHERE `key`='boolDistrictSelection'");
header("Location: configuration.php"); header("Location: configuration.php");

2
admin/export.php
View File

@ -32,7 +32,7 @@
<link href="../css/font-awesome.min.css" rel="stylesheet"> <link href="../css/font-awesome.min.css" rel="stylesheet">
<script src="../js/jquery.min.js"></script> <script src="../js/jquery.min.js"></script>
<title>Konfigruation</title> <title>Konfiguration</title>
<style> <style>
.leftlabel { width: 10em;} .leftlabel { width: 10em;}
input[type="text"] { width: 18em;} input[type="text"] { width: 18em;}

2
admin/geocoding.php
View File

@ -36,7 +36,7 @@
<link href="../css/font-awesome.min.css" rel="stylesheet"> <link href="../css/font-awesome.min.css" rel="stylesheet">
<script src="../js/jquery.min.js"></script> <script src="../js/jquery.min.js"></script>
<title>Konfigruation</title> <title>Konfiguration</title>
<style> <style>
.leftlabel { width: 10em;} .leftlabel { width: 10em;}
input[type="text"] { width: 18em;} input[type="text"] { width: 18em;}

22
admin/index.php
View File

@ -144,7 +144,6 @@
<script src="../js/leaflet.awesome-markers.js"></script> <script src="../js/leaflet.awesome-markers.js"></script>
<script src="../js/jquery.fancybox.min.js"></script> <script src="../js/jquery.fancybox.min.js"></script>
<title>Eintragsliste</title> <title>Eintragsliste</title>
<style> <style>
.tdmap { height:350px; width:300px;} .tdmap { height:350px; width:300px;}
</style> </style>
@ -237,7 +236,8 @@
$strDatum = date("d.m.Y",$numDatum); $strDatum = date("d.m.Y",$numDatum);
echo $strDatum."</em><br>"; echo $strDatum."</em><br>";
echo nl2br(stripslashes($comment['comment'])); echo nl2br(stripslashes($comment['comment']));
echo "<a class='left' href='".$_SERVER['PHP_SELF']."?delcid=".$comment['id']."&csrf=".$_SESSION['csrf_token']."'><i class='fa fa-trash'></i></a>"; echo "<a class='left' href='".$_SERVER['PHP_SELF']."?delcid=".$comment['id']."&csrf=".$_SESSION['csrf_token']."'>".
"<span data-toggle='tooltip' title='Freischalten/Sperren'><i class='fa fa-trash'></i></span></a>";
echo "</div>"; echo "</div>";
} }
echo "</td>"; echo "</td>";
@ -256,7 +256,8 @@
if ($file=$files->fetch(PDO::FETCH_ASSOC)) { if ($file=$files->fetch(PDO::FETCH_ASSOC)) {
echo "<a href='../images/".$file['filename']."' data-fancybox data-caption='".$strDefect."'>"; echo "<a href='../images/".$file['filename']."' data-fancybox data-caption='".$strDefect."'>";
echo "<img src='../images/".$file['filename']."' style='width:150px'></a>"; echo "<img src='../images/".$file['filename']."' style='width:150px'></a>";
echo "<a href='".$_SERVER['PHP_SELF']."?delfid=".$file['id']."&csrf=".$_SESSION['csrf_token']."'><i class='fa fa-trash'></i></a>"; echo "<a href='".$_SERVER['PHP_SELF']."?delfid=".$file['id']."&csrf=".$_SESSION['csrf_token']."'>".
"<span data-toggle='tooltip' title='Bild löschen'><i class='fa fa-trash'></i></span></a>";
} }
echo "</td>\n"; echo "</td>\n";
@ -270,13 +271,15 @@
echo "<td>".$row['created_at']."</td>"; echo "<td>".$row['created_at']."</td>";
if ($boolApprove) { if ($boolApprove) {
$strApproved = ($row['approval']) ? "<i class='fa fa-check' style='color:green'></i>" $strApproved = ($row['approval']) ? "<span data-toggle='data-toggle' title='Eintrag sperren'><i class='fa fa-check' style='color:green'></i>"
: "<i class='fa fa-circle' style='color:red'></i>" ; : "<span data-toggle='tooltip' title='Eintrag freischalten'><i class='fa fa-circle' style='color:red'></i>" ;
$strApproved .= " <i class='fa fa-recycle'></i>"; $strApproved .= " <i class='fa fa-recycle'></i></span>";
echo "<td><a href='".$_SERVER['PHP_SELF']."?approvalId=".$id."&csrf=".$_SESSION['csrf_token']."'>".$strApproved."</a></td>"; echo "<td><a href='".$_SERVER['PHP_SELF']."?approvalId=".$id."&csrf=".$_SESSION['csrf_token']."'>".$strApproved."</a></td>";
} }
echo "<td><a class='del' href='".$_SERVER['PHP_SELF']."?delid=".$id."&csrf=".$_SESSION['csrf_token']."'><i class='fa fa-trash'></i></a>&nbsp;"; echo "<td><a class='del' href='".$_SERVER['PHP_SELF']."?delid=".$id."&csrf=".$_SESSION['csrf_token']."'>".
echo "<a class='edit_defect' href='#' id='edit_".$id."' value='".$id."'><i class='fa fa-pencil'></i></a>"; "<span data-toggle='tooltip' title='Eintrag löschen'><i class='fa fa-trash'></i></span></a>&nbsp;";
echo "<a class='edit_defect' href='#' id='edit_".$id."' value='".$id."'>".
"<span data-toggle='tooltip' title='Eintrag editieren'><i class='fa fa-pencil'></span></i></a>";
echo "</td>"; echo "</td>";
echo "</tr>\n"; echo "</tr>\n";
@ -327,7 +330,6 @@ $( document ).ready(function() {
return result===true; return result===true;
}) })
$("#editobjectform").submit(function(event){ $("#editobjectform").submit(function(event){
event.preventDefault(); event.preventDefault();
@ -369,7 +371,7 @@ $( document ).ready(function() {
$('#close').click(function(e){ $('#close').click(function(e){
$('#dialog_defect').hide(); $('#dialog_defect').hide();
}); });
<?= $strScript ?> <?= $strScript ?>
}); });
</script> </script>

20
admin/login.php
View File

@ -26,9 +26,9 @@ $boolLogin=true;
$strPassword = trim($_POST['password']); $strPassword = trim($_POST['password']);
$strSQL = "SELECT username,passwordhash,district,role FROM user WHERE username=:user"; $strSQL = "SELECT username,passwordhash,district,role FROM user WHERE username=:user";
$stmt = $db->prepare($strSQL); $stmt = $db->prepare($strSQL);
$stmt->bindValue(':user',$strUser); $stmt->bindValue(":user",$strUser, PDO::PARAM_STR);
$result=$stmt->execute(); $stmt->execute();
if ($row=$result->fetch(PDO::FETCH_ASSOC)) { if ($row=$stmt->fetch(PDO::FETCH_ASSOC)) {
$boolOk = $strDistrict==$row['district'] || $row['role']=="admin"; $boolOk = $strDistrict==$row['district'] || $row['role']=="admin";
if (password_verify($strPassword,$row['passwordhash']) && $boolOk) { if (password_verify($strPassword,$row['passwordhash']) && $boolOk) {
$_SESSION['user']=$strUser; $_SESSION['user']=$strUser;
@ -62,6 +62,9 @@ $boolLogin=true;
<!-- Navbar --> <!-- Navbar -->
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top"> <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<?php if (!$boolSidebar): ?>
<a href="start.php"><img class="logo_navbar" src="../<?=$strLogo?>" alt="Logo"></a>
<?php endif; ?>
<a class="navbar-brand" href="#"><?=$strTitle?> <?=$strDistrictTitle?></a> <a class="navbar-brand" href="#"><?=$strTitle?> <?=$strDistrictTitle?></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
@ -76,6 +79,17 @@ $boolLogin=true;
</li> </li>
</ul> </ul>
</div> </div>
<ul class="navbar-nav mr-auto right">
<li class="nav-item">
<a class="nav-link" href="../impressum.php">Impressum</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../datenschutz.php">Datenschutzerklärung</a>
</li>
<li class="nav-item active">
<a class="nav-link" href="login.php">Login <span class="sr-only">(current)</span></a>
</li>
</ul>
</nav> </nav>
<!-- Ende Navbar --> <!-- Ende Navbar -->

4
config.php
View File

@ -64,7 +64,9 @@ while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
case "boolApprove": case "boolApprove":
$boolApprove = ($row['value']=="1"); $boolApprove = ($row['value']=="1");
break; break;
case "boolSidebar":
$boolSidebar = ($row['value']=="1");
break;
default: ; default: ;
//echo "Fehler bei ".$row['key']; //echo "Fehler bei ".$row['key'];
// Ende Lokalisierung // Ende Lokalisierung

6
css/style.css
View File

@ -97,6 +97,12 @@ i.wa {
color:darkgray; color:darkgray;
} }
.logo_navbar {
height: 2.5em;
background-color:white;
margin: 0 1em 0 0;
}
.jumbotron { .jumbotron {
background-color:orange; background-color:orange;
} }

6
datenschutz.php
View File

@ -21,7 +21,11 @@
<!-- Navbar --> <!-- Navbar -->
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top"> <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<a class="navbar-brand" href="#"><?=$strTitle?> <?=$strDistrictTitle?></a> <?php if (!$boolSidebar): ?>
<a href="start.php"><img class="logo_navbar" src="<?=$strLogo?>" alt="Logo"></a>
<?php endif; ?>
<a class="navbar-brand" href="#"><?=$strTitle?> &raquo; <?=$strDistrictTitle?></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>

5
impressum.php
View File

@ -21,7 +21,10 @@
<!-- Navbar --> <!-- Navbar -->
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top"> <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<a class="navbar-brand" href="#"><?=$strTitle?> <?=$strDistrictTitle?></a> <?php if (!$boolSidebar): ?>
<a href="start.php"><img class="logo_navbar" src="<?=$strLogo?>" alt="Logo"></a>
<?php endif; ?>
<a class="navbar-brand" href="#"><?=$strTitle?> &raquo; <?=$strDistrictTitle?></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>

36
index.php
View File

@ -85,18 +85,15 @@
<body> <body>
<!-- Navbar --> <!-- Navbar -->
<!--
<?php
print_r($_SESSION);
?>
-->
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top"> <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<a class="navbar-brand" href="#"><?= $strTitle ?> <?=$strDistrictTitle?></a> <?php if (!$boolSidebar): ?>
<a href="start.php"><img class="logo_navbar" src="<?=$strLogo?>" alt="Logo"></a>
<?php endif; ?>
<a class="navbar-brand" href="#"><?= $strTitle ?> &raquo; <?=$strDistrictTitle?></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbars"> <div class="collapse navbar-collapse" id="navbars">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<li class="nav-item active"> <li class="nav-item active">
<a class="nav-link" href="index.php?ref=1">Karte <span class="sr-only">(current)</span></a> <a class="nav-link" href="index.php?ref=1">Karte <span class="sr-only">(current)</span></a>
@ -134,29 +131,28 @@
<!-- Ende Navbar --> <!-- Ende Navbar -->
<div class="container-fluid" style="margin-top: 4em;"> <div class="container-fluid" style="margin-top: 4em;">
<?php if ($boolSidebar): ?>
<div class="row"> <div class="row">
<nav class="col-md-2 d-none d-md-block bg-light sidebar"> <nav class="col-md-2 d-none d-md-block bg-light sidebar">
<div class="sidebar-sticky"> <div class="sidebar-sticky">
<a href="start.php"><img class="logo" src="<?=$strLogo?>" alt="Logo" ></a> <a href="start.php"><img class="logo" src="<?=$strLogo?>" alt="Logo" ></a>
<ul class="nav flex-column"> <ul class="nav flex-column">
<?php <?php foreach ($arrTopic as $key=>$topic): ?>
foreach ($arrTopic as $key=>$topic) { <li class='nav-item'>
echo "<li class='nav-item'>"; <label>
echo "<label>"; <a class='nav-link'><?=$arrIcon[$key]?>
echo "<a class='nav-link'>".$arrIcon[$key]." "; <input type='checkbox' name='check_".$key."' id='check_".$key."' class='check' checked='checked'>
echo "<input type='checkbox' name='check_".$key."' id='check_".$key."' class='check' checked='checked' > "; <?=$topic?></a></label>
echo $topic."</a></label>"; </li>
echo "</li>"; <?php endforeach; ?>
}
?>
</ul> </ul>
</div> </div>
</nav> </nav>
<?php endif; ?>
<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-1"> <main role="main" class="<?= ($boolSidebar)?"col-md-9 col-lg-10":"col-md-12 col-lg-12"?> ml-sm-auto px-1">
<div id="mapid"></div> <div id="mapid"></div>
</main> </main>
</div> <?php if ($boolSidebar) echo "</div>"; ?>
<!-- row --> <!-- row -->
</div> </div>
<!-- container-fluid --> <!-- container-fluid -->

5
liste.php
View File

@ -51,7 +51,10 @@
<body> <body>
<!-- Navbar --> <!-- Navbar -->
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top"> <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<a class="navbar-brand" href="#"><?= $strTitle ?> <?=$strDistrictTitle?></a> <?php if (!$boolSidebar): ?>
<a href="start.php"><img class="logo_navbar" src="<?=$strLogo?>" alt="Logo"></a>
<?php endif; ?>
<a class="navbar-brand" href="#"><?= $strTitle ?> &raquo; <?=$strDistrictTitle?></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>

2
setup/index.php
View File

@ -129,7 +129,7 @@ exit();
<input type="checkbox" id="userinfo" name="userinfo" <?= ($boolUserinfo) ? "checked=\"checked\"" :"" ?> > <input type="checkbox" id="userinfo" name="userinfo" <?= ($boolUserinfo) ? "checked=\"checked\"" :"" ?> >
<label for="userinfo">Nutzerinformation (Alter/Verkehrsmittel)</label> <label for="userinfo">Nutzerinformation (Alter/Verkehrsmittel)</label>
<br> <br>
<label class="leftlabel">Uplaod-Pfad:</label> <label class="leftlabel">Upload-Pfad:</label>
<input type="text" class="wide" name="uploaddir" id="uploaddir" value="<?=$strImagePath?>"> <input type="text" class="wide" name="uploaddir" id="uploaddir" value="<?=$strImagePath?>">
</div> </div>
</div> </div>