From: paul <paul@plutz.net>
Date: Sun, 10 Apr 2016 21:45:11 +0000 (+0000)
Subject: use static file function from shcgi
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=3ed59adf9bde7e038389d6b21c7e221abf6b3b28;p=confetti

use static file function from shcgi

svn path=/trunk/; revision=98
---

diff --git a/actions/static_file.sh b/actions/static_file.sh
deleted file mode 100755
index 0b16fc1..0000000
--- a/actions/static_file.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/zsh
-
-# Copyright 2016 Paul Hänsch
-#
-# This file is part of Confetti.
-# 
-# Confetti 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.
-# 
-# Confetti 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 Confetti.  If not, see <http://www.gnu.org/licenses/>. 
-
-BR='
-'
-file="$(invalidate "${_GET[name]}" '\.' 'none')"
-file="$_EXEC/templates/$file"
-
-if [ -f "$file" ]; then
-  case "${file##*.}" in
-    png) printf 'Content-Type: image/png';;
-    html) printf 'Content-Type: text/html';;
-    txt) printf 'Content-Type: text/plain';;
-    *) printf 'Content-Type: application/octet-stream';;
-  esac
-  printf '\r\n'
-  printf 'Content-Length: %s\r\n' "$(stat -c %s "$file")"
-  printf '\r\n'
-  cat "$file"
-else
-  printf 'HTTP/1.1 404 Not Found\n\n'
-fi
diff --git a/templates/therapy_background.png b/static/therapy_background.png
similarity index 100%
rename from templates/therapy_background.png
rename to static/therapy_background.png
diff --git a/templates/therapy.html.sh b/templates/therapy.html.sh
index 78122fb..7d42aff 100755
--- a/templates/therapy.html.sh
+++ b/templates/therapy.html.sh
@@ -175,7 +175,7 @@ cat <<EOF
     <input class=color type=radio name=color onclick="javascript:setcol('#AA0')" value="#AA0" id=c110 $c6><label for=c110></label>
     <input class=color type=radio name=color onclick="javascript:setcol('#FFF')" value="#FFF" id=c111 $c7><label for=c111></label>
   </fieldset>
-  <img class="dotmark bg" src="?action=static_file&amp;name=therapy_background.png" alt="">
+  <img class="dotmark bg" src="?static=therapy_background.png" alt="WARNING: Background Image not available!">
   <canvas id="canvas" class="dotmark ov" width="${bg_dim%x*}" height="${bg_dim#*x}"></canvas>
 
   <input type=hidden id=image_serialize name=imagedata value="">