added licence headers, coding style improvements

svn path=/trunk/; revision=100

diff --git a/actions/filter.sh b/actions/filter.sh
index c7f4d87fd8aba5e3125866735a397d07fc33f6b0..6f64a97698e5b5d02299a115ca935d120366b177 100755 (executable)
--- a/actions/filter.sh
+++ b/actions/filter.sh
@@ -1,4 +1,20 @@
 #!/bin/zsh
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+#
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Serve0  If not, see <http://www.gnu.org/licenses/>.
 
 cgi_post
 order=$(validate "${_POST[o]}" 'Name|Length|Date' Name)
@@ -22,5 +38,5 @@ for fn in {0..9}; do
   done
 done
 
-echo "?o=${order}&f=${filters}" >>${_DATA}/meta/recent
-echo -n "Location: ?o=${order}&f=${filters}\n\n"
+printf %s "?o=${order}&f=${filters}" >>${_DATA}/meta/recent
+redirect  "?o=${order}&f=${filters}"

diff --git a/actions/meta.sh b/actions/meta.sh
index 034befabe19d2ee374f38094af9481b2aecef1d2..894743e7796f558fcc6fb05a77c16155a189c881 100755 (executable)
--- a/actions/meta.sh
+++ b/actions/meta.sh
@@ -1,4 +1,20 @@
 #!/bin/zsh
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+#
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Serve0  If not, see <http://www.gnu.org/licenses/>.
 
 cgi_refdata
 
@@ -16,14 +32,11 @@ height="${_POST[height]}"
  trash="${_POST[trash]}"
 cancel="${_POST[cancel]}"
 tagacc="${_POST[tag]}"
-tags="$(echo "${_POST[tags]}" \
-        | sed -r 's:\t| :_:g;s:^!|\r|\$|\^::g;s:\\:\\\\:g;s/</\&lt\;/g;s/>/\&gt\;/g'
-)"
-description="$(echo -e "${_POST[description]}" \
-               |sed 's/\r//g;s/\\/\\\\/g;s/</\&lt\;/g;s/>/\&gt\;/g'
-)"
+tags="$(htmlsafe "${_POST[tags]}" |sed -r 's:\t| :_:g;s:^!|\r|\$|\^::g;' |tr '\n' '|')"
+description="$(htmlsafe "${_POST[description]}")"
+
 n=0; while [ -n "${_POST[tag$n]}" ]; do
-  tagacc="${_POST[tag$n]}|$tagacc"
+  tagacc="$(htmlsafe ${_POST[tag$n]} |sed -r '2,$d;s:\t| :_:g;s:^!|\r|\$|\^::g;')|$tagacc"
   n=$(($n + 1))
 done
 
@@ -33,13 +46,14 @@ done
   rm "${_DATA}/cache/$info.cache" 2>/dev/null
   rm ${_DATA}/cache/\?* 2>/dev/null
 else
