X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=index.cgi;h=c908d7bde8b3e5e4f97345d76e14212118520c84;hp=119228e116befd523332bcf4137d719f4beb2f6e;hb=0cf57dc53c38e306a7303f1b299f38b636fea266;hpb=b3ddca9d8e6af72d0e9847b3d5d1f7778ef1f1af

diff --git a/index.cgi b/index.cgi
index 119228e..c908d7b 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,17 +1,25 @@
 #!/bin/zsh
 
-export LC_ALL=de_DE.UTF-8
+# Copyright 2014 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/>. 
 
-# basic functions
-die() {
-  echo "$*" >/dev/stderr
-  exit 1
-}
-debug() { #change to false to disable debugging
-  #true && echo "$*" >>debug
-  true && [ -n "$*" ] && echo -E "$*" >>/dev/stderr
-  true && [ -z "$*" ] && tee /dev/stderr
-}
+export LC_ALL=de_DE.UTF-8
+DBG_ENABLED=false
+DBG_FILE=/dev/stderr
 
 # this program is supposed to be symlinked into a http root directory
 # we will use the http root as object storage (data directory) and call sub
@@ -22,9 +30,29 @@ real="$(readlink -f $call)"
 _EXEC="$(dirname "$real")"  #execution directory
 _DATA="$(dirname "$call")"  #storage directory
 
-[ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
+# put debug options in the local.opts file
+[ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
+
+# basic functions
+debug() { #change to false to disable debugging
+  if [ "$DBG_ENABLED" = true -a -n "$*" ]; then
+    echo -E "$*" >>"$DBG_FILE"
+  elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then
+    tee -a "$DBG_FILE"
+  elif [ -z "$*" ]; then
+    cat
+  fi
+}
+
+die() {
+  debug "$*"
+  echo -E "$*" >>/dev/stderr
+  exit 1
+}
 
 # create directories for object storage
+[ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
+
 for each in "$_DATA"/{vcard,ical,cache,temp,mappings}; do
   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
@@ -40,7 +68,6 @@ EOF
 [ -f .htaccess ] || die "no htaccess file present and unable to create one"
 
 . "$_EXEC/cgi.sh"
-
 cgi_get
 
 . "$_EXEC/constants.sh"