# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1554539707 -32400
# Node ID 0d8785102531f15a1bf9438b16594436ab0f198d
# Parent  8d2a121cbc5924a87a9e03a733c9e06ca8779c09
Resolve confliction of s4.cgi

diff -r 8d2a121cbc59 -r 0d8785102531 s4.cgi
--- a/s4.cgi	Sat Apr 06 17:22:34 2019 +0900
+++ b/s4.cgi	Sat Apr 06 17:35:07 2019 +0900
@@ -1,6 +1,6 @@
 #!/bin/sh
 #!/bin/ksh
-# 愛
+# 愛 - Do not EDIT this file manually.  GENERATE from scripts/s4-*.case.
 mydir=`dirname $0`
 echo "1=[$1]" >> tmp/debug.out
 . $mydir/s4-funcs.sh
diff -r 8d2a121cbc59 -r 0d8785102531 scripts/s4-sns.case
--- a/scripts/s4-sns.case	Sat Apr 06 17:22:34 2019 +0900
+++ b/scripts/s4-sns.case	Sat Apr 06 17:35:07 2019 +0900
@@ -19,7 +19,7 @@
     showattc "$@"
     exit 0			# Do not output further chunks
     ;;
-  invite|groupman|userconf|groupconf|mems|grps|grp|grpaction|commission|editheading|editart|showattc|send2mem)
+  invite|groupman|userconf|groupconf|mems|grps|grp|groupupdate|groupclone|grpaction|joingrpadmit|commission|editheading|editart|showattc|send2mem|mvart)
     contenttype; echo
     [ -n "$1" ] && shift
     $stage "$@"
@@ -34,13 +34,25 @@
     rowid=${2%%[!A-Z0-9a-z_]*}
     ## err ROWid=$rowid, '$2'=$2
     . ./s4-blog.sh
-err blog_reply $rowid
+err blog_reply2 $rowid
     blog_reply $rowid
     ;;
-  lshandout|gethandout)
-    if [ x"$stage" = x"lshandout" ]; then
-      contenttype; echo
-    fi
+  aid[1-9]*)
+    arid=${1#aid}
+    arid=${arid%%[!0-9]*}
+    . ./s4-blog.sh
+err b_r_a "$arid"
+    blog_reply_article "$arid"
+    ;;
+  reload*)	# Dirty workaround for reloading page just after submit
+    newurl="$urlbase?replyblog+${stage#*/}#bottom"
+    echo "Refresh: 0; $newurl"; echo
+    exit 0
+    ;;
+  lshandout|lshandoutall|gethandout|gethandoutcsv|gethandoutcsv2|blogseen)
+    case "$stage" in
+      lshandout*|blogseen*) contenttype; echo ;;
+    esac
     rowid=${2%%[!A-Z0-9a-z_]*}
     if [ -z "$rowid" ]; then
       echo "話題番号が未指定です。" | html p