adapted to update in shcgi

[serve0] / pages / common.sh

diff --git a/pages/common.sh b/pages/common.sh
index 7dfec96f5b539c565d7ca218fe9a392a104baa95..b424dff0a914c360052a54e6dbf3f3b69422c0be 100755 (executable)
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -17,10 +17,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Serve0.  If not, see <http://www.gnu.org/licenses/>. 
 
-filter="$_GET[\"f\"]"
-search="$_GET[\"s\"]"
-order=$(echo -E "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
-page=$(echo -E "$_GET[\"pn\"]" |egrep '^[0-9]+$')
+filter="${_GET[f]}"
+search="${_GET[s]}"
+order=$(echo -E "${_GET[o]}" |egrep '^(Name|Date|Length)$')
+page=$(echo -E "${_GET[pn]}" |egrep '^[0-9]+$')
 [ -z "$page" ] && page=0
 
 page_link=''
@@ -130,7 +130,7 @@ thumblist() {
       $genlist |sed -rn 's:^(.+)$:'"${_DATA}"'/meta/\1'.meta':p' |xargs -d\\n egrep -sil "$search" |sed -rn 's:^(.*/)+([^/]+)\.meta$:\2:p'
     elif [ "$filterex" != "q0" ]; then
       $genlist |while read video; do
-        [ -r "${_DATA}/meta/$video.meta" ] && sed -rn "2{$filterex;q1}" "${_DATA}/meta/$video.meta" && echo -E "$video"
+        [ -r "${_DATA}/meta/$video.meta" ] && sed -rn "2{$filterex;q1}" "${_DATA}/meta/$video.meta" && printf '%s\n' "$video"
       done
     else
       $genlist