# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1437230661 -32400
# Node ID 95cebd686c97f4b265b708360fe1c0ee49be63d5
# Parent  7aa52f9874aedce9668b706b96070291f39ce583
add templ/*

diff -r 7aa52f9874ae -r 95cebd686c97 se-blog.sh
--- a/se-blog.sh	Sat Jul 18 09:54:00 2015 +0900
+++ b/se-blog.sh	Sat Jul 18 23:44:21 2015 +0900
@@ -340,7 +340,6 @@
      -D_DUMPTABLE_="`listblog $listing`" \
      $layout/html.m4.html \
      $layout/diary.m4.html
-
 }
 
 blog_reply() {
diff -r 7aa52f9874ae -r 95cebd686c97 se-funcs.sh
--- a/se-funcs.sh	Sat Jul 18 09:54:00 2015 +0900
+++ b/se-funcs.sh	Sat Jul 18 23:44:21 2015 +0900
@@ -4,19 +4,21 @@
 myname=`basename ${SCRIPT_NAME:-$0}`
 mydir=`dirname ${SCRIPT_FILENAME:-$0}`
 myargs="$@"
-bindir=`(cd $mydir/bin; pwd)`
-PATH=/usr/local/sqlite3/bin:$PATH:$bindir
+#bindir=`(cd $mydir/bin; pwd)`
+# :$bindir
+PATH=/usr/local/sqlite3/bin:/usr/local/vim7/bin:/usr/local/ImageMagick/bin:$PATH
 tmpdir=${TMPDIR:-tmp}
 dbdir=${DBDIR:-db}
 tmpfiles=""
 db=${DB:-$dbdir/cgi.sq3}
 admin=wwwadmin@gentei.org
-layout=templ/default
-formdir=templ/form
+templ=${TEMPL:-templ}
+layout=$templ/default
+formdir=$templ/form
 imgdir=img
 url=${URL:-"${REQUEST_SCHEME}://$HTTP_HOST$REQUEST_URI"}
 urlbase=${url%%\?*}
-msg=templ/msg
+msg=$templ/msg
 timeout="+2 days"
 conftbl=_tblconf
 dumpcollen=20
@@ -295,10 +297,14 @@
   cat $sqo
 }
 exec 3>> $tmpdir/debug.out
+exec 2>> $tmpdir/error.out
 err() {
   echo "$@" 1>&3
 }
 
+_m4() {
+  
+}
 ismember() {
   # $1=user, $2=group
 err ismem: "select user from grp_mem where gname='$2' and user='$1';"
@@ -488,11 +494,10 @@
        vcount=1			# count(val)
        if [ x"$2" = x"$c" ]; then
 	 cond="$t where $pk=\"$key\" and key=\"$c\""
-	 #####val=`query "select val from $cond;"`
-	 val=`query "select val from $cond;"`
-	 ##type=`sq $db "select type from $cond"`
-	 type=`query "select type from $cond;"`
-##err sq $db "select val from $cond"
+	 ###val=`query "select val from $cond;"`
+	 val=`query "select val from $cond limit 1;"`
+	 ###type=`query "select type from $cond;"`
+	 type=`query "select type from $cond limit 1;"`
 	 if [ $kt = m ]; then
 	   ###vcount=`sq $db "select count(val) from $cond"`
 	   # Reset val to store filenames if type is string
@@ -504,12 +509,12 @@
 	     slice="order by rowid limit 1 offset $i"
 	     i=$((i+1))
 	     fn=$c.$i
-### err td=$td, fn=$fn, type=$type, val="[$val]"
+##err td=$td, fn=$fn, type=$type, val="[$val]"
 	     case $type in
 	       file:*)
 		 #file=$td/$val
 		 file=$td/`query "select val from $cond $slice;"`
-		 [ -s $file -a -s $td/$fn.rowid ] && continue
+####tmp		 [ -s $file -a -s $td/$fn.rowid ] && continue
 		 sq $db<<EOF | xxd -r -p > $file
 .output $td/$fn.rowid
 select rowid from $cond $slice;
@@ -520,7 +525,7 @@
 .output stdout
 select quote(bin) from $cond $slice;
 EOF
-		 ##err i=$((i+1)) - file=$file rowid=`cat $td/$fn.rowid`
+		 ## err i=$i - file=$file rowid=`cat $td/$fn.rowid`
 		 ln $td/$fn.rowid $file.rowid 2>&3 # for convenience
 		 case $type in
 		   *:[Ii]mage*) mogrify -geometry $thumbxy $file ;;
@@ -768,11 +773,11 @@
    fi
   )
 }
-expire() {
-  (at="${1:-$timeout}"
-   FMT="${2:-%F %T}"
-   TZ=GMT date -d "$at" +"$FMT")
-}
+expire() (
+  at="${1:-$timeout}"
+  FMT="${2:-%F %T}"
+  TZ=GMT date -d "$at" +"$FMT"
+)
 addsession() {
   # expireをセット
   # loginの先にどの画面に行くかの状態遷移表書式を決める
@@ -783,12 +788,12 @@
   now=`expire now`
   sq $db "delete from session where expire < '$now'"
 }
-gencookie() {
-  (for kv; do
-     expire="`expire '' '%a, %d-%b-%Y %H:%M:%S GMT'`"
-     echo "Set-Cookie: $kv; expires=$expire"
-   done)
-}
+gencookie() (
+  for kv; do
+    expire="`expire '' '%a, %d-%b-%Y %H:%M:%S GMT'`"
+    echo "Set-Cookie: $kv; expires=$expire"
+  done
+)
 contenttype() {
   echo "Content-type: ${1:-text/html; charset=utf-8}"
   contenttype() {}	# Only need to work once
@@ -799,17 +804,16 @@
 putfooter() {
   m4 -D_TITLE_="${TITLE:-$myname}" $layout/footer.m4.html
 }
-getcookie() {
+getcookie() (
   for kv in `echo $HTTP_COOKIE|sed 's/[;, ]/ /g'`; do
     k="${kv%%=*}"
     v="`echo ${kv#*=}|nkf -Ww -mQ|sed -e 's/\"/\"\"/g'`"
-    sq $db "replace into cookie values('$session', '$k', 'string', \"$v\")"
+    query "replace into cookie values('$session', '$k', 'string', \"$v\");"
   done
-}
+)
 genrandom() {
   # $1=columns (default: 10)
-  col=${1:-10}
-  dd if=/dev/urandom count=1 2>/dev/null|nkf -MB|fold -w$col|sed -n 10p
+  dd if=/dev/urandom count=1 2>/dev/null|nkf -MB|fold -w${1:-10}|sed -n 10p
 }
 smail() {
   # smail rcpt subj (file)
@@ -831,12 +835,11 @@
   done
   IFS="$oifs"
 }
-checkdomain() {
-   # Check the validity of domain by referring DNS
-  (item=$1
-   host ${item#@*} >/dev/null 2>&1
-  )
-}
+checkdomain() (
+  # Check the validity of domain by referring DNS
+  item=$1
+  host ${item#@*} >/dev/null 2>&1
+)
 pwcheck() {
   # $1=passwd
   dbpswd=`getpwfield $user pswd`
@@ -1075,11 +1078,12 @@
 	<a href=\"?blog\">新規話題の作成</a>"
   fi
   . ./se-blog.sh
-  m4 -D_BODYCLASS_=home -D_TITLE_="$gecos さん" \
-     -D_PROFILE_="`viewtable $formdir/user.def user $1`$conflink" \
-     -D_BLOGS_="`listblog $uname`" \
-     -D_GROUPS_="`listgroupbytable $formdir/grp.def $cond`" \
-     $layout/html.m4.html $layout/home.m4.html
+
+ m4 -D_BODYCLASS_=home -D_TITLE_="$gecos さん" \
+    -D_PROFILE_="`viewtable $formdir/user.def user $1`$conflink" \
+    -D_BLOGS_="`listblog $uname`" \
+    -D_GROUPS_="`listgroupbytable $formdir/grp.def $cond`" \
+    $layout/html.m4.html $layout/home.m4.html
 
      #  
   # Record access log
@@ -1111,8 +1115,8 @@
 iconhref() (
   # $1=icon-file, $2=Href $3=title $4...=anchor
   data=`percenthex $1`
-  ct=`file --mime-type $1`
-err \$3="$@"
+  ct=`file --mime-type $1|cut -d' ' -f2`
+err iconhref: \$1=$1 \$2=$2 \$3="$@"
   href=$2; title=$3; shift 3
   echo "<a href=\"$href\"><img title=\"$title\" src=\"data:$ct,$data\">$@</a>"
 )