modified: .gitignore

modified:   software/README.md
	modified:   software/app.php
	modified:   software/database/sqlite.php
	modified:   software/device-api.php
	modified:   software/router.php
This commit is contained in:
Sven Luethi committed 2024-07-08 00:33:40 +02:00
1 parent 50eec7e284
commit c44e580120
6 files changed
+62 -15

No files matched your search

+10 -8
View File
@@ -4,13 +4,13 @@ class DB {
public function __construct() {
try {
if (!file_exists('db.sqlite') {
$this->pdo = new PDO("sqlite:db.sqlite");
if (!file_exists(__DIR__ . '/db.sqlite')) {
$this->pdo = new PDO('sqlite:'.__DIR__.'/db.sqlite');
$this->createTables();
syslog(LOG_INFO,"New SQLite Database was created.");
}
else {
$this->pdo = new PDO("sqlite:db.sqlite");
$this->pdo = new PDO('sqlite:'.__DIR__.'/db.sqlite');
$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->pdo->exec("PRAGMA foreign_keys = ON");
}
@@ -24,9 +24,9 @@ class DB {
$sql = "
CREATE TABLE IF NOT EXISTS devices (
id INTEGER PRIMARY KEY,
device_id TEXT NOT NULL,
mac_address TEXT NOT NULL,
ip_address TEXT NOT NULL,
seen_ip_address TEXT NOT NULL,
firmware_version TEXT NOT NULL,
temperature_offset INTEGER DEFAULT 0,
humidity_offset INTEGER DEFAULT 0,
@@ -51,8 +51,8 @@ class DB {
public function addDevice($deviceData) {
$sql = "
INSERT INTO devices (device_id, mac_address, ip_address, firmware_version, temperature_offset, humidity_offset, last_updated, last_seen)
VALUES (:device_id, :mac_address, :ip_address, :firmware_version, :temperature_offset, :humidity_offset, :last_updated, :last_seen)
INSERT INTO devices (id, mac_address, ip_address, seen_ip_address, firmware_version, temperature_offset, humidity_offset, last_updated, last_seen)
VALUES (:id, :mac_address, :ip_address, seen_ip_address, :firmware_version, :temperature_offset, :humidity_offset, :last_updated, :last_seen)
";
try {
$stmt = $this->pdo->prepare($sql);
@@ -87,9 +87,10 @@ class DB {
public function updateDevice($id, $deviceData) {
$sql = "
UPDATE devices
SET device_id = :device_id,
SET id = :id,
mac_address = :mac_address,
ip_address = :ip_address,
seen_ip_address = :seen_ip_address,
firmware_version = :firmware_version,
temperature_offset = :temperature_offset,
humidity_offset = :humidity_offset,
@@ -156,9 +157,10 @@ class DB {
/*
$newDevice = [
'device_id' => 'device123',
'id' => 'device123',
'mac_address' => '00:1B:44:11:3A:B7',
'ip_address' => '192.168.1.2',
'seen_ip_address' => '212.71.123.123',
'firmware_version' => '1.0.1',
'temperature_offset' => 0,
'humidity_offset' => 0,