X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=89be69c6b39eaca9bcefcfff035634fd274a1de7;hb=3ff1de1d7bf98b5ee3c30a21737a31196bcb6ec3;hp=6359a0ae353e009e9dcbfc8425c52b1244bf6112;hpb=d4c4b43f0c0a3632998892da7bad8a18e687b0e8;p=shcgi

diff --git a/index.cgi b/index.cgi
index 6359a0a..89be69c 100755
--- a/index.cgi
+++ b/index.cgi
@@ -17,28 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with shcgi.  If not, see <http://www.gnu.org/licenses/>. 
 
-export LC_ALL=C
-
-# 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
-# programs from the directory in which the real executable resides
-# therefore we need to identify the code and data directories _EXEC and _DATA
-call="$0"
-real="$(readlink -f $call)"
-_DATA="$(dirname "$call")"  #storage directory
-_EXEC="${real%/shcgi/index.cgi}"  #execution directory
-
-# basic functions
-die() {
-  echo "$@" >&2
-  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=C LANG=C
 
 data_dirs(){
   # create directories for object storage
@@ -50,24 +29,26 @@ data_dirs(){
   done
 }
 
-# create htaccess file
-[ -f "$_DATA/.htaccess" ] || cat >"$_DATA/.htaccess" <<EOF
-Options		+ExecCGI
-AddHandler	cgi-script .cgi
-DirectoryIndex	index.cgi
-EOF
-[ -f "$_DATA/.htaccess" ] || die "no htaccess file present and unable to create one"
+# 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
+# programs from the directory in which the real executable resides
+# therefore we need to identify the code and data directories _EXEC and _DATA
+call="$0"
+real="$(readlink -f $call)"
+_DATA="$(dirname "$call")"  #storage directory
+_EXEC="${real%/shcgi/index.cgi}"  #execution directory
 
-. "$_EXEC/shcgi/cgi.sh"
+# put debug options in the local.opts file
+. "$_EXEC/shcgi/debug.sh"
+[ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
 
+. "$_EXEC/shcgi/cgi.sh"
 cgi_get
 
-[ -x "$_EXEC/constants.sh" ] && . "$_EXEC/constants.sh"
+[ -x "$_EXEC/globals.sh" ] && . "$_EXEC/globals.sh"
 
-if [ -n "$_GET[\"action\"]" ]; then
+if [ -n "${_GET[action]}" ]; then
   . "$_EXEC/shcgi/action.sh"
-elif [ -n "$_GET[\"export\"]" ]; then
-  . "$_EXEC/shcgi/export.sh"
 else
   . "$_EXEC/shcgi/page.sh"
 fi