Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Client Controls Fixes #194

Closed
wants to merge 4 commits into from
Closed

Client Controls Fixes #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3767b5e
removed return statements from init calls
Mar 4, 2014
6709e6b
Swapped calculations for hours and days
Mar 6, 2014
97b0c5c
Removed unused seconds value
Mar 6, 2014
5628c7b
Removed additional unused code
Mar 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions files/etc/init.d/ucidog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ reload() {
local splash_time=$(uci_get nodogsplash settings splashtime)
local splash_unit=$(uci_get nodogsplash settings splashunit)
if [ "$splash_unit" == "days" ]; then
splash_time=$(($splash_time*60))
elif [ "$splash_unit" == "hours" ]; then
splash_time=$(($splash_time*24*60))
elif [ "$splash_unit" == "seconds" ]; then
splash_time=$(($splash_time/60))
elif [ "$splash_unit" == "hours" ]; then
splash_time=$(($splash_time*60))
fi
#set splashpage time
sed -i "s/^\(ClientIdleTimeout \).*/\1 $splash_time/" $conffile || return 0
Expand All @@ -35,10 +33,10 @@ reload() {
#disable/enable nodogsplash
local enable=$(uci_get nodogsplash settings enable)
echo "$enable"
if [ "$enable" == '1' ]; then #this might come back as a string and not as a intiger. Check and fix that.
/etc/init.d/nodogsplash enable || return 0
/etc/init.d/nodogsplash start || return 0
if [ "$enable" == '1' ]; then #this might come back as a string and not as a integer. Check and fix that.
/etc/init.d/nodogsplash enable
/etc/init.d/nodogsplash start
else
/etc/init.d/nodogsplash disable || return 0
/etc/init.d/nodogsplash disable
fi
}
1 change: 0 additions & 1 deletion luasrc/model/cbi/commotion/client_wp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ tfield.datatype = "uinteger"
tfield.forcewrite = true

timeopt = stime:option(ListValue, "splashunit")
timeopt:value("seconds")
timeopt:value("minutes")
timeopt:value("hours")
timeopt:value("days")
Expand Down