From 0c736158aaa8ced3ae9fcf5158be45b909483196 Mon Sep 17 00:00:00 2001 From: adrien Date: Fri, 18 Oct 2024 16:14:52 +0200 Subject: [PATCH] merge index and options --- config.php | 2 +- filter_inputs.php | 2 +- index.php | 582 +++++++++++++++++++++++++++++++++++++++++--- index.php.bak | 86 +++++++ options.php | 577 ------------------------------------------- scan.php | 4 +- templates/cards.xsl | 4 +- 7 files changed, 638 insertions(+), 619 deletions(-) create mode 100755 index.php.bak delete mode 100755 options.php diff --git a/config.php b/config.php index c40b31b..2b2b715 100644 --- a/config.php +++ b/config.php @@ -1,6 +1,6 @@ FILTER_VALIDATE_URL, 'refreshPeriod' => ['filter' => FILTER_VALIDATE_INT, 'options' => ['min_range' => 0]], 'sudo' => FILTER_VALIDATE_BOOLEAN, - ], false) ?: $preset["lan"]; + ], false) ?: $presets["lan"]; } $options["--datadir"] = $DATADIR; \ No newline at end of file diff --git a/index.php b/index.php index 36ee992..3fbdf88 100755 --- a/index.php +++ b/index.php @@ -1,4 +1,7 @@ - + @@ -8,7 +11,8 @@ - + @@ -20,29 +24,444 @@ lancan -