-  echo -e "$length\t$width\t$height\t$info" > "$file"
-  echo -e "${tagacc}|${tags}" |tr '\n' '|' >> "$file"
-  echo >>"$file"
-  echo -e "${description}" >> "$file"
+  cat >$file <<EOF
+${length}      ${width}        ${height}       ${info}
+${tagacc}|${tags}
+${description}
+EOF
   rm "${_DATA}/cache/$info.cache" 2>/dev/null
   rm ${_DATA}/cache/*[0-9]\?* 2>/dev/null
   rm ${_DATA}/cache/taglist 2>/dev/null
 fi
 
-echo -n "Location: ?i=&pn=${page}&s=${search}&f=${filter}&o=${order}#$info\n\n"
+redirect "?i=&pn=${page}&s=${search}&f=${filter}&o=${order}#${info}"

diff --git a/actions/multitag.sh b/actions/multitag.sh
index db106f512406defd685eb73f89cacd5b2fdbe957..5691b4fd8869c3dfe254ad2a53d956ecba64cb8c 100755 (executable)
--- a/actions/multitag.sh
+++ b/actions/multitag.sh
@@ -1,9 +1,25 @@
 #!/bin/zsh
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+#
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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 "${_GET[o]}" |egrep '^(Name|Date|Length)$')
-page=$(echo "${_GET[pn]}" |egrep '^[0-9]+$')
+order=$(validate "${_GET[o]}" 'Name|Date|Length' Name)
+page=$(validate "${_GET[pn]}" '[0-9]+' 1)
 
 addtag(){
   meta="$1"
@@ -31,11 +47,13 @@ while [ -n "${_POST[tagsel$n]}" ]; do
   tagsel="${_POST[tagsel$n]}"
   ( t=''
     while [ -n "${_POST[ctag$t]}" ]; do
-      echo "${_POST[ctag$t]}"
+      htmlsafe "${_POST[ctag$t]}"
+      printf \\n
       [ -z "$t" ] && t=0 || t=$(($t + 1))
     done
-    echo "${_POST[tags]}"
-  ) |sed -r 's:\t| :_:g;s:^!|\r|\$|\^::g;s:\\:\\\\:g;s/</\&lt\;/g;s/>/\&gt\;/g' \
+    htmlsafe "${_POST[tags]}"
+    printf \\n
+  ) |sed -r 's:\t| :_:g;s:^!|\r|\$|\^::g;' \
   | while read tag; do
     addtag "${_DATA}/meta/$tagsel.meta" "$tag"
   done
@@ -47,4 +65,4 @@ done
 rm "${_DATA}"/cache/*[0-9]\?* 2>/dev/null
 [ -n "${_POST[tags]}" ] && rm "${_DATA}"/cache/taglist 2>/dev/null
 
-echo -n "Location: ?o=$order&s=$search&f=$filter&pn=$page\n\n"
+redirect "?o=$order&s=$search&f=$filter&pn=$page"

diff --git a/actions/transcode.sh b/actions/transcode.sh
index 427c154742d240ff6917dd927a72ea4e6c990c2b..35ff8f4482d09e488ae2861ddc66e91d1bb36464 100755 (executable)
--- a/actions/transcode.sh
+++ b/actions/transcode.sh
@@ -1,4 +1,20 @@
 #!/bin/zsh
+# Copyright 2015 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+#
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Serve0  If not, see <http://www.gnu.org/licenses/>.
 
 info="${_GET[i]}"
 target="${_GET[t]}"
@@ -15,5 +31,4 @@ if ! [ -f "$trans" ]; then
  [ "$target" -gt 240 ] && nohup avconv -i "$video" -s "${twidth}x${target}" -threads auto "$trans" &
 fi
 
-echo "Location: /transcoded/${info}.${target}p.webm"
-echo 
+redirect "/transcoded/${info}.${target}p.webm"

diff --git a/helpers/genall.sh b/helpers/genall.sh
index 950a49080c99576259b7b5ede5c65de8e9170776..78e079432be0752de965b5f21391964b50744883 100755 (executable)
--- a/helpers/genall.sh
+++ b/helpers/genall.sh
@@ -1,4 +1,20 @@
 #!/bin/zsh
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+#
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Serve0  If not, see <http://www.gnu.org/licenses/>.
 
 dir="$(dirname $0)"
 genmeta="$dir/genmeta.sh"
@@ -18,7 +34,7 @@ addtag(){
   
   egrep -q "(^|.*\|)$tag(\|.*|$)" <<<"$tags" || tags="$tag|$tags"
   
-  cat <<EOF >"$meta"
+  cat >"$meta" <<EOF
 $length        $width  $height $info
 $tags
 $description
@@ -28,13 +44,13 @@ EOF
 
 for each in *; do
 if (egrep -q "$file_pattern" <<<"$each"); then
-  echo -n "$each ... Thumb ..."
+  printf %s "$each ... Thumb ..."
   $genthumb "$each" "${each}.jpg" >/dev/null 2>/dev/null
-  echo -n ' Meta ...'
+  printf %s ' Meta ...'
   $genmeta "$each" "${each}.meta" >/dev/null 2>/dev/null
-  echo -n ' Tags ...'
+  printf %s ' Tags ...'
   for tag in $*; do
     addtag "${each}.meta" "$tag"
   done
-  echo ' Done!'
+  printf 'Done!\n'
 fi; done

diff --git a/helpers/genmeta.sh b/helpers/genmeta.sh
index ceeebe307bdcf8abbc78ae8f58d1dc1cc5fbf843..ca0fe7f8c1a54f1e0b7ee18d3821e80a1879ffa5 100755 (executable)
--- a/helpers/genmeta.sh
+++ b/helpers/genmeta.sh
@@ -1,4 +1,20 @@
 #!/bin/zsh
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+#
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Serve0  If not, see <http://www.gnu.org/licenses/>.
 
 video="$1"
 meta="$2"
@@ -8,7 +24,7 @@ if [ -r "$meta" ]; then
   description="$(sed -n '3,$p' "$meta")"
 fi
 
-echo '' |mplayer -input nodefault-bindings -nosound -vo null -identify -frames 0 "$video" \
+printf '' |mplayer -input nodefault-bindings -nosound -vo null -identify -frames 0 "$video" \
 | sort \
 | sed -rn 's:ID_LENGTH=(.*)(\..*)$:\1:p;
            s:ID_VIDEO_HEIGHT=(.*):\1:p;

diff --git a/helpers/genthumb.sh b/helpers/genthumb.sh
index 78f53c140c472567e998140e7cc6c1f3f93e802a..9a0c64ad96ba7f12988caace7eafecf2b2f5e67c 100755 (executable)
--- a/helpers/genthumb.sh
+++ b/helpers/genthumb.sh
@@ -1,10 +1,26 @@
 #!/bin/zsh
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+#
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Serve0  If not, see <http://www.gnu.org/licenses/>.
 
 video="$1"
 thumb="$2"
 
 if [ -e "$video" -a \! -e "$thumb" ]; then
-  echo '' |mplayer -input nodefault-bindings -nosound -vo null -frames 0 -identify "$video" \
+  printf '' |mplayer -input nodefault-bindings -nosound -vo null -frames 0 -identify "$video" \
   | sort \
   | sed -rn 's:^.*ID_LENGTH=(.*)(\..*)$:\1:p;
              s:^.*ID_VIDEO_HEIGHT=(.*)$:\1:p;
@@ -19,7 +35,7 @@ if [ -e "$video" -a \! -e "$thumb" ]; then
   
   tmp="$(mktemp -d)"
   for cnt in 1 2 3 4; do
-    echo '' |mplayer -input nodefault-bindings -nosound -vo jpeg:outdir="$tmp" -frames 1 \
+    printf '' |mplayer -input nodefault-bindings -nosound -vo jpeg:outdir="$tmp" -frames 1 \
              -benchmark -vf framestep=I,scale="$width":-2 -ss "$(($cnt*$chunk))" "$video" >/dev/null 2>/dev/null
     mv "$tmp/00000001.jpg" "${tmp}/_${cnt}.jpg"
   done

diff --git a/pages/common.sh b/pages/common.sh
index ecf16c2596eacba18f6e696b43bee5d8bab64308..4242aab3807ae9738ba86f4a79d6ad42bab84762 100755 (executable)
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014, 2015 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
 #
 # This file is part of Serve0.
 # 
@@ -28,7 +28,7 @@ page_link=''
 [ -n "$order" ]  && page_link="${page_link}o=${order}&"
 [ -n "$search" ] && page_link="${page_link}s=${search}&"
 [ -n "$filter" ] && page_link="${page_link}f=${filter}&"
-page_prev="${page_link}pn=$([ "$page" -le "$pagesize" ] && echo 1 || echo $(($page - $pagesize)) )"
+[ "$page" -le "$pagesize" ] && page_prev="${page_link}pn=1" || page_prev="${page_link}pn=$(($page - $pagesize))"
 page_next="${page_link}pn=$(($page + $pagesize))"
 page_this="${page_link}pn=$page"
 
@@ -42,7 +42,7 @@ else
     sed -n '2s:|:\n:gp' "$each"
   done \
   | sort 
-  echo 
+  printf \\n 
   ) | (while read tag; do
     if [ "$tag" = "$lasttag" ]; then
       tagcount=$(( ${tagcount:-0} + 1 ))
@@ -53,7 +53,7 @@ else
     lasttag="$tag"
   done \
   | sort -rn 
-  echo
+  printf \\n
   ) | while read x tag; do
     topcnt=$(grep "${tag%%:*}" ${_DATA}/cache/taglist |wc -l)
     [ $topcnt -lt 10 ] \
@@ -68,7 +68,7 @@ fi
 )
 
 list_categories(){
-  echo none
+  printf none\\n
   printf %s "$taglist" |sed -rn 's;^([^:]+):.*$;\1;p' |sort -u
 }
 

diff --git a/pages/list.sh b/pages/list.sh
index 2d3cbf3bad443f2eb5c0aec98ee6c8afbc60dca9..0870961fa124b7b498214dd66d2cef358a441406 100755 (executable)
--- a/pages/list.sh
+++ b/pages/list.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014, 2015 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
 #
 # This file is part of Serve0.
 # 
@@ -19,16 +19,19 @@
 
 . $_EXEC/pages/common.sh
 
+LF='
+'
 filters="${_GET[f]}"
 debug "FILTERS: $filters"
 
 quicklinks(){
   output=''
-  tac ${_DATA}/meta/recent |while [ "$(echo "$output" |wc -l)" -lt 10 ] && read line; do
+  tac ${_DATA}/meta/recent \
+  | while [ "$(printf %s "$output" |wc -l)" -lt 10 ] && read line; do
     line="<a href="$line">$line</a>" 
-    echo "$output" |grep -qF "$line" || output="$output$line\n"
+    printf %s "$output" |grep -qF "$line" || output="$output$line$LF"
   done 
-  echo $output
+  printf %s\\n "$output"
 }
 
 category_selected(){
@@ -56,9 +59,9 @@ _printVideo(){
     [ -r "$meta"  ] || genmeta "$videofile" "$meta"
 
     head -n1 "$meta" |read length width height filename
-    [ -z "$length" ] && length=0
-    [ -z "$width"  ] && width=0
-    [ -z "$height" ] && height=0
+    length=$(validate "$length" '[0-9]+' 0)
+    width=$(validate "$width" '[0-9]+' 0)
+    height=$(validate "$height" '[0-9]+' 0)
 
     tags="$(sed -n 2p "$meta")"
     video="$(urlsafe "videos/$info")"

diff --git a/pages/view.sh b/pages/view.sh
index 689d6c1e3f8c8f2fc3ddb068dfbb7130c74db0ba..ec873bda530c1e03665cabf19a523e1a1cbafb21 100755 (executable)
--- a/pages/view.sh
+++ b/pages/view.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014 - 2016 Paul Hänsch
+# Copyright 2014 2016 Paul Hänsch
 #
 # This file is part of Serve0.
 # 
@@ -31,7 +31,7 @@ description="$(sed -n '3,$p' "$meta")"
 length=0; width=0; height=0;
 
 debug "Analysing video: $video"
-echo '' |mplayer -input nodefault-bindings -nosound -vo null -identify -frames 0 "$video" \
+printf '' |mplayer -input nodefault-bindings -nosound -vo null -identify -frames 0 "$video" \
 | sort \
 | sed -rn 's:ID_LENGTH=(.*)(\..*)$:\1:p;
            s:ID_VIDEO_HEIGHT=(.*):\1:p;

diff --git a/templates/advfilter.html.sh b/templates/advfilter.html.sh
index ec2e5e7691afd1b00589583df7f289f4833445fe..7fac882896e85461f1c127d2ebfcebfe7096bb3e 100755 (executable)
--- a/templates/advfilter.html.sh
+++ b/templates/advfilter.html.sh
@@ -1,4 +1,4 @@
-# Copyright 2014,2015 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
 #
 # This file is part of Serve0
 # 
@@ -19,7 +19,7 @@ category_tabs(){
   for cat in "$@"; do
   cat <<EOF
   <div class="tab">
-    <input class="tabhandle" type="radio" name="category$n" id="cat${n}_$cat" value="$cat" $([ "$cat" = "$fcat" ] && echo checked)>
+    <input class="tabhandle" type="radio" name="category$n" id="cat${n}_$cat" value="$cat" $([ "$cat" = "$fcat" ] && printf checked)>
     <label class="category tabhandle" for="cat${n}_$cat">$([ "$cat" = none ] && printf %s general || printf %s "$cat")</label>
     <select class="category tabcontent" class="input tagfilter" name="cfilter${n}_" size="12" multiple>
       $(category_selected "$cat" "$filter")
@@ -40,7 +40,7 @@ filterbox(){
     debug "fneg: $fneg fcat: $fcat     filter: $filter"
     
     cat <<-EOF
-       <input class="tabhandle" type="checkbox" id="filter$n" $([ $n = 0 -o -n "$filter" ] && echo checked) >
+       <input class="tabhandle" type="checkbox" id="filter$n" $([ $n = 0 -o -n "$filter" ] && printf checked) >
        <label class="tabhandle filter" for="filter$n">+ and</label>
        <div class="tabcontent filter">
          <input type="radio" name="type$n" value="pos" id="pos$n" ${fneg:-checked} ><label for="pos$n" class="conjunction">Any</label>
@@ -68,9 +68,9 @@ cat <<EOF
     <p class="filter final">
       <label for="o3" class="order">Order by:</label>
       <select class="edit order" size="1" name="o" id="o3">
-        <option $([ "${_GET[o]}" = Name ] && echo selected) >Name</option>
-        <option $([ "${_GET[o]}" = Date ] && echo selected) >Date</option>
-        <option $([ "${_GET[o]}" = Length ] && echo selected) >Length</option>
+        <option $([ "${_GET[o]}" = Name ] && printf selected) >Name</option>
+        <option $([ "${_GET[o]}" = Date ] && printf selected) >Date</option>
+        <option $([ "${_GET[o]}" = Length ] && printf selected) >Length</option>
       </select>
       <input type="submit" value="Filter!">
     </p>

diff --git a/templates/view.html.sh b/templates/view.html.sh
index 85f3e9ad9a48ea0b9870fe33effcbbfab5e6c5ba..3c0e3a5f6b8525a7b12292265796c9a422f49d39 100755 (executable)
--- a/templates/view.html.sh
+++ b/templates/view.html.sh
@@ -51,8 +51,8 @@ cat <<EOF
   <span class="info height">Height: $height</span><br>
   
   <label class="tags">Tags:</label>
-  $(echo "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
-  ${description:+<span class="info description">$(echo -E "$description" |_wiki)</span>}
+  $(printf %s\\n "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
+  ${description:+<span class="info description">$(printf %s "$description" |_wiki)</span>}
 
   <form class="panel" id="tagger" action="?action=meta&${page_this}" method="post" accept-charset="UTF-8">
     <input type="hidden" name="length" value="$length">