hostmngr: access schedule stop time calculation

stop time calculation has been corrected now to add duration
to utc converted start time.

hostmngr/files/etc/firewall.hosts

@@ -10,7 +10,6 @@ process_ac_schedule() {
 	local is_enabled
 	local access_control
 	local start_time=""
-	local stop_time=""
 	local mac=""
 
 	handle_day_list() {
@@ -52,28 +51,6 @@ process_ac_schedule() {
 	if [ -z "$start_time" ]; then
 		start_time="0:0"
 	fi
-
-        if [ -n "$duration" ]; then
-		hh=$(echo $start_time | awk -F: '{ print $1 }')
-                mm=$(echo $start_time | awk -F: '{ print $2 }')
-                hh_s=`expr $hh \* 3600`
-                mm_s=`expr $mm \* 60`
-                ss=$(( hh_s + mm_s ))
-
-                stop_ss=$(( ss + duration ))
-                hh=$(( stop_ss / 3600 ))
-                if [ $hh -lt 24 ]; then
-                	rem_ss=$(( stop_ss % 3600 ))
-                	mm=$(( rem_ss / 60 ))
-                	ss=$(( rem_ss % 60 ))
-                	stop_time="$hh:$mm:$ss"
-                else
-                	stop_time="23:59"
-                fi
-        else
-        	stop_time="23:59"
-        fi
-
 	# conversion to utc
 	zone=$(date +%z | cut -c 1)
 	utc_h=$(date -u -d @$(date "+%s" -d "$start_time") +%H)
@@ -84,14 +61,26 @@ process_ac_schedule() {
 		start_utc=$(date -u -d @$(date "+%s" -d "$start_time") +%H:%M)
 	fi
 
-	utc_h=$(date -u -d @$(date "+%s" -d "$stop_time") +%H)
-	local_h=$(echo $stop_time | awk -F: '{ print $1 }')
-	if [ "$zone" == "-" ] && [ $utc_h -lt $local_h ]; then
-		stop_utc="23:59"
-	else
-		stop_utc=$(date -u -d @$(date "+%s" -d "$stop_time") +%H:%M)
-	fi
+        if [ -n "$duration" ]; then
+		hh=$(echo $start_utc | awk -F: '{ print $1 }')
+                mm=$(echo $start_utc | awk -F: '{ print $2 }')
+                hh_s=`expr $hh \* 3600`
+                mm_s=`expr $mm \* 60`
+                ss=$(( hh_s + mm_s ))
 
+                stop_ss=$(( ss + duration ))
+                hh=$(( stop_ss / 3600 ))
+                if [ $hh -lt 24 ]; then
+                	rem_ss=$(( stop_ss % 3600 ))
+                	mm=$(( rem_ss / 60 ))
+                	ss=$(( rem_ss % 60 ))
+			stop_utc="$hh:$mm:$ss"
+                else
+			stop_utc="23:59"
+                fi
+        else
+		stop_utc="23:59"
+        fi
 
 	IP_RULE="$IP_RULE -m time --timestart $start_utc --timestop $stop_utc"
 	if [ -n "$day" ]; then