From 4d6ec1c5a5c01d7a5bbd48f346e382f12ee3ff98 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Mon, 18 Apr 2016 22:07:37 -0400
Subject: [PATCH] Remove password functionality

After the change to 0.0.0.0 there will
be no need for a password
---
 list.php          | 151 +++++++++-------------------------------------
 php/add.php       |   9 +--
 php/checkPass.php |  10 ---
 php/functions.php |   5 --
 php/sub.php       |   9 +--
 5 files changed, 33 insertions(+), 151 deletions(-)
 delete mode 100644 php/checkPass.php
 delete mode 100644 php/functions.php

diff --git a/list.php b/list.php
index 8087f20f..c85523f9 100644
--- a/list.php
+++ b/list.php
@@ -37,32 +37,6 @@ function getFullName() {
     Failure! Something went wrong.
 </div>
 
-<!-- Password Modal -->
-<div id="passModal" class="modal fade" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">Enter Your Pi-hole Password</h4>
-            </div>
-            <div class="modal-body">
-                Please enter your Pi-hole password to proceed.
-                <div id="alPassword" class="alert alert-danger" role="alert" hidden="true">
-                    Wrong Password! Please try again.
-                </div>
-                <div class="form-group">
-                    <label for="passInput">Password:</label>
-                    <input id="passInput" type="password" class="form-control">
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal" onclick="$('#alPassword').hide()">Cancel</button>
-                <button id="passBtn" type="button" class="btn btn-primary">Enter</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <!-- Domain List -->
 <ul class="list-group" id="list"></ul>
 
@@ -72,10 +46,6 @@ require "footer.php";
 
 <script>
     window.onload = refresh;
-    var password = "";
-    $("#passModal").on("shown.bs.modal", function() {
-       $("#passInput").focus();
-    });
     
     function refresh() {
         $.ajax({
@@ -111,101 +81,38 @@ require "footer.php";
         if(domain.length === 0)
             return;
         
-        getPassword(function() {
-            document.getElementById("alInfo").hidden = false;
-            document.getElementById("alSuccess").hidden = true;
-            document.getElementById("alFailure").hidden = true;
-            $.ajax({
-                url: "php/add.php",
-                method: "get",
-                data: {"domain":domain, "list":"<?php echo $list ?>", "pass":password},
-                success: function(response) {
-                    if(response.length !== 0)
-                        return;
-                    document.getElementById("alSuccess").hidden = false;
-                    refresh();
-                },
-                error: function(jqXHR, exception) {
-                    document.getElementById("alFailure").hidden = false;
-                }
-            });
-        })
-    }
-    
-    function sub(index, entry) {
-        getPassword(function() {
-            $("#"+index).hide("highlight");
-            $.ajax({
-                url: "php/sub.php",
-                method: "get",
-                data: {"domain":entry, "list":"<?php echo $list ?>", "pass":password},
-                success: function(response) {
-                    if(response.length !== 0)
-                        return;
-                    document.getElementById("list").removeChild(document.getElementById(index));
-                },
-                error: function(jqXHR, exception) {
-                    alert("Failed to remove the domain!");
-                }
-            });
+        document.getElementById("alInfo").hidden = false;
+        document.getElementById("alSuccess").hidden = true;
+        document.getElementById("alFailure").hidden = true;
+        $.ajax({
+            url: "php/add.php",
+            method: "get",
+            data: {"domain":domain, "list":"<?php echo $list ?>"},
+            success: function(response) {
+                if(response.length !== 0)
+                    return;
+                document.getElementById("alSuccess").hidden = false;
+                refresh();
+            },
+            error: function(jqXHR, exception) {
+                document.getElementById("alFailure").hidden = false;
+            }
         });
     }
     
-    function getPassword(callback) {
-        // Check password and return
-        if(password.length !== 0) {
-            $.ajax({
-                url: "php/checkPass.php",
-                method: "get",
-                data: {"pass":password},
-                success: function(response) {
-                    if(response === "Correct")
-                        callback();
-                },
-                error: function(jqXHR, exception) {
-                    alert("Failed to check password!");
-                }
-            });
-            return;
-        }
-        
-        // Prompt the user for password
-        var modal = $("#passModal");
-        modal.modal();
-        
-        // Handle enter button
-        $("#passBtn").on("click", function() {
-            var passInput = $("#passInput");
-            var passAlert = $("#alPassword");
-            password = passInput.val();
-            
-            // Execute callback if entered
-            if(password.length !== 0) {
-                // Check if password is correct
-                $.ajax({
-                    url: "php/checkPass.php",
-                    method: "get",
-                    data: {"pass":password},
-                    success: function(response) {
-                        if(response === "Correct") {
-                            passInput.html("");
-                            passAlert.hide();
-                            modal.modal("hide");
-                            callback();
-                        }
-                        else {
-                            passAlert.show();
-                            password = "";
-                        }
-                    },
-                    error: function(jqXHR, exception) {
-                        alert("Failed to check password!");
-                        password = "";
-                    }
-                });
-            }
-            else {
-                passAlert.show()
+    function sub(index, entry) {
+        $("#"+index).hide("highlight");
+        $.ajax({
+            url: "php/sub.php",
+            method: "get",
+            data: {"domain":entry, "list":"<?php echo $list ?>"},
+            success: function(response) {
+                if(response.length !== 0)
+                    return;
+                document.getElementById("list").removeChild(document.getElementById(index));
+            },
+            error: function(jqXHR, exception) {
+                alert("Failed to remove the domain!");
             }
         });
     }
diff --git a/php/add.php b/php/add.php
index c602119d..cfe632b8 100644
--- a/php/add.php
+++ b/php/add.php
@@ -1,12 +1,7 @@
 <?php
-if(!isset($_GET['domain'], $_GET['list'], $_GET['pass']))
+if(!isset($_GET['domain'], $_GET['list']))
     die();
 
-include "functions.php";
-
-if(!checkPass($_GET['pass']))
-    die("Wrong Password");
-
 switch($_GET['list']) {
     case "white":
         exec("/usr/local/bin/whitelist.sh -q ${_GET['domain']}");
@@ -14,4 +9,4 @@ switch($_GET['list']) {
     case "black":
         exec("/usr/local/bin/blacklist.sh -q ${_GET['domain']}");
         break;
-}
\ No newline at end of file
+}
diff --git a/php/checkPass.php b/php/checkPass.php
deleted file mode 100644
index 6288d761..00000000
--- a/php/checkPass.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-if(!isset($_GET['pass']))
-    die("No password entered");
-
-include "functions.php";
-
-if(checkPass($_GET['pass']))
-    echo "Correct";
-else
-    echo "Wrong";
\ No newline at end of file
diff --git a/php/functions.php b/php/functions.php
deleted file mode 100644
index d06a5bc9..00000000
--- a/php/functions.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-function checkPass($pass) {
-    // Check password
-    return $pass == str_replace(array("\r", "\n"), '', file_get_contents("/etc/pihole/password.txt"));
-}
\ No newline at end of file
diff --git a/php/sub.php b/php/sub.php
index 9c5862e9..c753ae92 100644
--- a/php/sub.php
+++ b/php/sub.php
@@ -1,12 +1,7 @@
 <?php
-if(!isset($_GET['domain'], $_GET['list'], $_GET['pass']))
+if(!isset($_GET['domain'], $_GET['list']))
     die();
 
-include "functions.php";
-
-if(!checkPass($_GET['pass']))
-    die("Wrong Password");
-
 switch($_GET['list']) {
     case "white":
         exec("/usr/local/bin/whitelist.sh -q -d ${_GET['domain']}");
@@ -14,4 +9,4 @@ switch($_GET['list']) {
     case "black":
         exec("/usr/local/bin/blacklist.sh -q -d ${_GET['domain']}");
         break;
-}
\ No newline at end of file
+}