Merge 9dafc736d3 into b5cebdadfb

2024-11-23 22:30:41 +01:00 · 2021-08-16 15:22:42 +02:00
10 changed files with 54 additions and 52 deletions
--- a/.htaccess
+++ b/.htaccess
@ -26,26 +26,33 @@

 #Deny every *.php file
 <Files *.php>
-    Require all granted
+    Order Deny,Allow
+    Deny from all
+    Allow from 127.0.0.1
 </Files>

 #allow following files
 <Files index.php>
-    Require all granted
+    Order Allow,Deny
+    Allow from all
 </Files>

 <Files api.php>
-    Require all granted
+    Order Allow,Deny
+    Allow from all
 </Files>

 <Files login.php>
-    Require all granted
+    Order Allow,Deny
+    Allow from all
 </Files>

 <Files logout.php>
-    Require all granted
+    Order Allow,Deny
+    Allow from all
 </Files>

 <Files install*.php>
-    Require all granted
+    Order Allow,Deny
+    Allow from all
 </Files>
--- a/config/config.php
+++ b/config/config.php
@ -1,6 +1,6 @@
-<?php 
-$CONFIG = array (
-  'installed' => false,
-);
-
-?>
+<?php 
+$CONFIG = array (
+  'installed' => false,
+);
+
+?>
--- a/cont/list.php
+++ b/cont/list.php
@ -33,12 +33,7 @@
      }

      print_r("<div class='list-row $div_item_row_classes $div_item_row_color_classes'>");
-        print_r("<div class='$div_item_checkbox_classes'>");
-          print_r("<div class='custom-control custom-checkbox'>");
-            print_r("<input type='checkbox' class='$input_item_checkbox_classes custom-control-input' data-color='$color_theme' id='$item->ID-checkbox' data-id='$item->ID' $checked>");
-            print_r("<label class='custom-control-label' for='$item->ID-checkbox'></label>");
-          print_r("</div>");
-        print_r("</div>");
+        print_r("<div class='$div_item_checkbox_classes'><input type='checkbox' class='$input_item_checkbox_classes' data-color='$color_theme' data-id='$item->ID' $checked></div>");
        print_r("<div class='list-row-amount $div_item_quantity_classes' data-amount='$item->Anzahl' data-unit='$item->Einheit'>$item->Anzahl $item->Einheit</div>");
        print_r("<div class='list-row-name $div_item_name_classes'>$item->Name</div>");
        print_r("<div class='$div_item_menu dropdown'>");
@ -75,5 +70,6 @@
        <button class="btn btn-outline-secondary" type="submit" id="button-addon2"><i class="fas fa-plus"></i></button>
      </div>
    </div>
+
  </form>
 </div>
--- a/install/install.php
+++ b/install/install.php
@ -75,6 +75,6 @@
      </form>
    </div>

-    <script src="/js/bootstrap.bundle.min.js"></script>
+    <script src="bin/bootstrap.bundle.min.js"></script>
  </body>
 </html>
--- a/install/install_adduser.php
+++ b/install/install_adduser.php
@ -32,6 +32,6 @@
  </div>


