Merge pull request #1356 from bergware/master

Minor code refactoring

emhttp/plugins/dynamix/DeviceInfo.page

@@ -31,6 +31,7 @@ function sanitize(&$val) {
   $data = explode('.',str_replace([' ',','],['','.'],$val));
   $last = array_pop($data);
   $val = count($data) ? implode($data).".$last" : $last;
+  $val = preg_replace('/[^0-9.]/','',$val);
 }
 function presetSpace($val) {
   global $disk,$display;

etc/rc.d/rc.library.source

@@ -8,6 +8,11 @@ NETWORK_INI="/var/local/emhttp/network.ini"
 SYSTEM="/sys/class/net"
 EXTRA="/boot/config/network-extra.cfg"
 
+IPv() {
+  t=${1//[^:]}
+  [[ ${#t} -le 1 ]] && echo 4 || echo 6
+}
+
 this() {
   case $CALLER in
   'avahi')
@@ -29,7 +34,7 @@ this() {
     now=();
     for addr in $(awk '$1=="listen" && $2~/^[0-9]|\[/ && $0~/http2; #.*$/{print $2}' $SERVERS 2>/dev/null); do
       # extract ipv4 / ipv6 address
-      [[ $(IPv $addr 1) == 4 ]] && addr=${addr%:*} || addr=${addr#*[} addr=${addr%]*}
+      [[ $(IPv $addr) == 4 ]] && addr=${addr%:*} || addr=${addr#*[} addr=${addr%]*}
       now+=($addr)
     done
     # return addresses
@@ -38,11 +43,6 @@ this() {
   esac
 }
 
-IPv() {
-  t=${1//[^:]}
-  [[ ${#t} -le 1 ]] && echo 4 || echo 6
-}
-
 scan() {
   grep -Pom1 "^$1=\"?\K[^\"]+" $2
 }