X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=a27a75dbdddd133b086b71b9a222434cf10a0811;hb=9684cabf3651df8369d71c7a60e9235730dbe978;hp=b1b2c2dd2ab11cc4a0c7b8e7cc332503579ad41b;hpb=f9cfcde441afed9d6db96e201935b6208903046d;p=shellwiki

diff --git a/index.cgi b/index.cgi
index b1b2c2d..a27a75d 100755
--- a/index.cgi
+++ b/index.cgi
@@ -2,35 +2,21 @@
 
 . "${_EXEC:-${0%/*}}/cgilite/cgilite.sh"
 . "${_EXEC}/cgilite/session.sh"
-. "${_EXEC}/cgilite/file.sh"
 . "${_EXEC}/cgilite/users.sh"
+. "${_EXEC}/tools.sh"
 . "${_EXEC}/acl.sh"
 
-. "${_EXEC}/themes/default.sh"
+export REV_PAGES=${REV_PAGES:-true}
+export REV_ATTACHMENTS=${REV_ATTACHMENTS:-false}
+export WIKI_THEME="${WIKI_THEME:-default}"
 
-CACHE_AGE=${CACHE_AGE:-1800}
-export MD_MACROS="$_EXEC/macros"
-export MD_HTML="${MD_HTML:-false}"
+which git >/dev/null || REV_PAGES=false
+[ "$REV_PAGES" != true ] && REV_ATTACHMENTS=false
 
-if [ "$(which awk)" ]; then
-  md() { awk -f "$_EXEC/md_macros.awk" -f "$_EXEC/cgilite/markdown.awk"; }
-elif [ "$(which busybox)" ]; then
-  md() { busybox awk -f "$_EXEC/md_macros.awk" -f "$_EXEC/cgilite/markdown.awk"; }
-else
-  md() { cat; }
-fi
-
-mdfile(){
-  local page="$(PATH "$1")"
+. "${_EXEC}/themes/${WIKI_THEME}.sh"
 
-  if   [ -f "$_DATA/pages/$page/#page.md" ]; then
-    printf %s\\n "$_DATA/pages/$page/#page.md"
-  elif [ -f "$_EXEC/pages/$page/#page.md" ]; then
-    printf %s\\n "$_EXEC/pages/$page/#page.md"
-  else
-    return 1
-  fi
-}
+# Renew session cookie, only if cookie already set
+[ "$(COOKIE session)" ] && SESSION_COOKIE
 
 wiki_text() {
   # Print source text of a wiki page
@@ -42,50 +28,32 @@ wiki_text() {
   cat -- "$mdfile"
 }
 
-wiki() {
-  # Print content of a wiki page
-  # Get page from data or underlay dir, handle caching
-  local page="$(PATH "$1")" mdfile cache cachetime
-
-  cache="$_DATA/pages/$page/#page.${USER_ID}.cache"
-
-  mdfile="$(mdfile "$page")" || return 4
-  acl_read "$page" || return 3
-
-  cachetime="$(stat -c %Y -- "$mdfile" "$cache" 2>/dev/null)"
-
-  if [ "${cachetime#*${BR}}" -gt "${cachetime%${BR}*}" \
-    -a "${cachetime#*${BR}}" -gt "$((_DATE - CACHE_AGE))" ]; then
-    cat "${cache}"
-  else
-    mkdir -p -- "$_DATA/pages/$page/"
-    # Macros expect to find page directory as working dir
-    ( cd -- "$_DATA/pages/$page/";
-      md <"$mdfile" |tee -- "${cache}.$$"
-    )
-    mv -- "${cache}.$$" "${cache}"
-  fi
-}
-
-case "${PATH_INFO}" in
-  /"[.]"/*)
-    FILE "${_EXEC}/${PATH_INFO#/\[.\]}"
-    ;;
-  */)
-    theme_page "${PATH_INFO}"
-    ;;
-  */"[login]")
-    [ "$USER_NAME" ] \
-    && REDIRECT "./" \
-    || theme_login
-    ;;
-  */"[register]")
-    theme_register
-    ;;
-  */"#"*)
-    :  # TODO: Invalid page name
-    ;;
-esac
-
-. "$_EXEC/page_edit.sh"
-. "$_EXEC/attachment.sh"
+if [ "$REV_PAGES" = true -a ! -f "$_DATA/.gitignore" ]; then
+  cat >"$_DATA/.gitignore" <<-EOF
+	users.db
+	serverkey
+	**/#cache/
+	**/#page.lock
+	**/#page.*.cache
+	**/#page.*.cache.*
+	**/#page:*.*.cache
+	**/#page:*.*.cache.*
+	EOF
+  [ "$REV_ATTACHMENTS" != true ] \
+  && printf '**/#attachments/\n' >>"$_DATA/.gitignore"
+  git init "$_DATA"
+  git -C "$_DATA" add .gitignore
+  printf '%s\n' "" "[user]" \
+         "email = \"shellwiki@localhost\"" \
+         "name = \"Shellwiki\"" \
+         >>"$_DATA/.git/config"
+  git -C "$_DATA" commit -m 'initialization' -- .gitignore
+fi 1>&2
+
+for handler in "$_EXEC"/handlers/*; do
+  . "$handler" && break
+done
+if [ $? != 0 ]; then
+  export ERROR_MSG="The presented URL schema cannot be handled"
+  theme_error 400
+fi