X-Git-Url: http://git.plutz.net/?p=invoices;a=blobdiff_plain;f=invoices.cgi;h=bec02be117a48964f1a14c5b2ddb17bd3f5973ab;hp=d079ced606d4e8e7d57f2aace09d1219de1940b1;hb=HEAD;hpb=3c750be4fa892b6f79b5141f09701752c7249930

diff --git a/invoices.cgi b/invoices.cgi
index d079ced..338f180 100755
--- a/invoices.cgi
+++ b/invoices.cgi
@@ -2,42 +2,18 @@
 
 _EXEC="$(realpath "${0%/*}")"
 . "$_EXEC/cgilite/cgilite.sh"
+. "$_EXEC/cgilite/logging.sh"
 . "$_EXEC/cgilite/storage.sh"
+. "$_EXEC/cgilite/session.sh"
 
-debug(){
-  if [ $# = 0 ]; then
-    tee /dev/stderr
-  else
-    printf %s\\n "$*" >/dev/stderr
-  fi
-}
-
-timeid(){
-  # generate time based ID
-  # Fixme: Unix time stamps assumed to be 32bit always
-  d=$(date +%s)
-  { printf $(
-      while [ "$d" -gt 0 ]; do
-        printf \\%o\\n $((d % 256))
-        d=$((d / 256))
-      done |tac |tr -d \\n
-    )
-    head -c5 /dev/urandom
-  } \
-  | uuencode -m - \
-  | sed -n '2{y;+/;:_;;p}'
-}
-
-checkid(){
-  grep -m 1 -xE '[0-9a-zA-Z:_]{12}';
-}
+SESSION_COOKIE
 
 yield_page(){
 printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
-./cgilite/html-sh.sed <<EOF
+"$_EXEC/cgilite/html-sh.sed" <<EOF
 [html [head
   [meta name="viewport" content="width=device-width"]
-  [link rel="stylesheet" type="text/css" href="invoices.css"]
+  [link rel="stylesheet" type="text/css" href="/invoices.css"]
   [title Invoices]
 ] [body class="$1"
   [div #menu
@@ -50,149 +26,69 @@ printf 'Content-Type: text/html; charset=utf-8\r\n\r\n'
 EOF
 }
 
-edit_client(){
-  id="$1"
-  if [ -f "clients/$id" ]; then
-    read -r address hourly <"clients/$id"
-  fi
-  [ "$address" ] || address="address="
-  [  "$hourly" ] ||  hourly="hourly="
-  printf '
-    [form method="POST" action="/update_client"
-      [hidden "id" "%s"]
-      <textarea name="address" placeholder="address">
-%s</textarea>
-      [label for=hourly Hourly Rate:]
-      [input #hourly type=number name=hourly value="%s"]
-      [submit "update" "update" Update]
-    ]' \
-    "$(HTML $id)" \
-    "$(UNSTRING "${address#address=}" |HTML)" \
-    "$(UNSTRING "${hourly#hourly=}" |grep -xE '[0-9]+')"
-}
-
-edit_sender(){
-  id="$1"
-  if [ -f "senders/$id" ]; then
-    address="$(cat "senders/$id")"
-  fi
-  [ "$address" ] || address="Name
-Street
-City
-
-Phone:
-000 000000
-
-Tax no.
-xxx / 000 / ###
-"
-  printf '
-    [form method="POST" action="/update_sender"
-      [hidden "id" "%s"]
-      <textarea name="address" placeholder="address">%s</textarea>
-      [submit "update" "update" Update]
-    ]' \
-    "$(HTML $id)" \
-    "$(HTML "${address}")"
-}
-
-list_clients(){
-  [ -d clients/ ] && for c in clients/*; do
-    read -r address hourly <"$c"
-    address="$(UNSTRING "${address#address=}")"
-    [ "$address" ] || address="(no address)"
-    printf '[div .client .address <!--
-      -->%s[a href="/clients/%s" Edit]]
-    ' "$(HTML "$address")" "$(HTML "${c#clients/}")"
-  done
-}
-
-list_senders(){
-  [ -d senders/ ] && for s in senders/*; do
-    address=$(cat "$s")
-    [ "$address" ] || address="(no address)"
-    printf '[div .sender .address <!--
-      -->%s[a href="/senders/%s" Edit]]
-    ' "$(HTML "$address")" "$(HTML "${s#senders/}")"
-  done
-}
-
-list_invoices(){
-  [ -d invoices/ ] && for i in invoices/*; do
-    read -r sender client date number vat<<-EOF
-	sed q "$i"
-	EOF
-    [ -f "senders/${sender#sender=}" ] \
-    && sender="$(sed q "senders/${sender#sender=}")" \
-    || sender="(unset)"
-    [ -f "clients/${client#client=}" ] \
-    && client="$(sed q "client/${client#client=}")" \
-    || client="(unset)"
-    [ "$date" -gt 0 ] \
-    && date="$(date -d @$date +%x)" \
-    || date="(unset)"
+info="$(PATH "${PATH_INFO#http://*/}")"
 
