Mercurial > hgrepos > hgweb.cgi > s4
changeset 520:0d8785102531
Resolve confliction of s4.cgi
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Sat, 06 Apr 2019 17:35:07 +0900 |
parents | 8d2a121cbc59 |
children | 356320f803dc |
files | s4.cgi scripts/s4-sns.case |
diffstat | 2 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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