diff --git a/html/bootstrap/css/bootstrap-theme.css b/html/bootstrap/css/bootstrap-theme.css old mode 100644 new mode 100755 diff --git a/html/bootstrap/css/bootstrap-theme.css.map b/html/bootstrap/css/bootstrap-theme.css.map old mode 100644 new mode 100755 diff --git a/html/bootstrap/css/bootstrap-theme.min.css b/html/bootstrap/css/bootstrap-theme.min.css old mode 100644 new mode 100755 diff --git a/html/bootstrap/css/bootstrap.css b/html/bootstrap/css/bootstrap.css old mode 100644 new mode 100755 diff --git a/html/bootstrap/css/bootstrap.css.map b/html/bootstrap/css/bootstrap.css.map old mode 100644 new mode 100755 diff --git a/html/bootstrap/css/bootstrap.min.css b/html/bootstrap/css/bootstrap.min.css old mode 100644 new mode 100755 diff --git a/html/bootstrap/fonts/glyphicons-halflings-regular.eot b/html/bootstrap/fonts/glyphicons-halflings-regular.eot old mode 100644 new mode 100755 diff --git a/html/bootstrap/fonts/glyphicons-halflings-regular.svg b/html/bootstrap/fonts/glyphicons-halflings-regular.svg old mode 100644 new mode 100755 diff --git a/html/bootstrap/fonts/glyphicons-halflings-regular.ttf b/html/bootstrap/fonts/glyphicons-halflings-regular.ttf old mode 100644 new mode 100755 diff --git a/html/bootstrap/fonts/glyphicons-halflings-regular.woff b/html/bootstrap/fonts/glyphicons-halflings-regular.woff old mode 100644 new mode 100755 diff --git a/html/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/html/bootstrap/fonts/glyphicons-halflings-regular.woff2 old mode 100644 new mode 100755 diff --git a/html/bootstrap/js/bootstrap.js b/html/bootstrap/js/bootstrap.js old mode 100644 new mode 100755 diff --git a/html/bootstrap/js/bootstrap.min.js b/html/bootstrap/js/bootstrap.min.js old mode 100644 new mode 100755 diff --git a/html/bootstrap/js/npm.js b/html/bootstrap/js/npm.js old mode 100644 new mode 100755 diff --git a/html/custom.css b/html/custom.css index 457e750db..6db93675a 100755 --- a/html/custom.css +++ b/html/custom.css @@ -18,4 +18,3 @@ body { background-color: #f5f5f5; } - diff --git a/modules/gpio/html/gpio_function_num.php b/modules/gpio/html/gpio_function_num.php index 0362c4bcc..2a8c61fbd 100755 --- a/modules/gpio/html/gpio_function_num.php +++ b/modules/gpio/html/gpio_function_num.php @@ -1,5 +1,3 @@ -

GPIO function number

- fetchAll(); foreach ($result as $a) { ?> -
- + - - - + + + + + +
+ + + + diff --git a/modules/gpio/html/gpio_temp.php b/modules/gpio/html/gpio_temp.php index 9a16b2d67..f4501e37c 100755 --- a/modules/gpio/html/gpio_temp.php +++ b/modules/gpio/html/gpio_temp.php @@ -74,11 +74,13 @@
@@ -102,9 +104,11 @@
- diff --git a/modules/notification/html/alarms.php b/modules/notification/html/alarms.php index 4fef5bdeb..5d481cceb 100755 --- a/modules/notification/html/alarms.php +++ b/modules/notification/html/alarms.php @@ -1,10 +1,10 @@
-
Set the temperature range
-
+
Set the temperature range +
+ +prepare("select * from sensors WHERE alarm='on'"); $sth->execute(); - $result = $sth->fetchAll(); + $result = $sth->fetchAll(); foreach ($result as $a) { ?> -
-
-
-
+
+ + + -
-
-
+ - - + -
- + + + - - +
Name min maxRemove
+ +
-
- -
-
Free sensors
-
-query("SELECT * FROM sensors WHERE alarm='off'"); -$row = $rows->fetchAll(); -$numRows = count($row); -if ($numRows == 0 ) { echo ""; } - -$sth = $db1->prepare("select * from sensors WHERE alarm='off'"); -$sth->execute(); -$result = $sth->fetchAll(); -foreach ($result as $a) { ?> -
-
-
-
- - -
-
-
- - - -
-
- - + diff --git a/modules/notification/html/free.php b/modules/notification/html/free.php new file mode 100755 index 000000000..511b95480 --- /dev/null +++ b/modules/notification/html/free.php @@ -0,0 +1,46 @@ + +exec("UPDATE sensors SET alarm='on' WHERE id='$add_alarm'") or die ($db->lastErrorMsg()); + header("location: " . $_SERVER['REQUEST_URI']); + exit(); + } + ?> + +
+
Free sensors
+
+query("SELECT * FROM sensors WHERE alarm='off'"); +$row = $rows->fetchAll(); +$numRows = count($row); +if ($numRows == 0 ) { echo ""; } + +$sth = $db1->prepare("select * from sensors WHERE alarm='off'"); +$sth->execute(); +$result = $sth->fetchAll(); +foreach ($result as $a) { ?> +
+
+
+ + +
+
+
+ + + +
+
+ + + + diff --git a/modules/notification/html/triggers.php b/modules/notification/html/triggers.php old mode 100644 new mode 100755 diff --git a/modules/notification/html/users.php b/modules/notification/html/users.php index 6197b6691..8568e1043 100755 --- a/modules/notification/html/users.php +++ b/modules/notification/html/users.php @@ -46,32 +46,27 @@ } ?> +
-
-

Panel title

-
-
+
Users
-
-
Name
-
Email
-
Telephone
-
Mail
-
SMS
-
-
+
+ + -
+
-
-
-
+ + + + + + -
-
-
+ + - +fetchAll(); foreach ($result as $a) { ?> -

-

-
-
-
+
+ + + + - -
/>
-
/>
- + " /> + + + - - + + " /> -
+ - -

- + - +
NameEmailTelephoneAdd/Rem
/> />
\ No newline at end of file diff --git a/modules/security/fw/fw b/modules/security/fw/fw index d6bb4deb7..1b1330312 100755 --- a/modules/security/fw/fw +++ b/modules/security/fw/fw @@ -28,6 +28,9 @@ if [ "$onoff" == "on" ] && [ -n "$2" ] && [ -n "$3" ] && [ -n "$4" ] && [ -n "$5 fi if [ -n "$ext" ];then sudo iptables -A INPUT -s $ext -p tcp --dport 80 -j ACCEPT + sudo iptables -A INPUT -s $ext -p tcp --dport 443 -j ACCEPT + sudo iptables -A INPUT -s $ext -m limit --limit 1/second -p tcp --dport 22 -j ACCEPT + sudo iptables -A INPUT -s $ext -p icmp --icmp-type echo-request -j ACCEPT fi if [ "$vpn" == "on" ]; then sudo iptables -A INPUT -p udp --dport 1194 -j ACCEPT diff --git a/modules/sensors/html/sensors_settings.php b/modules/sensors/html/sensors_settings.php index e8160d4dd..7e2ecefe3 100755 --- a/modules/sensors/html/sensors_settings.php +++ b/modules/sensors/html/sensors_settings.php @@ -19,7 +19,6 @@ ?> - Name id Size @@ -35,22 +34,25 @@ ?> -
- -" /> -" /> - - -
- - - +
+ + + " /> + + + " /> + +
+ + + + { +?> MB