From 8479530c67738a005b4707f6f2eb04387723d8f4 Mon Sep 17 00:00:00 2001
From: Brice Johnson <bricej13@gmail.com>
Date: Sat, 9 Jan 2016 20:04:24 -0600
Subject: [PATCH 1/6] Added basic read-only api

---
 api.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 api.php

diff --git a/api.php b/api.php
new file mode 100644
index 00000000..0611d835
--- /dev/null
+++ b/api.php
@@ -0,0 +1,15 @@
+<?php
+    $domains_being_blocked = exec("wc -l /etc/pihole/gravity.list | awk '{print $1}'");
+    $dns_queries_today = exec("cat /var/log/pihole.log | awk '/query/ {print $6}' | wc -l");
+    $ads_blocked_today = exec("cat /var/log/pihole.log | awk '/\/etc\/pihole\/gravity.list/ && !/address/ {print $6}' | wc -l");
+    $ads_percentage_today = $ads_blocked_today / $dns_queries_today * 100;
+    $arr = array(
+        'domains_being_blocked' => $domains_being_blocked,
+        'dns_queries_today' => $dns_queries_today,
+        'ads_blocked_today' => $ads_blocked_today,
+        'ads_percentage_today' => $ads_percentage_today
+    );
+
+    header('Content-type: application/json');
+    echo json_encode($arr);
+?>

From fc339659069f52b74f951e3090ee47533cae0480 Mon Sep 17 00:00:00 2001
From: Brice Johnson <bricej13@gmail.com>
Date: Sat, 9 Jan 2016 20:10:02 -0600
Subject: [PATCH 2/6] Added documentation for API

---
 README.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e50c8356..7f782af9 100644
--- a/README.md
+++ b/README.md
@@ -7,4 +7,15 @@ Using **[AdminLTE](https://almsaeedstudio.com)**, this project will create a Web
 From this interface, you will be able to see stats on how well your Pi-hole is performing.  You will also be able to update the lists used to block ads.
 
 ![Pi-hole Web interface](http://i.imgur.com/x2iMfoc.png)
-![Fully responsive](http://i.imgur.com/NyAIXm8.png)
\ No newline at end of file
+![Fully responsive](http://i.imgur.com/NyAIXm8.png)
+
+## API
+A basic read-only API can be accessed at `/admin/api.php`. It returns the following JSON:
+```JSON
+{
+	"domains_being_blocked": "136708",
+	"dns_queries_today": "18108",
+	"ads_blocked_today": "14648",
+	"ads_percentage_today": 80.892423238348
+}
+```

From e36ced86d42c8520020916f3020ef45fbaa9ced4 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sun, 10 Jan 2016 21:58:33 -0600
Subject: [PATCH 3/6] fixes #8

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 4b6bcf40..0113a6d9 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-    $domains_being_blocked = exec("wc -l /etc/pihole/gravity.list | awk '{print $1}'");
+    $domains_being_blocked = exec("wc -l /etc/pihole/pihole.3.eventHorizon.txt | awk '{print $1}'");
     $dns_queries_today = exec("cat /var/log/pihole.log | awk '/query/ {print $6}' | wc -l");
     $ads_blocked_today = exec("cat /var/log/pihole.log | awk '/\/etc\/pihole\/gravity.list/ && !/address/ {print $6}' | wc -l");
     $ads_percentage_today = $ads_blocked_today / $dns_queries_today * 100;

From 00f68a1142beb7b89460c4594434d01a033b5545 Mon Sep 17 00:00:00 2001
From: OkashiOdayakana <brianblevins316@gmail.com>
Date: Mon, 18 Jan 2016 12:55:21 -0500
Subject: [PATCH 4/6] Update index.php

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 0113a6d9..b5000fe0 100644
--- a/index.php
+++ b/index.php
@@ -185,7 +185,7 @@
             <!-- /.content-wrapper -->
             <footer class="main-footer">
                 <div class="pull-right hidden-xs">
-                    <b>Pi-hole Version</b> 2.1
+                    <b>Pi-hole Version</b> 2.2
                 </div>
                 <i class="fa fa-github"></i> <strong><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY">Donate</a></strong> if you found this useful.
             </footer>

From 46a7bac6e48f1ad2518b45ec2bfb3d6c41e4ad9d Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Mon, 18 Jan 2016 23:04:03 +0000
Subject: [PATCH 5/6] Update api.php

Consume JSON output of chronometer.sh

Relies on [this pull](https://github.com/jacobsalmela/pi-hole/pull/193) being merged.
---
 api.php | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/api.php b/api.php
index 0611d835..6ad9845d 100644
--- a/api.php
+++ b/api.php
@@ -1,15 +1,3 @@
-<?php
-    $domains_being_blocked = exec("wc -l /etc/pihole/gravity.list | awk '{print $1}'");
-    $dns_queries_today = exec("cat /var/log/pihole.log | awk '/query/ {print $6}' | wc -l");
-    $ads_blocked_today = exec("cat /var/log/pihole.log | awk '/\/etc\/pihole\/gravity.list/ && !/address/ {print $6}' | wc -l");
-    $ads_percentage_today = $ads_blocked_today / $dns_queries_today * 100;
-    $arr = array(
-        'domains_being_blocked' => $domains_being_blocked,
-        'dns_queries_today' => $dns_queries_today,
-        'ads_blocked_today' => $ads_blocked_today,
-        'ads_percentage_today' => $ads_percentage_today
-    );
-
-    header('Content-type: application/json');
-    echo json_encode($arr);
+<?php 
+    echo exec("/usr/local/bin/chronometer.sh -j"); 
 ?>

From 6685d7bde04ee5dfd94173ac842d6017bd4ad060 Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Mon, 18 Jan 2016 23:04:37 +0000
Subject: [PATCH 6/6] Update index.php

Consume JSON output of chronometer.sh

Relies on [this pull](jacobsalmela/pi-hole#193) being merged.
---
 index.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index 0113a6d9..a67b1037 100644
--- a/index.php
+++ b/index.php
@@ -1,8 +1,10 @@
 <?php
-    $domains_being_blocked = exec("wc -l /etc/pihole/pihole.3.eventHorizon.txt | awk '{print $1}'");
-    $dns_queries_today = exec("cat /var/log/pihole.log | awk '/query/ {print $6}' | wc -l");
-    $ads_blocked_today = exec("cat /var/log/pihole.log | awk '/\/etc\/pihole\/gravity.list/ && !/address/ {print $6}' | wc -l");
-    $ads_percentage_today = $ads_blocked_today / $dns_queries_today * 100;
+    $output = exec('/usr/local/bin/chronometer.sh -j');
+    $outj = json_decode($output);
+    $domains_being_blocked = $outj->domains_being_blocked;
+    $dns_queries_today = $outj->dns_queries_today;
+    $ads_blocked_today = $outj->ads_blocked_today;
+    $ads_percentage_today = $outj->ads_percentage_today;
 ?>
 <!DOCTYPE html>
 <html>