Merge pull request #1427 from rern/UPDATE

Update
rern · Sep 18, 2023 · bdf3f5b · bdf3f5b
2 parents 6aa46bc + 6e77023
commit bdf3f5b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/srv/http/assets/js/system.js b/srv/http/assets/js/system.js
@@ -319,7 +319,7 @@ $( '#setting-wlan' ).on( 'click', function() {
 		} );
 	}, 'json' );
 } );
-$( '#i2smodulesw' ).on( 'click', function() {
+$( '#divi2smodulesw' ).on( 'click', function() {
 	setTimeout( i2sOptionSet, 0 );
 } );
 $( '#i2smodule' ).on( 'change', function() {

diff --git a/srv/http/bash/common.sh b/srv/http/bash/common.sh
@@ -173,7 +173,7 @@ getVar(){
 	stringEscape $line
 }
 internetConnected() {
-	ipOnline 8.8.8.8
+	ping -c 1 -w 1 8.8.8.8 &> /dev/null && return 0
 }
 ipAddress() {
 	ifconfig | awk '/inet.*broadcast/ {print $2;exit}' | head -1

diff --git a/srv/http/bash/settings/system-data.sh b/srv/http/bash/settings/system-data.sh
@@ -40,7 +40,6 @@ if [[ $throttled != 0x0 ]]; then
 		[[ ${occured:i:1} == 1 ]] && warning+=" · ${e_occured[i]}<br>"
 	done
 fi
-! internetConnected && warning+=" · Internet is offline"
 # for interval refresh
 [[ $1 == status ]] && pushstream refresh '{ "page": "system", "status": "'$status'", "warning": "'$warning'" }' && exit
 

diff --git a/srv/http/settings/system.php b/srv/http/settings/system.php
@@ -47,7 +47,7 @@
 	<br>CPU Temp<wide>erature</wide></span>
 	<br>Time
 	<br>Up Time
-	<div id="warning">'.i( 'warning yl' ).'>&ensp;<wh>Warning</wh></div>';
+	<div id="warning">'.i( 'warning yl' ).'&ensp;<wh>Warning</wh></div>';
 $help = '<wh>• CPU Load:</wh>
  · Average number of processes which are being executed and in waiting.
  · calculated over 1, 5 and 15 minutes.