From 2534045ef53d9312ef20723a7c74b301e3026320 Mon Sep 17 00:00:00 2001
From: iamromulan <50184035+iamromulan@users.noreply.github.com>
Date: Wed, 8 May 2024 11:34:12 -0400
Subject: [PATCH 1/2] Maintain current version of TTL cgi

---
 simpleadmin/www/cgi-bin/get_ttl_status |  4 ++--
 simpleadmin/www/cgi-bin/set_ttl        | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/simpleadmin/www/cgi-bin/get_ttl_status b/simpleadmin/www/cgi-bin/get_ttl_status
index 03d366b..dc2d54b 100644
--- a/simpleadmin/www/cgi-bin/get_ttl_status
+++ b/simpleadmin/www/cgi-bin/get_ttl_status
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Check iptables for ttlvalue
-ttlvalue=$(iptables -t mangle -vnL | awk '/TTL/ {print $13; exit}')
+ttlvalue=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}' | head -n1)
 ttlenabled=true;
 
 # Set Variables
@@ -17,4 +17,4 @@ cat <<EOT
     "isEnabled": $ttlenabled,
     "ttl": $ttlvalue
 }
-EOT
\ No newline at end of file
+EOT
diff --git a/simpleadmin/www/cgi-bin/set_ttl b/simpleadmin/www/cgi-bin/set_ttl
index db0f24c..256c7cb 100644
--- a/simpleadmin/www/cgi-bin/set_ttl
+++ b/simpleadmin/www/cgi-bin/set_ttl
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+PATH=/bin:/usr/sbin:/usr/bin:/sbin:/opt/sbin:/opt/bin:/usrdata/root/bin
 # Get query
 QUERY_STRING=$(echo "${QUERY_STRING}" | sed 's/;//g')
 
@@ -22,28 +22,28 @@ setTTL=$(printf '%b\n' "${ttlvalue//%/\\x}")
 
 if [ -n "${setTTL}" ]; then
     # Stop Service To Remove Rules
-    /usrdata/simplefirewall/ttl-override stop
+    /opt/bin/sudo /usrdata/simplefirewall/ttl-override stop
 
     # Check iptables is still set
-    ttlcheck=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
+    ttlcheck=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}')
 
     # If TTL is still set manually remove values
-    if [ !-z "${ttlcheck}" ]; then
-        iptables -t mangle -D POSTROUTING -o rmnet+ -j TTL --ttl-set ${ttlcheck} &>/dev/null || true
-        ip6tables -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true
+    if [ ! -z "${ttlcheck}" ]; then
+        /opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -D POSTROUTING -o rmnet+ -j TTL --ttl-set ${ttlcheck} &>/dev/null || true
+        /opt/bin/sudo /usr/sbin/ip6tables -w 5 -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true
     fi
 
     # Echo TTL to file
     echo $setTTL > /usrdata/simplefirewall/ttlvalue
 
     # Set Start Service
-    /usrdata/simplefirewall/ttl-override start
+    /opt/bin/sudo /usrdata/simplefirewall/ttl-override start
 fi
 
 
 
 # Check iptables for ttlvalue
-ttlvalue=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
+ttlvalue=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}')
 ttlenabled=true;
 
 # Set Variables
@@ -58,4 +58,5 @@ cat <<EOT
 {
     "isEnabled": $ttlenabled,
     "ttl": $ttlvalue
-}
\ No newline at end of file
+}
+EOT

From b8ae6fc95f8de7ce25e67327cb0ce494b42291be Mon Sep 17 00:00:00 2001
From: Cameron Thompson <50184035+iamromulan@users.noreply.github.com>
Date: Wed, 8 May 2024 11:39:07 -0400
Subject: [PATCH 2/2] Add favicon.ico to installation script

---
 simpleupdates/scripts/update_simpleadmin.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/simpleupdates/scripts/update_simpleadmin.sh b/simpleupdates/scripts/update_simpleadmin.sh
index 62e4099..10a6bb7 100644
--- a/simpleupdates/scripts/update_simpleadmin.sh
+++ b/simpleupdates/scripts/update_simpleadmin.sh
@@ -133,8 +133,9 @@ echo -e "\e[1;31m2) Installing simpleadmin from the $GITTREE branch\e[0m"
 			sleep 1
 			cd $SIMPLE_ADMIN_DIR/www
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/deviceinfo.html
+   			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/favicon.ico
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/index.html
-    		wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/network.html
+    		        wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/network.html
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/settings.html
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/sms.html
    			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/logout.html