hummypkg/sweeper
4
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fix \ handling

Browse Source
This commit is contained in:
hummypkg 2015-06-15 20:14:16 +00:00
parent cfbd471f7a
commit 0b7de42218
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTROL/control
View File

@ -1,7 +1,7 @@
Package: sweeper Package: sweeper
Priority: optional Priority: optional
Section: misc Section: misc
Version: 2.0.8 Version: 2.0.8-2
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk Maintainer: af123@hummypkg.org.uk
Depends: webif(>=1.2.2-6) Depends: webif(>=1.2.2-6)

4
webif/plugin/sweeper/auto.hook
View File

@ -129,7 +129,7 @@ proc ::sweeper::expand {ts str {orig ""}} {
incr pos incr pos
set e [string first $ch $ret $pos] set e [string first $ch $ret $pos]
if {$e == -1} { if {$e == -1} {
log "Error. %$fn - $i/$numargs parameters found." log "Error. %$fn - [llength $fnargs]/$numargs parameters found."
break break
} }
lappend fnargs [string range $ret \ lappend fnargs [string range $ret \
@ -138,10 +138,12 @@ proc ::sweeper::expand {ts str {orig ""}} {
} }
set ret [string replace $ret $i $pos] set ret [string replace $ret $i $pos]
if {[llength $fnargs] == $numargs} {
log " - Calling expand_$fn\($fnargs)" 2 log " - Calling expand_$fn\($fnargs)" 2
::sweeper::expand_$fn $ts ret {*}$fnargs ::sweeper::expand_$fn $ts ret {*}$fnargs
} }
} }
}
return $ret return $ret
} }

4
webif/plugin/sweeper/rules_json.jim
View File

@ -46,7 +46,9 @@ proc add_json {str} {
} }
proc quot {str} { proc quot {str} {
return [cgi_quote_html $str] return [string map {
"\\" "\\\\"
} [cgi_quote_html $str]]
} }
set composite {and or} set composite {and or}