"
} else {
puts "
"
diff --git a/webif/html/sched/rpc/info.jim b/webif/html/sched/rpc/info.jim
index e5a3f90c..9e526bcd 100755
--- a/webif/html/sched/rpc/info.jim
+++ b/webif/html/sched/rpc/info.jim
@@ -55,7 +55,7 @@ puts "[clock format $s -format "%a %d %b %Y"]
if {$d > 0 && $n > $s && $n < $e} {
puts "
"
- set perc [expr [expr $n - $s] * 100 / $d]
+ set perc [expr {[expr {$n - $s}] * 100 / $d}]
puts "
"
puts [progressbar $perc]
}
diff --git a/webif/html/sched/visual/index.jim b/webif/html/sched/visual/index.jim
index 29cca20e..14e1bf4a 100755
--- a/webif/html/sched/visual/index.jim
+++ b/webif/html/sched/visual/index.jim
@@ -23,7 +23,7 @@ lmap i \
#set svcmap [lreverse $hmap]
proc lsum {l} {
- expr [join $l +] + 0
+ expr [join [linsert $l 0 0] +]
}
proc pop_event {} {
@@ -132,7 +132,7 @@ set padadj 0
# Returns an absolute number of pixels from the left corresponding
# to a number of seconds into the day.
proc secstopx {daysecs hourpx usedhours} {
- set max [expr int($daysecs / 3600)]
+ set max [expr {int($daysecs / 3600)}]
# Subtract any unused hours from $daysecs.
for {set i 0} {$i < $max} {incr i} {
if {$i >= 24} break
@@ -140,7 +140,7 @@ proc secstopx {daysecs hourpx usedhours} {
incr daysecs -3600
}
}
- return [expr int($daysecs * $hourpx / 3600)]
+ return [expr {int($daysecs * $hourpx / 3600)}]
}
# daysecs - absolute number of seconds into the day that needs to be reached.
@@ -295,7 +295,7 @@ proc render_timeline {usedhours} {
}
# calculate pixels per hour
- set hourpx [expr int($width / $tothours)]
+ set hourpx [expr {int($width / $tothours)}]
if {$debug} {
puts "USEDHOURS: $usedhours
\n"
diff --git a/webif/html/xepg/index.jim b/webif/html/xepg/index.jim
index 0e1e3733..9e334623 100755
--- a/webif/html/xepg/index.jim
+++ b/webif/html/xepg/index.jim
@@ -37,10 +37,10 @@ require epg_popup
set now [clock seconds]
set stt [cgi_get stt $now]
-set dst [expr $now - $stt]
+set dst [expr {$now - $stt}]
if {$dst >= 0 && $dst < 1800} {
set current 1
-} elseif { $stt < [expr int ($now / 86400) * 86400] } {
+} elseif { $stt < [expr {int ($now / 86400) * 86400}] } {
set stt $now
set current 0
} else {
@@ -51,7 +51,7 @@ set favgroup [$settings channel_group]
set hours [cgi_get hours -]
if {$hours eq "-"} {
- set hours [expr 1.0 * [[settings] xepghours]]
+ set hours [expr {1.0 * [[settings] xepghours]}]
}
if {$hours == 0} { set hours 4.0 }
@@ -61,7 +61,7 @@ if {$hours > 8} { set hours 8.0 }
set seconds $($hours * 3600)
set ostt $stt
-set stt [expr int($stt / 1800.0) * 1800]
+set stt [expr {int($stt / 1800.0) * 1800}]
set ett $(int($stt + $seconds))
set offset 0
@@ -124,11 +124,11 @@ for {set i 0} {$i < 24} {incr i} {
if {$i == $starthour} {
append xclass " tjstart"
- } elseif {$i > $starthour && $i < [expr $starthour + $hours]} {
+ } elseif {$i > $starthour && $i < [expr {$starthour + $hours}]} {
append xclass " tjother"
}
- set tt [expr $starthour + $stt + 3600 * ($i - $starthour)]
+ set tt [expr {$starthour + $stt + 3600 * ($i - $starthour)}]
# Back to start of hour
set tt $(3600 * int($tt / 3600))
@@ -191,7 +191,7 @@ puts "
for {set i 0} {$i < $hours * 2} {incr i} {
puts "
"
+ style=\"width: [expr {$minpx * 30}]px\">"
puts "[clock format $($stt + 1800 * $i) -format "%H:%M"]
"
}
@@ -201,10 +201,11 @@ puts "