-    printf '[div .invoice
-      [h2
-          %s]
-      [label From:] %s [label To:] %s [label on] %s
-      [a href="/invoices/%s" Edit]
-    ]' "$(HTML "$number")" "$(HTML "$sender")" \
-       "$(HTML "$client")" "$(HTML "$date")"
-  done
-}
-
-info="$(PATH "${PATH_INFO}")"
+which git && [ ! -d .git ] && {
+  git init
+  mkdir -p clients/ invoices/ senders/
+  printf 'export/
+serverkey' >.gitignore
+  git add clients/ invoices/ senders/ .gitignore
+  git commit -m 'initialisation of invoice repo'
+} >&2
 
 case $info in
   /invoices.css)
     . "$_EXEC/cgilite/file.sh"
     FILE "$_EXEC/invoices.css"
     ;;
-  /clients)
+  /clients|/clients/)
+    . "$_EXEC/clients.sh"
     { list_clients
       printf '[a .new href="/clients/%s" New]' "$(timeid)"
     } | yield_page clients
     ;;
   /clients/*)
+    . "$_EXEC/clients.sh"
     edit_client "${info#/clients/}" |yield_page client
     ;;
   /update_client)
-    id="$(POST id |checkid)"
-    if [ "$(POST update)" = update -a "$id" ]; then
-      mkdir -p clients
-      printf 'address=%s	hourly=%s' \
-        "$(POST address |STRING)" "$(POST hourly |STRING)" \
-        >"clients/$id"
-    else
-      echo Invalid Data "$(POST id)" "$(POST update)" >&2
-    fi
-    REDIRECT /clients/
+    . "$_EXEC/clients.sh"
+    update_client
     ;;
-  /senders)
+  /senders|/senders/)
+    . "$_EXEC/senders.sh"
     { list_senders
       printf '[a .new href="/senders/%s" New]' "$(timeid)"
     } | yield_page senders
     ;;
   /senders/*)
+    . "$_EXEC/senders.sh"
     edit_sender "${info#/senders/}" |yield_page sender
     ;;
   /update_sender)
-    id="$(POST id |checkid)"
-    if [ "$(POST update)" = update -a "$id" ]; then
-      mkdir -p senders
-      POST address >"senders/$id"
-    fi
-    REDIRECT /senders/
+    . "$_EXEC/senders.sh"
+    update_sender
     ;;
-  /invoices)
-    { list_invoices
-      printf '[a href="/invoices/%s" New]' "$(timeid)"
+  /invoices|/invoices/)
+    . "$_EXEC/invoices.sh"
+    { printf '[a .new href="/invoices/%s" New]' "$(timeid)"
+      list_invoices
     } | yield_page invoices
     ;;
-  /invoice/*)
+  /invoices/*)
+    . "$_EXEC/invoices.sh"
     edit_invoice "${info#/invoices/}" |yield_page invoice
     ;;
+  /update_invoice)
+    . "$_EXEC/invoices.sh"
+    update_invoice
+    ;;
+  /export/*.pdf/*)
+    . "$_EXEC/cgilite/file.sh"
+    file="${info%/*}"
+    FILE "${file#/}" application/pdf
+    ;;
   *) REDIRECT /invoices
     ;;
 esac