cleaner filter builder

[serve0] / constants.sh

diff --git a/constants.sh b/constants.sh
index 8dcccd5864aa052a161f6f78db800d407b4e1a1d..266f73430d6d636fc706368aeafd3dbd878e649f 100755 (executable)
--- a/constants.sh
+++ b/constants.sh
@@ -24,9 +24,9 @@ file_pattern='^.*(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|webm|iso|rmvb)
 data_dirs cache meta mp4 videos thumbs trash by_length transcoded
 
 cgi_cookie
-validate(){ printf '%s\n' "$1" |sed -rn '2q;/^'"$2"'$/{p;q};a'"$3"; }
+validate(){ printf '%s\n' "$1" |sed -rn '2q;/^('"$2"')$/{p;q};a'"$3"; }
 
-_GET[o]=$( validate "${_GET[o]}"  '(Name|Date|Length)' Name)
+_GET[o]=$( validate "${_GET[o]}"  'Name|Date|Length' Name)
 _GET[pn]=$(validate "${_GET[pn]}" '[1-9][0-9]*' 1)
 
 _COOKIE[pagesize]=$(validate "${_COOKIE[pagesize]}" '[1-9][0-9]*' 50)