-  <script src="/js/bootstrap.bundle.min.js"></script>
+  <script src="js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
--- a/js/adduser.js
+++ b/js/adduser.js
@ -27,7 +27,6 @@ $(document).ready(function () {
    });
 });
 function userPopover(title, text){
-    $("#newuser").popover('dispose');
    $("#newuser").data("toggle", "popover");
    $("#newuser").data("container", "body");
    $("#newuser").data("placement", "bottom");
--- a/js/list.js
+++ b/js/list.js
@ -16,7 +16,7 @@ function highlightNewEntry(){
  if(match!=null){  
    var newID = match[1];
    var checkBox = $(`[data-id='${newID}']`);
-    var newRow = checkBox.parent().parent().parent();
+    var newRow = checkBox.parent().parent();
    newRow.removeClass($(checkBox).data("color"));
    newRow.addClass("alert-primary");
    setTimeout(function () {
@ -111,28 +111,28 @@ function checkItem() {
    },
    success: function () {
      var color = $(dataIdSelector).data("color");
-      $(dataIdSelector).parent().parent().parent().removeClass("bg-danger");
-      $(dataIdSelector).parent().parent().parent().find(".dropdown-menu-button").removeClass("btn-danger");
+      $(dataIdSelector).parent().parent().removeClass("bg-danger");
+      $(dataIdSelector).parent().parent().find(".dropdown-menu-button").removeClass("btn-danger");

      if($(dataIdSelector).prop("checked")){
-        $(dataIdSelector).parent().parent().parent().removeClass(color);
-        $(dataIdSelector).parent().parent().parent().addClass("bg-success");
+        $(dataIdSelector).parent().parent().removeClass(color);
+        $(dataIdSelector).parent().parent().addClass("bg-success");
      }
      else{
-        $(dataIdSelector).parent().parent().parent().removeClass("bg-success");
-        $(dataIdSelector).parent().parent().parent().addClass(color);
+        $(dataIdSelector).parent().parent().removeClass("bg-success");
+        $(dataIdSelector).parent().parent().addClass(color);
      }
    },
    error: function () {
-      $(dataIdSelector).parent().parent().parent().addClass("bg-danger");
-      $(dataIdSelector).parent().parent().parent().data("toggle", "popover");
-      $(dataIdSelector).parent().parent().parent().data("container", "body");
-      $(dataIdSelector).parent().parent().parent().data("placement", "top");
-      $(dataIdSelector).parent().parent().parent().data("html", true);
-      $(dataIdSelector).parent().parent().parent().data("trigger", "focus");
-      $(dataIdSelector).parent().parent().parent().data("content", "Dieses Element konnte nicht gespeichert werden.<br />Bitte die Seite Aktualisieren");
-      $(dataIdSelector).parent().parent().parent().attr("title", "Fehler!");
-      $(dataIdSelector).parent().parent().parent().popover('show');
+      $(dataIdSelector).parent().parent().addClass("bg-danger");
+      $(dataIdSelector).parent().parent().data("toggle", "popover");
+      $(dataIdSelector).parent().parent().data("container", "body");
+      $(dataIdSelector).parent().parent().data("placement", "top");
+      $(dataIdSelector).parent().parent().data("html", true);
+      $(dataIdSelector).parent().parent().data("trigger", "focus");
+      $(dataIdSelector).parent().parent().data("content", "Dieses Element konnte nicht gespeichert werden.<br />Bitte die Seite Aktualisieren");
+      $(dataIdSelector).parent().parent().attr("title", "Fehler!");
+      $(dataIdSelector).parent().parent().popover('show');
    }
  });
 }
--- a/php/classes.list.php
+++ b/php/classes.list.php
@ -1,7 +1,7 @@
 <?php
  class item {
    public $ID, $Anzahl, $Einheit, $Name, $Erledigt;
-    function __construct($ID, $Anzahl, $Einheit, $Name, $Erledigt){
+    function item($ID, $Anzahl, $Einheit, $Name, $Erledigt){
      $this->ID = $ID;
      $this->Anzahl = $Anzahl;
      $this->Einheit = $Einheit;
@ -16,7 +16,7 @@
      array_push($this->list, $current);
    }

-    function __construct(){
+    function shopping(){
      include $_SESSION["docroot"].'/config/config.php';
      include $_SESSION["docroot"].'/php/connect.php';
      $result = $mysqli->query("SELECT * FROM `ViewEinkauf` ORDER BY `ViewEinkauf`.`Name` ASC;");
@ -132,7 +132,7 @@

  class unit {
    public $ID, $Name, $Standard;
-    function __construct($ID, $Name, $Standard){
+    function unit($ID, $Name, $Standard){
       $this->ID = $ID;
       $this->Name = $Name;
       $this->Standard = $Standard;
@ -145,7 +145,7 @@
      array_push($this->list, $current);
    }

-    function __construct(){
+    function units(){
      include $_SESSION["docroot"].'/config/config.php';
      include $_SESSION["docroot"].'/php/connect.php';
      $result = $mysqli->query("SELECT * FROM `Einheit`;");
--- a/php/classes.recipe.php
+++ b/php/classes.recipe.php
@ -1,7 +1,6 @@
 <?php
  class unit {
    public $ID, $Name, $Standard;
-    function __construct(){}
  }
  class unitList {
    public $units = array();
@ -13,7 +12,7 @@
      $unit->Standard = $Standard;
      array_push($this->units, $unit);
    }
-    function __construct(){
+    function unitList(){
      include $_SESSION["docroot"].'/php/connect.php';
      $result = $mysqli->query("SELECT * FROM `Einheit`;");
      while($item = $result->fetch_assoc()){
@ -34,7 +33,7 @@

  class ingredient {
    public $ID, $Menge, $Einheit, $Name;
-    function __construct($ID, $Menge, $Einheit, $Name){
+    function ingredient($ID, $Menge, $Einheit, $Name){
      $this->ID = $ID;
      $this->Menge = $Menge;
      $this->Einheit = $Einheit;
@ -45,7 +44,7 @@
  class recipe {
    public $ID, $Name, $Dauer, $Beschreibung;
    public $Zutaten = array();
-    function __construct($ID, $Name, $Dauer, $Beschreibung){
+    function recipe($ID, $Name, $Dauer, $Beschreibung){
      $this->ID = $ID;
      $this->Name = $Name;
      $this->Dauer = $Dauer;
--- a/style/themes/sketchy.css
+++ b/style/themes/sketchy.css
@ -7095,26 +7095,27 @@ select.form-control {

 [type="checkbox"] {
  position: relative;
+  -webkit-appearance: none;
  appearance: none;
  cursor: pointer; }
  [type="checkbox"]:before {
    content: "";
-    position: absolute;
-    left: -1.2em;
-    top: -0.9em;
+    /* position: absolute; */
+    /* left: -1.2em; */
+    /* top: -0.9em; */
    display: inline-block;
    width: 15px;
    height: 16px;
-    border: 2px solid #333;
+    border: 2px solid #fff;
    border-radius: 2px 8px 2px 4px / 5px 3px 5px 3px; }
  [type="checkbox"]:checked:after {
    content: "x";
    position: absolute;
-    left: -0.64em;
-    top: -0.48em;
+    left: 3px;
+    /* top: -0.48em; */
    font-size: 1.5rem;
    line-height: 0.5;
-    color: #333; }
+    color: #fff; }
  [type="checkbox"]:disabled:before {
    border: 2px solid #aaa; }