From 5ab9f75e45aad61d3d98d1018e9ba9c7d514a41b Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Fri, 30 Dec 2016 11:49:39 -0500
Subject: [PATCH] Condense list verification and use in both add and sub

---
 php/add.php  | 31 ++++---------------------------
 php/auth.php | 29 +++++++++++++++++++++++++++++
 php/sub.php  | 11 ++++-------
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/php/add.php b/php/add.php
index 0f080c27..3f62fd0d 100644
--- a/php/add.php
+++ b/php/add.php
@@ -1,35 +1,12 @@
 <?php
 require('auth.php');
 
-if(!isset($_POST['domain'], $_POST['list']) && !(isset($_POST['pw']) || isset($_POST['token']))) {
-	log_and_die("Missing POST variables");
-}
+$type = $_POST['list'];
 
-if(isset($_POST['token']))
-{
-	check_cors();
-	check_csrf($_POST['token']);
-}
-elseif(isset($_POST['pw']) && $_POST['list'] == "white")
-{
-	require("password.php");
-	if(strlen($pwhash) == 0)
-	{
-		log_and_die("No password set - whitelisting with password not supported");
-	}
-	elseif($wrongpassword)
-	{
-		log_and_die("Wrong password - whitelisting of ${_POST['domain']} not permitted");
-	}
-}
-else
-{
-	log_and_die("Not allowed!");
-}
-check_domain();
+// All of the verification for list editing
+list_verify($type);
 
-
-switch($_POST['list']) {
+switch($type) {
 	case "white":
 		echo exec("sudo pihole -w -q ${_POST['domain']}");
 		break;
diff --git a/php/auth.php b/php/auth.php
index d2345ca4..c445ebc4 100644
--- a/php/auth.php
+++ b/php/auth.php
@@ -105,4 +105,33 @@ function check_domain() {
         }
     }
 }
+
+function list_verify($type) {
+    if(!isset($_POST['domain'], $_POST['list']) && !(isset($_POST['pw']) || isset($_POST['token']))) {
+        log_and_die("Missing POST variables");
+    }
+
+    if(isset($_POST['token']))
+    {
+        check_cors();
+        check_csrf($_POST['token']);
+    }
+    elseif(isset($_POST['pw']) && $_POST['list'] == "white")
+    {
+        require("password.php");
+        if(strlen($pwhash) == 0)
+        {
+            log_and_die("No password set - ${type}listing with password not supported");
+        }
+        elseif($wrongpassword)
+        {
+            log_and_die("Wrong password - ${type}listing of ${_POST['domain']} not permitted");
+        }
+    }
+    else
+    {
+        log_and_die("Not allowed!");
+    }
+    check_domain();
+}
 ?>
diff --git a/php/sub.php b/php/sub.php
index 56019664..fb670f3a 100644
--- a/php/sub.php
+++ b/php/sub.php
@@ -1,15 +1,12 @@
 <?php
 require('auth.php');
 
-if(!isset($_POST['domain'], $_POST['list'], $_POST['token'])) {
-    log_and_die("Missing POST variables");
-}
+$type = $_POST['list'];
 
-check_cors();
-check_csrf($_POST['token']);
-check_domain();
+// All of the verification for list editing
+list_verify($type);
 
-switch($_POST['list']) {
+switch($type) {
     case "white":
         exec("sudo pihole -w -q -d ${_POST['domain']}");
         break;