Improve CRUD naming

.htaccess

@@ -3,11 +3,11 @@ RewriteBase /api/
 
 RewriteCond %{REQUEST_METHOD} GET
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)/(.*)$ read_key.php?table=$1&key=$2 [L,QSA]
+RewriteRule ^(.*)/(.*)$ read.php?table=$1&key=$2 [L,QSA]
 
 RewriteCond %{REQUEST_METHOD} GET
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ read.php?table=$1 [L,QSA]
+RewriteRule ^(.*)$ list.php?table=$1 [L,QSA]
 
 RewriteCond %{REQUEST_METHOD} POST
 RewriteCond %{REQUEST_FILENAME} !-f
@@ -15,8 +15,8 @@ RewriteRule ^(.*)$ create.php?table=$1 [L,QSA]
 
 RewriteCond %{REQUEST_METHOD} PUT
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)/(.*)$ update_key.php?table=$1&key=$2 [L,QSA]
+RewriteRule ^(.*)/(.*)$ update.php?table=$1&key=$2 [L,QSA]
 
 RewriteCond %{REQUEST_METHOD} DELETE
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)/(.*)$ delete_key.php?table=$1&key=$2 [L,QSA]
+RewriteRule ^(.*)/(.*)$ delete.php?table=$1&key=$2 [L,QSA]

list.php

@@ -0,0 +1,58 @@
+<?php
+include "config.php";
+
+$table = str_replace('*','%',preg_replace('/[^a-zA-Z0-9\-_*,]/','',isset($_GET["table"])?$_GET["table"]:'*'));
+$callback = preg_replace('/[^a-zA-Z0-9\-_]/','',isset($_GET["callback"])?$_GET["callback"]:false);
+
+$mysqli = new mysqli($config["hostname"], $config["username"], $config["password"], $config["database"]);
+
+if ($mysqli->connect_errno) die('Connect failed: '.$mysqli->connect_error);
+
+$tablelist = explode(',',$table);
+$tables = array();
+
+foreach ($tablelist as $table) {
+    if ($result = $mysqli->query("SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_NAME` LIKE '$table' AND `TABLE_SCHEMA` = '$config[database]'")) {
+        while ($row = $result->fetch_row()) $tables[] = $row[0];
+        $result->close();
+    }
+}
+
+if ($config["read_whitelist"]) $tables = array_intersect($tables, $config["read_whitelist"]);
+if ($config["read_blacklist"]) $tables = array_diff($tables, $config["read_blacklist"]);
+
+if (empty($tables)) {
+    die(header("Content-Type:",true,404));
+} if ($callback) {
+    header("Content-Type: application/javascript");
+    echo $callback.'(';
+} else {
+    header("Content-Type: application/json");
+}
+
+echo '{';
+$first_table = true;
+foreach ($tables as $table) {
+    if ($first_table) $first_table = false;
+    else echo ',';
+    echo '"'.$table.'":{"columns":';
+    if ($result = $mysqli->query("SELECT * FROM `$table`")) {
+        $fields = array();
+        foreach ($result->fetch_fields() as $field) $fields[] = $field->name;
+        echo json_encode($fields);
+        echo ',"records":[';
+        $first_row = true;
+        while ($row = $result->fetch_row()) {
+            if ($first_row) $first_row = false;
+            else echo ',';
+            echo json_encode($row);
+        }
+        $result->close();
+    }
+    echo ']}';
+}
+echo '}';
+
+if ($callback) {
+    echo ');';
+}

read.php

@@ -1,27 +1,32 @@
 <?php
 include "config.php";
 
-$table = str_replace('*','%',preg_replace('/[^a-zA-Z0-9\-_*,]/','',isset($_GET["table"])?$_GET["table"]:'*'));
+$key = preg_replace('/[^a-zA-Z0-9\-_]/','',isset($_GET["key"])?$_GET["key"]:false);
+$table = preg_replace('/[^a-zA-Z0-9\-_]/','',isset($_GET["table"])?$_GET["table"]:false);
 $callback = preg_replace('/[^a-zA-Z0-9\-_]/','',isset($_GET["callback"])?$_GET["callback"]:false);
 
 $mysqli = new mysqli($config["hostname"], $config["username"], $config["password"], $config["database"]);
 
 if ($mysqli->connect_errno) die('Connect failed: '.$mysqli->connect_error);
 
-$tablelist = explode(',',$table);
 $tables = array();
 
