kvs-php.git

@@ -1,18 +1,20 @@

 <?php

 require('config.php');

+header("Content-Type: text/plain");

 try {

     $db = new PDO('sqlite:store.db');

-    $db->exec('create table if not exists keys(k varchar(80) primary key, v varchar(140), created integer, updated integer, origin varchar(16))');

+    $db->exec('create table if not exists keys(k varchar(80) primary key, 

+               v varchar(140), created integer, updated integer, origin varchar(16));');

 } catch(PDOException $e) {

-    header("Content-Type: text/plain");

     echo 'Exception : '.$e->getMessage();

     exit(0);

 }

 if (isset($_GET['k'])) {

-    header("Content-Type: text/plain");

+    // This is a request to get one specific value.

     $keys = array_map(array($db, 'quote'), explode(',', $_GET['k']));

-    $result = $db->query('select v from keys where k in ('.implode(',', $keys).') order by updated desc limit 1', PDO::FETCH_ASSOC);

+    $result = $db->query('select v from keys where k in ('.implode(',', $keys).') 

+                          order by updated desc limit 1;', PDO::FETCH_ASSOC);

     foreach($result as $row) {

         echo $row['v'];

     }

@@ -22,6 +24,8 @@ if (isset($_GET['k'])) {

         echo "Not authorized.\n";

         exit(0);

     }

+

+    // We have an authorized request to add or update a key/value pair.

     $stmt = $db->prepare('select k from keys where k=?');

     foreach ($_POST as $key => $value) {

         if ($key == 'auth') {

@@ -31,11 +35,13 @@ if (isset($_GET['k'])) {

         $stmt->execute();

         $row = $stmt->fetch(PDO::FETCH_ASSOC);

         if(!$row) {

-            $db->exec('insert into keys (k, v, created, updated, origin) values ('.$db->quote($key).', '.$db->quote($value).

-	              ', '.$_SERVER['REQUEST_TIME'].', '.$_SERVER['REQUEST_TIME'].', '.$db->quote($_SERVER['REMOTE_ADDR']).');');

+            $db->exec('insert into keys (k, v, created, updated, origin) values ('.

+                       $db->quote($key).', '.$db->quote($value).', '.

+                       $_SERVER['REQUEST_TIME'].', '.$_SERVER['REQUEST_TIME'].', '.

+                       $db->quote($_SERVER['REMOTE_ADDR']).');');

         } else {

-            $db->exec('update keys set v = '.$db->quote($value).', updated = '.$_SERVER['REQUEST_TIME'].', origin = '.$db->quote($_SERVER['REMOTE_ADDR']).

-	              ' where k = '.$db->quote($key).';');

+            $db->exec('update keys set v = '.$db->quote($value).', updated = '.$_SERVER['REQUEST_TIME'].

+                      ', origin = '.$db->quote($_SERVER['REMOTE_ADDR']).' where k = '.$db->quote($key).';');

         }

         if ($db->errorCode() != '00000') {

             echo "Error:", $db->errorInfo()[2], "\n";

@@ -45,7 +51,6 @@ if (isset($_GET['k'])) {

     }

     exit(0);

 }

-header("Content-Type: text/plain");

 $headers = array("key        ","value       ","created     ","updated     ","origin      ");

 echo implode("\t", $headers)."\n";

 $headers = array("-----------","------------","------------","------------","------------");