Database table name is in settings.json now. #19

Merged
mattbk merged 1 commits from table-in-settings into master 2015-11-01 19:16:14 -06:00
2 changed files with 8 additions and 4 deletions
Showing only changes of commit 0457924b1a - Show all commits

View File

@ -125,7 +125,8 @@ switch ($mode) {
$values = "'".implode("', '", $valuestoimplode)."'"; $values = "'".implode("', '", $valuestoimplode)."'";
//print_r($values); //print_r($values);
// Build and execute query // Build and execute query
$sql = "INSERT INTO results ("; //tablename
$sql = "INSERT INTO ".$settings->database->table." (";
$sql .= $columns; $sql .= $columns;
$sql .= ") VALUES ($values)"; $sql .= ") VALUES ($values)";
$db->query($sql) or die('Could not execute query:<br>'.mysqli_error($db)); $db->query($sql) or die('Could not execute query:<br>'.mysqli_error($db));
@ -158,10 +159,12 @@ switch ($mode) {
if ($filtered) { if ($filtered) {
$variables['filtered'] = true; $variables['filtered'] = true;
$results = $db->query("select * from results where host != '192.168.0.1' order by datetime asc"); //tablename
$results = $db->query("select * from ".$settings->database->table." where host != '192.168.0.1' order by datetime asc");
} }
else { else {
$results = $db->query("select * from results order by datetime asc"); //tablename
$results = $db->query("select * from ".$settings->database->table." order by datetime asc");
} }
if ($results === false) { if ($results === false) {

View File

@ -3,7 +3,8 @@
"host": "localhost", "host": "localhost",
"username": "user", "username": "user",
"password": "pass", "password": "pass",
"name": "db" "name": "db",
"table": "results"
}, },
"phases": [ "phases": [
"notable", "notable",