diff --git a/admin/configuration.php b/admin/configuration.php
index 783b4d0..e066a38 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -23,7 +23,7 @@
-
Konfigruation
+ Konfiguration
@@ -237,7 +236,8 @@
$strDatum = date("d.m.Y",$numDatum);
echo $strDatum."
";
echo nl2br(stripslashes($comment['comment']));
- echo "";
+ echo "".
+ "";
echo "";
}
echo "";
@@ -256,7 +256,8 @@
if ($file=$files->fetch(PDO::FETCH_ASSOC)) {
echo "";
echo "";
- echo "";
+ echo "".
+ "";
}
echo "\n";
@@ -270,13 +271,15 @@
echo "".$row['created_at']." | ";
if ($boolApprove) {
- $strApproved = ($row['approval']) ? ""
- : "" ;
- $strApproved .= " ";
+ $strApproved = ($row['approval']) ? ""
+ : "" ;
+ $strApproved .= " ";
echo "".$strApproved." | ";
}
- echo " ";
- echo "";
+ echo " | ".
+ " ";
+ echo "".
+ "";
echo " | ";
echo "\n";
@@ -327,7 +330,6 @@ $( document ).ready(function() {
return result===true;
})
-
$("#editobjectform").submit(function(event){
event.preventDefault();
@@ -369,7 +371,7 @@ $( document ).ready(function() {
$('#close').click(function(e){
$('#dialog_defect').hide();
});
-
+
= $strScript ?>
});
diff --git a/admin/login.php b/admin/login.php
index 0e747da..00cb74e 100644
--- a/admin/login.php
+++ b/admin/login.php
@@ -26,9 +26,9 @@ $boolLogin=true;
$strPassword = trim($_POST['password']);
$strSQL = "SELECT username,passwordhash,district,role FROM user WHERE username=:user";
$stmt = $db->prepare($strSQL);
- $stmt->bindValue(':user',$strUser);
- $result=$stmt->execute();
- if ($row=$result->fetch(PDO::FETCH_ASSOC)) {
+ $stmt->bindValue(":user",$strUser, PDO::PARAM_STR);
+ $stmt->execute();
+ if ($row=$stmt->fetch(PDO::FETCH_ASSOC)) {
$boolOk = $strDistrict==$row['district'] || $row['role']=="admin";
if (password_verify($strPassword,$row['passwordhash']) && $boolOk) {
$_SESSION['user']=$strUser;
@@ -62,6 +62,9 @@ $boolLogin=true;
diff --git a/config.php b/config.php
index ab05db2..c071312 100644
--- a/config.php
+++ b/config.php
@@ -64,7 +64,9 @@ while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
case "boolApprove":
$boolApprove = ($row['value']=="1");
break;
-
+ case "boolSidebar":
+ $boolSidebar = ($row['value']=="1");
+ break;
default: ;
//echo "Fehler bei ".$row['key'];
// Ende Lokalisierung
diff --git a/css/style.css b/css/style.css
index e8de1c9..ca3d413 100644
--- a/css/style.css
+++ b/css/style.css
@@ -97,6 +97,12 @@ i.wa {
color:darkgray;
}
+.logo_navbar {
+ height: 2.5em;
+ background-color:white;
+ margin: 0 1em 0 0;
+}
+
.jumbotron {
background-color:orange;
}
diff --git a/datenschutz.php b/datenschutz.php
index d032498..010a9a3 100644
--- a/datenschutz.php
+++ b/datenschutz.php
@@ -21,7 +21,11 @@