From 977c026868168ac1a7d1e2d020400b7fced52c01 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Wed, 21 Dec 2016 12:24:48 -0500
Subject: [PATCH] Use checkfile on get.php

Move checkfile to funcs.php to be used by more scripts
---
 data.php     | 14 ++------------
 php/func.php | 14 +++++++++++++-
 php/get.php  |  4 +++-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/data.php b/data.php
index 9d1e9390..088eac25 100644
--- a/data.php
+++ b/data.php
@@ -1,21 +1,11 @@
 <?php
+    require "php/func.php";
+
     $log = array();
     $setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
 
     $hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
 
-    function checkfile($filename) {
-        if(is_readable($filename))
-        {
-            return $filename;
-        }
-        else
-        {
-            // substitute dummy file
-            return "/dev/null";
-        }
-    }
-
     // Check if pihole.log exists and is readable
     $logListName = checkfile("/var/log/pihole.log");
     $log = new \SplFileObject($logListName);
diff --git a/php/func.php b/php/func.php
index 060b4f43..37ef790f 100644
--- a/php/func.php
+++ b/php/func.php
@@ -7,4 +7,16 @@ function is_valid_domain_name($domain_name)
         preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name)); //length of each label
 }
 
-?>
\ No newline at end of file
+function checkfile($filename) {
+    if(is_readable($filename))
+    {
+        return $filename;
+    }
+    else
+    {
+        // substitute dummy file
+        return "/dev/null";
+    }
+}
+
+?>
diff --git a/php/get.php b/php/get.php
index eeae056c..fada75b9 100644
--- a/php/get.php
+++ b/php/get.php
@@ -7,7 +7,9 @@ $type = $_GET['list'];
 if($type !== "white" && $type !== "black")
     die("Invalid list parameter");
 
-$rawList = file_get_contents("/etc/pihole/${type}list.txt");
+require "func.php";
+
+$rawList = file_get_contents(checkfile("/etc/pihole/${type}list.txt"));
 $list = explode("\n", $rawList);
 
 // Get rid of empty lines