diff --git a/www/Images/_notes/dwsync.xml b/www/Images/_notes/dwsync.xml index 5d5abc1..c76864d 100644 --- a/www/Images/_notes/dwsync.xml +++ b/www/Images/_notes/dwsync.xml @@ -10,4 +10,7 @@ + + + \ No newline at end of file diff --git a/www/RaspberryIPCameraSettings.ini b/www/RaspberryIPCameraSettings.ini index a168440..71537f3 100644 --- a/www/RaspberryIPCameraSettings.ini +++ b/www/RaspberryIPCameraSettings.ini @@ -1,4 +1,4 @@ -SoftwareVersion = "v1.5 Beta" +SoftwareVersion = "v1.6 Beta" IPAssignment = "DHCP" ntpclient = "enabled" IPAddress = "" diff --git a/www/Status.php b/www/Status.php index ad10f2b..353324f 100644 --- a/www/Status.php +++ b/www/Status.php @@ -23,11 +23,12 @@ + - + - + @@ -69,13 +70,23 @@ '); } if($camerasettings['encoding'] == "h264") { echo('

The IP Camera is currently running in RTSP server mode and can be accessed by an external RTSP player (VLC, mplayer, Synology Surveillance station, etc ...) via below mrl.

rtsp://'); - echo trim(shell_exec("ifconfig eth0 | awk '/inet / { print $2 }' | sed 's/addr://'")); + if (preg_match('/^up/',shell_exec("cat /sys/class/net/eth0/operstate"))) { + echo trim(shell_exec("ifconfig eth0 | awk '/inet / { print $2 }' | sed 's/addr://'")); + } + else { + echo trim(shell_exec("ifconfig wlan0 | awk '/inet / { print $2 }' | sed 's/addr://'")); + } echo(':8554'); } ?> @@ -94,30 +105,79 @@

- -
-
-

Network Settings

-
-

IP Address Assignment:

-

-

Cable Connection Status:

-

-

Mac Address:

-

-

IP Address:

-

-

Subnet Mask:

-

-

Default Gateway:

-

-

Primary DNS Server:

-

-

Secondary DNS Server:

-

-
-
-
+ + +
+
+
+

Network Settings

+
+

IP Address Assignment:

+

+

Cable Connection Status:

+

+

Mac Address:

+

+

IP Address:

+

+

Subnet Mask:

+

+

Default Gateway:

+

+

Primary DNS Server:

+

+

Secondary DNS Server:

+

+
+
+
+
+ +
+
+
+

Wifi Settings

+
+

IP Address Assignment:

+

+

Wifi Adapter Status:

+
+

+ +

+
+

Mac Address:

+

+

IP Address:

+

+

Subnet Mask:

+

+

Default Gateway:

+

+

Primary DNS Server:

+

+

Secondary DNS Server:

+

+
+
+
+
+ + + + + + + + diff --git a/www/Templates/Site-Template.dwt.php b/www/Templates/Site-Template.dwt.php index 052e46d..1cab673 100644 --- a/www/Templates/Site-Template.dwt.php +++ b/www/Templates/Site-Template.dwt.php @@ -21,11 +21,12 @@ + - +