-foreach ($tablelist as $table) {
-    if ($result = $mysqli->query("SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_NAME` LIKE '$table' AND `TABLE_SCHEMA` = '$config[database]'")) {
-        while ($row = $result->fetch_row()) $tables[] = $row[0];
-        $result->close();
-    }
+if ($result = $mysqli->query("SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_NAME` = '$table' AND `TABLE_SCHEMA` = '$config[database]'")) {
+    while ($row = $result->fetch_row()) $tables[] = $row[0];
+    $result->close();
+}
+
+$keys = array();
+
+if ($result = $mysqli->query("SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `COLUMN_KEY` = 'PRI' AND `TABLE_NAME` = '$table' AND `TABLE_SCHEMA` = '$config[database]'")) {
+	while ($row = $result->fetch_row()) $keys[] = $row[0];
+	$result->close();
 }
 
 if ($config["read_whitelist"]) $tables = array_intersect($tables, $config["read_whitelist"]);
 if ($config["read_blacklist"]) $tables = array_diff($tables, $config["read_blacklist"]);
 
-if (empty($tables)) {
+if (empty($tables) || empty($keys)) {
     die(header("Content-Type:",true,404));
 } if ($callback) {
     header("Content-Type: application/javascript");
@@ -30,29 +35,13 @@ if (empty($tables)) {
     header("Content-Type: application/json");
 }
 
-echo '{';
-$first_table = true;
-foreach ($tables as $table) {
-    if ($first_table) $first_table = false;
-    else echo ',';
-    echo '"'.$table.'":{"columns":';
-    if ($result = $mysqli->query("SELECT * FROM `$table`")) {
-        $fields = array();
-        foreach ($result->fetch_fields() as $field) $fields[] = $field->name;
-        echo json_encode($fields);
-        echo ',"records":[';
-        $first_row = true;
-        while ($row = $result->fetch_row()) {
-            if ($first_row) $first_row = false;
-            else echo ',';
-            echo json_encode($row);
-        }
-        $result->close();
-    }
-    echo ']}';
+if ($result = $mysqli->query("SELECT * FROM `$tables[0]` WHERE `$keys[0]` = '$key'")) {
+	$value = $result->fetch_assoc();
+    if ($value) echo json_encode($value);
+    else die(header("Content-Type:",true,404));
+    $result->close();
 }
-echo '}';
 
 if ($callback) {
     echo ');';
-}
+}

read_key.php

@@ -1,47 +0,0 @@
-<?php
-include "config.php";
-
-$key = preg_replace('/[^a-zA-Z0-9\-_]/','',isset($_GET["key"])?$_GET["key"]:false);
-$table = preg_replace('/[^a-zA-Z0-9\-_]/','',isset($_GET["table"])?$_GET["table"]:false);
-$callback = preg_replace('/[^a-zA-Z0-9\-_]/','',isset($_GET["callback"])?$_GET["callback"]:false);
-
-$mysqli = new mysqli($config["hostname"], $config["username"], $config["password"], $config["database"]);
-
-if ($mysqli->connect_errno) die('Connect failed: '.$mysqli->connect_error);
-
-$tables = array();
-
-if ($result = $mysqli->query("SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_NAME` = '$table' AND `TABLE_SCHEMA` = '$config[database]'")) {
-    while ($row = $result->fetch_row()) $tables[] = $row[0];
-    $result->close();
-}
-
-$keys = array();
-
-if ($result = $mysqli->query("SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `COLUMN_KEY` = 'PRI' AND `TABLE_NAME` = '$table' AND `TABLE_SCHEMA` = '$config[database]'")) {
-	while ($row = $result->fetch_row()) $keys[] = $row[0];
-	$result->close();
-}
-
-if ($config["read_whitelist"]) $tables = array_intersect($tables, $config["read_whitelist"]);
-if ($config["read_blacklist"]) $tables = array_diff($tables, $config["read_blacklist"]);
-
-if (empty($tables) || empty($keys)) {
-    die(header("Content-Type:",true,404));
-} if ($callback) {
-    header("Content-Type: application/javascript");
-    echo $callback.'(';
-} else {
-    header("Content-Type: application/json");
-}
-
-if ($result = $mysqli->query("SELECT * FROM `$tables[0]` WHERE `$keys[0]` = '$key'")) {
-	$value = $result->fetch_assoc();
-    if ($value) echo json_encode($value);
-    else die(header("Content-Type:",true,404));
-    $result->close();
-}
-
-if ($callback) {
-    echo ');';
-}