From cd2d5ba58853c92726e56b422d4e22764eb0cad5 Mon Sep 17 00:00:00 2001
From: Will Bradley <bradley.will@gmail.com>
Date: Fri, 23 Dec 2011 14:12:05 -0700
Subject: [PATCH] Added IP saving and blink link

---
 configurator.db  | Bin 4096 -> 2048 bytes
 configurator.php |   3 ++-
 index.php        |  14 ++++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/configurator.db b/configurator.db
index 4f7e552f77bf412f7009ad2f99b3219674737b8a..4c7999d009e859b975ddc08becfa31cce35c8993 100644
GIT binary patch
delta 226
zcmZorXb_kn&C12Vz`!(7!JeOsLHCgiFObK`oXo(Sys_{r6IY`YBfGe?G-DI@<R<0-
z;pEbyqSU;S%mM{x562)4BU4k&$rqRn1bCS*F|aT<GB7tX-(ud)ykuh`JM+Ybta{m&
z@0U;3u`?*jGcqz78XK9InHw3Iniv|H>lpx{Ay8BhsN@tQPzlgt280r@Faw4#Pz}e)
fdUgf{kikG&QJs+i*<ec}Jwr1KJwrW13!vcuKq579

literal 4096
zcmeH}&rcIU6vyA20lY~40j4S(7DWXENxQ9WQ-4u$1>}dNRD=sjmDV(=6tM?2Trhay
zWH@;++nx+3Ps+(~@`y1poIH4FVq!RX5-u8NhTXEezP~^_>89JyPG4r<d-I*|#P~?Q
zl+|*@g$J3E7J>#qgg#9JfTFk>#AOc@H}bNF^WJ9O?;`Y8+nWVN{usokKI$2$XFz0N
zsSywO+uCp`Q_9>eWUm{OL;c2t^~L&AMj~x!>BO}WL$jdPrR8U}p|P|vV5GEUYG^c(
zn%0Jm=^pJ~aW0p?uceKtbdR=>&CEWr=k;ihvU8>VUzz#&LO#16rn^zB1^JGwNdw>E
zYkZY2@*Gd{IPc^>w#%w)ldZD~TVW+O!v>ko+F29+z%Td#-{4Dph6S9&K0J@D@Eg9v
zXLt{<;RQT}Ss7H0!^=CLDp#AJL)-^LdN>jYh67<muaNXINiUJK+eJe$UB&Gp={XM#
zsJUlJdd5woF*Uc7q^C)GilXH~7u91IWZd!qNpFzUAgMcNdQ|1N?9Q1@FS;XGbK@j!
zchhiCt+$P&CrNsOqUMx~2BRSv*Stg0Ns`_s>4cj`RNc%JNykZ=B<U>=Rrxi?NIL4F
zswd46k`9yfCP@#uX+ZU_=_6?~Ne^07>_jg6F5ZkL_^|-^oE^ggOR#DD#+LCTd&|DE
zpZJc)@E7k8dXN*kuqyOngKzO|+{P{3z%^XOMa*Fm<JgHl*o7)=!a7u71xiplDl012
zAuNTp?}LE=qS{ISp&qoze8_4cqB9?;9>~&oAFy8Vo3f*Y*RuZ+iJ?lYY+grV1>WPb
z`J7z0xNJ0vtMK~;s>LA+#~wnfx82lQWMevF%OWc-+t|S)VlC_ywCp9J_DX81+#TMj
zn{eF9SMBX<q2<nV&JQDU9~?DZ`&31i#4}TIxzC+kBv5RN7LQgOkwueI<0wHiwD)>a
zRXh=tiqU#SYa6M9Wl}TCw7$|>OzZYv8ZW)MpEUt%66d-u&i5H{&aa5`eqEgVRkq80
z!Ux2?`(OO2KK`K$s56~*1+;^p-3IMUXct2}9?~6ENGDaHT^H@pXg5bYKiVbIj*@nt
p?wr|P*PSz)(hitD9i_C3uCqO~uDn>q?Lop8b?IQxrfzQ|=pQgbmE`~c

diff --git a/configurator.php b/configurator.php
index 0ddac7d..2c3d6b3 100644
--- a/configurator.php
+++ b/configurator.php
@@ -47,7 +47,8 @@ if($getconfig == "1") {
 // When called with id and applied=1, mark as applied
 if(strlen($id) > 0 && $applied == "1") {
   try {
-    $updateapplied = $db->prepare("UPDATE DEVICES SET APPLIED=1 WHERE id=:id;");
+    $updateapplied = $db->prepare("UPDATE DEVICES SET APPLIED=1, CURRENTIP=:currentip WHERE id=:id;");
+    $updateapplied->bindParam(':currentip', $_SERVER['REMOTE_ADDR']); // store the remote client IP for calling blink.php later
     $updateapplied->bindParam(':id', $id);
     $updateapplied->execute();
   } catch (Exception $e) {
diff --git a/index.php b/index.php
index 5c9184b..84bc8bb 100644
--- a/index.php
+++ b/index.php
@@ -1,12 +1,12 @@
 <?php
-
+//TODO: move this database section to an include file
 // config variables
 $dbpath = "configurator.db";
 
 // import and sanitize GET variables
 $id = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT);
 $configdevices = filter_input_array(INPUT_GET, array('configdevices' => array('filter' => FILTER_SANITIZE_NUMBER_INT, 'flags'  => FILTER_REQUIRE_ARRAY)));
-if(isset($configdevices['configdevices']))
+if(isset($configdevices['configdevices']))      // we don't want the whole GET array, just the configdevices part.
   $configdevices = $configdevices['configdevices'];
 $applied = filter_input(INPUT_GET, 'applied', FILTER_SANITIZE_NUMBER_INT);
 $download = filter_input(INPUT_GET, 'download', FILTER_SANITIZE_SPECIAL_CHARS);
@@ -30,7 +30,7 @@ try {
 // Create table if doesn't exist
 $q = $db->query("PRAGMA table_info(DEVICES)");
 if ( $q->rowCount() == 0 ) {
-  $db->query( "CREATE TABLE DEVICES ( id INTEGER PRIMARY KEY, config TEXT, ready INTEGER, sent INTEGER, applied INTEGER );" );
+  $db->query( "CREATE TABLE DEVICES ( id INTEGER PRIMARY KEY, config TEXT, currentip CHAR(255), ready INTEGER, sent INTEGER, applied INTEGER );" );
 }
 
 
@@ -91,8 +91,10 @@ if($configdevices != false && count($configdevices) > 0) {
 
 <form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="GET">
   <h3>Devices</h3>
-  <input type="button" id="checkall" name="checkall" value="Check All" onClick="var c=new Array();c=document.getElementsByName('configdevices[]');for(var i=0;i<c.length;i++){c[i].checked=true;}" />
-  <input type="button" id="uncheckall" name="uncheckall" value="Uncheck All" onClick="var c=new Array();c=document.getElementsByName('configdevices[]');for(var i=0;i<c.length;i++){c[i].checked=false;}" />
+  <input type="button" id="checkall" name="checkall" value="Check All" 
+    onClick="var c=new Array();c=document.getElementsByName('configdevices[]');for(var i=0;i<c.length;i++){c[i].checked=true;}" />
+  <input type="button" id="uncheckall" name="uncheckall" value="Uncheck All" 
+    onClick="var c=new Array();c=document.getElementsByName('configdevices[]');for(var i=0;i<c.length;i++){c[i].checked=false;}" />
   <input type="button" value="Refresh" onclick="window.location.reload()">
   <ul id="devicelist">
 <?php while ($device = $devicelist->fetchObject()): ?>
@@ -101,7 +103,7 @@ if($configdevices != false && count($configdevices) > 0) {
       <?php echo $device->id ?>
       <?php if($device->ready=="1") { echo " <em>ready</em>";} ?>
       <?php if($device->sent=="1") { echo " <strong>sent</strong>";} ?>
-      <?php if($device->applied=="1") { echo " <strong>applied</strong>";} ?>
+      <?php if($device->applied=="1") { echo ' <strong>applied</strong> <a target="_blank" href="http://'.$device->currentip.'/blink.php">blink</a>';} ?>
     </li>
 <?php endwhile; ?>
   </ul>