s4: y4-funcs.sh comparison

comparison y4-funcs.sh @ 13:f2204bd941d5

periodic

author	HIROSE Yuuji <yuuji@gentei.org>
date	Tue, 21 Jul 2015 10:13:33 +0900
parents	3565d93c2fb1
children	59b6b1c446c8

comparison

equal deleted inserted replaced

-:262bbdea72e2
+:f2204bd941d5
 7/19	設置
 	締切設定
 	一斉送信
 	自分の提出物リスト
+	getparfilename の tmpd の扱い
+	やっぱりs4にしようかな
 7/18	○書込著者からホームへのリンク
 7/17	○個人blogに「レポート提出用」がついたときの挙動
 	○添付ファイル回収
 	○imgcacheは別ディレクトリにしないと + .htaccess
 7/15	○レポート提出モードの表示を付ける
 query "select count(*) from par where var='$1' and sessid='$session' $2;"
 }
 getparfilename() {
 # null if type of $1 is not file
 (f=`query "select val from par where var='$1' and sessid='$session' and type='file' $2;"`
-[ -n "$f" ] && echo $tmpdir/$f)
+[ -n "$f" ] && echo $f)
 }
 sqlquote() {
 (v="$1"
 case "$v" in
 "") return ;;		# null
 pk=`gettblpkey $1`
 #   key=`sq $db "select $pk from $1 where rowid=$3"`
 key=`query "select $pk from $1 where rowid=$3;"`
 ### err "select $pk from $1 where rowid=$3" - key=$key '$4(tmp)'=$4
 for kt in s m; do
-td=${4:-$tmpdir}
+td=${4:-$tmpd}
 [ -d $td ] || mkdir -p $td
 t=${1}_$kt
 for c in `gettbl_${kt}_cols $1`; do
 vcount=1			# count(val)
 if [ x"$2" = x"$c" ]; then
 tmpfiles=$tmpfiles" $tmpd"
 addsession $session
 getcookie
 case "$REQUEST_METHOD" in
 get|GET)	s="$QUERY_STRING" ;;
-post|POST)	dd count=$CONTENT_LENGTH bs=1 of=$tmpf 2>/dev/null
+post|POST)	## dd count=$CONTENT_LENGTH bs=1 of=$tmpf 2>/dev/null #slow
-		# cat > $tmpf
+		# cat > $tmpf		# too much?
+		head -c $CONTENT_LENGTH > $tmpf	# safe?
+		(echo CL=$CONTENT_LENGTH; ls -lF $tmpf) 1>&3
 		s="`cat tmp/stream`"
 		tmpfiles=$tmpfiles"${tmpfiles+ }$tmpf"
 		;;
 esac
 case "$CONTENT_TYPE" in
 *boundary*)
 bndry=${CONTENT_TYPE#*boundary=}
-#for us in `LC_CTYPE=C ./mpsplit.rb "$bndry" $tmpdir < $tmpf`
+#for us in `LC_CTYPE=C ./mpsplit.rb "$bndry" $tmpd < $tmpf`
-for us in `LC_CTYPE=C ./mpsplit.pl "$bndry" $tmpdir < $tmpf`
+for us in `LC_CTYPE=C ./mpsplit.pl "$bndry" $tmpd < $tmpf`
 do
 	k=${us%%\=*}
 	#echo u=$us
 	#v="`echo ${us#*=}|nkf -Ww -mQ|sed -e 's/\"/\"\"/g'`"
 	v="`echo ${us#*=}|unhexize`"
 # err k=$k v=$v
 	case "$k" in
 	  *:filename)
 	    type='file'; k=${k%:filename}
-	    case `file --mime-type $tmpdir/$v|cut -d' ' -f2` in
+(echo k=$k; ls -lF $tmpd/$v; file --mime-type $tmpd/$v) 1>&3
+	    case `file --mime-type $tmpd/$v|cut -d' ' -f2` in
 	      [Ii]mage/*)
-		mogrify -resize $maximagexy'>' $tmpdir/$v
+		mogrify -resize $maximagexy'>' $tmpd/$v
 		;;
 	    esac
 	    ;;
 	  *)
 	    type='string'
 # $1=deffile
 tagline=`grep :tag: $1`; shift
 and="${1:+and }"
 href="<a href=\"$myname?grp+"
 echo '<div class="listgroup">'
-err ListGRP: query "select val from grp_s where key='tag' $and$* group by val;"
+sql="select val from grp_s where key='tag' $and$* group by val order by ctime desc;"
-for tag in `query "select val from grp_s where key='tag' $and$* group by val;"`
+err ListGRP: query
+for tag in `query "$sql"`
 do
 err ListGrp: tag=$tag
 tn=${tagline%%=${tag}*}
 tn=${tn##*[ :]}
 sql="select gname as 'グループ名',説明 from (select gname,max(case key when 'gecos' then val end) as '説明',max(case key when 'tag' then val end) as 'tag' from grp_s group by gname having tag='$tag');"
 cond="where nick like '%$2%' or b.name like '%$2%'"
 fi
 # XX: これ複雑すぎるかな。もっとシンプルにしたい。$3条件も。2015-07-08
 sql="select a.rowid, a.$link, coalesce(b.gecos, a.$nm) as nick, b.tag,
-	case when '$iamowner' = '' then ''
+	case when a.$nm in (select user from grp_adm
-	     when a.$nm in (select user from grp_adm
+			where gname='$grp') then '(管理者)' -- from group mode
-			where gname='$grp') then '(管理者)'
+	     when '$user' in (select user from grp_adm where gname=a.$nm)
+		then '(ADMIN)'
+	     when '$iamowner' = '' then ''
 	     else ',not='||a.rowid end as ownerlink
 	from $tbl a left join
 		(select $nm as name,
 			max(case key when 'gecos' then val end) as gecos,
 			max(case key when 'tag' then val end) as tag
 `cgi_hidden kwd "$kwd"`
 `cgi_hidden offset $((offset - limit))`</form>
 EOF
 fi
-err `echo $sql\;`
+err ListEntry: `echo $sql\;`
 query "$sql limit $limit ${offset:+offset $offset};" \
 | while IFS='|' read id lnk name tag ownerp; do
 err name=$name owner=$ownerp
 files=`getvalbyid $tbl profimg $id $dir`
 listgroup() {
 listentry group "$@"
 }
 showgroup() {
 grp=$1
-showgroupsub $formdir/grp.def $grp | \
+gname=`getpar gname`
-m4 -D_TITLE_="グループ $grp" \
+if [ -n "$gname" ]; then
-	 -D_FORM_="syscmd(\`cat')" \
+err REMOVING:::::::
-	 -D_DUMPTABLE_="" \
+par2table $formdir/grp.def
-	 $layout/groupman.m4.html
+fi
+if isgroup "$grp"; then
+showgroupsub $formdir/grp.def "$grp" | \
+	 m4 -D_TITLE_="グループ $grp" \
+	    -D_FORM_="syscmd(\`cat')" \
+	    -D_DUMPTABLE_="" \
+	    $layout/groupman.m4.html
+else				# if $grp is removed at par2table
+listgroup
+fi
 }
 showgroupsub() {
 # $1=def-file $2=group
 grp=$2
 rowid=`sq $db "select rowid from grp where gname='$grp'"`
 grp=`sq $db "select gname from grp where rowid=$grp"`
 fi
 val=`getvalbyid grp profimg $rowid $tmpd`
 # 6/14の次グループのHOMEで出す情報を作る Done
 viewtable $1 grp $rowid
-if isgrpowner $user $grp; then
+if isgrpowner "$user" "$grp"; then
 echo "<p><a href=\"?groupconf+$grp\">グループ情報の編集</a>"
 iamowner=$grp
 fi
-if ismember $user $grp; then
+if ismember "$user" "$grp"; then
 echo "${iamowner:+ / }<a href=\"?blog+$grp\">グループの新規話題作成</a></p>"
 fi
 # 加入ボタン + 加入者リスト
 err ismember $user $grp
-ismember $user $grp && ismem='checked' || nomem='checked'
+ismember "$user" "$grp" && ismem='checked' || nomem='checked'
 # このグループでの加入アドレス
 eml=`query "select val from grp_mem_s where gname='$2' and user='$user' \
 	and key='email';"`
 err EML: "select val from grp_mem_s where gname='$2' and user='$user' \
 	and key='email';"
 cm="?commission+$grp"
 thumbxy=50x50 listmember "" "$c" \
 |sed -e "s|\(<br>\),not=\(.*\)|\1<a href=\"$cm+\2\">管理者委託</a>|"
 }
 joingrp() {
-# $1=group $2=user $3=yes/no $4=email(if any)
+# $1=group $2=user $3=yes/no $4=email(if any $5=AsAdmin)
 err joingrp: \$1=$1 \$2=$2 \$3=$3 \$4=$4
+isgrpowner "$user" "$1" && isowner="yes" || isowner=""
 if [ x"$2" != x"$user" ]; then # if user is not login user
-if ! isgrpowner $user $1; then
+if [ -z "$isowner" ; then
 echo "<p>本人か、グループ管理者しか加入操作はできません。</p>"
 return
 fi
 fi
 cond="where gname='$1' and user='$2'"
 if msg=`emaildomaincheck "$4"`; then
 err "replace into grp_mem_s values('$1', '$user', 'email', \
 		'string', '$4', NULL);"
 	query "replace into grp_mem_s values('$1', '$user', 'email', \
 		'string', '$4', NULL);"
+	if [ -n "$5" ]; then	# as ADMIN
+	  # Coming here means newly created group
+	  sql="select case\
+		 when (select count(*) from grp_mem where gname='$1')=1\
+		 then (select user from grp_mem\
+			 where gname='$1' and user='$user')\
+		 else '' end;"
+	  err NewGrpChk: $sql
+	  if [ -n "`query \"$sql\"`" ]; then
+	    err ADMIN: "replace into grp_adm values('$1', '$user');"
+	    query "replace into grp_adm values('$1', '$user');"
+	  fi
+	fi
 else
 	echo $msg
 fi
 else
 query "delete from grp_mem_s $cond and key='email';"
 fi
 fi
 showgroup $1
 }
 dumptable() {
-# $1=mode $2=Table $3=column-list(defaults to *) $4=conditions(if any)
+# $1=mode $2=Table $3=column-list-of-*_s(defaults to *) $4=conditions(if any)
 # textのフィールドだけ全てダンプにしたほうがいいか
 # $DT_VIEW sets link
 # 6/17の次: editリンクじゃなくてスレッドVIEWリンクでいいんちゃう?
 ### elink="<a href=\"$myname?edittable+$2+\\2\">EDIT</a>"
 VIEW=${DT_VIEW-replyblog}
 eav="" scols=""
 pk=`gettblpkey $2`
 substr=${dumpcollen:+"substr(val, 0, $dumpcollen)"}
 substr=${substr:-val}
 for col in ${3:-`gettbl_s_cols $2`}; do
-eav=$eav${eav:+,}" max(case key when '$col' then $substr end) as $col"
+case $col in
-scols="$scols${scols:+, }b.$col"
+*:*)	col=${col%:*} as=${col#*:} ;;
+*)	as=${col} ;;
+esac
+eav=$eav${eav:+,}" max(case key when '$col' then $substr end) as $as"
+scols="$scols${scols:+, }b.$as"
 done
 #case author when '$user' then a.rowid else '---' end as ID,
 sql="select \
 a.rowid as ID,\
 $cnt\
 tbl=${tbl##*/}
 if [ -n "$rowid" ]; then	# Modify existing entry
 if [ x"$tbl" = x"user" ]; then
 rowowner=`query "select name from $tbl where rowid=$rowid;"`
 elif [ x"$tbl" = x"grp" ]; then
-isgrpowner $user `query "select gname from $tbl where rowid=$rowid;"` \
+sql="select gname from $tbl where rowid=$rowid;"
-	  && rowowner=$user
+##err p2t:grp:q $sql
+isgrpowner $user "`query $sql`" && rowowner=$user
 else
 rowowner=`query "select owner from $tbl where rowid=$rowid;"`
 rowowner=${rowowner:-`query "select author from $tbl
 	 where rowid=$rowid;"`}
 fi
+### err rowowner=$rowowner
 if [ x"$user" != x"$rowowner" ]; then
 echo "<p>他人のレコードはいじれないの</p>"
 return
 elif [ -z "$rowowner" ]; then
 echo "<p>指定したレコードはないみたい</p>"
 		 echo "<p>削除確認未チェック</p>"
 	       fi ;;
 	     edit)
 	       case `gettbl_coltype $tbl/$origcol` in
 		 image|document|binary)
-		   file=`getparfilename $v`
+		   file=$tmpd/`getparfilename $v`
 		   err type=file=$file
 		   [ -z "$file" ] && continue
 		   bn=${file##*/}
 		   bin="X'"$(hexize $file)"'"
 		   ct=`file --mime-type $file|cut -d' ' -f2`
 	 [ -z "$val" -o x"$val" = x'""' -o x"$val" = x"NULL" ] && continue
 err $col=$val
 	 bin=NULL
 err partype$col=`getpartype $col "$limit"`
 	 case $ptype in
-	   file) file=`getparfilename $col "$limit"`
+	   file) file=$tmpd/`getparfilename $col "$limit"`
 err parfile-$col=$file
 		 [ -z "$file" ] && continue
 		 bin="X'"$(hexize $file)"'"
 		 ct=`file --mime-type $file|cut -d' ' -f2`
 		 type=\"file:$ct\" ;;
 		 return
 	       fi
 	     fi
 	     ;;
 	 esac
-	 #err "replace into $tb2 values($pval, \"$col\", $type, $val, $bin);"
+err p2t: "replace into $tb2 values($pval, \"$col\", $type, $val, $bin);"
 	 echo "replace into $tb2 values($pval, \"$col\", $type, $val, $bin);" \
 	     | sq $db
 done
 done
 done
 <form action="${GF_ACTION:-$myname}" method="POST" enctype="multipart/form-data">
 ${rowid:+$rm}
 <table class="b $2">
 $forms
 </table>$hiddens
+${GF_STAGE:+`cgi_hidden stage $GF_STAGE`}
 ${rowid:+<input type="hidden" name="rowid" value="$rowid">}
 EOF
 if [ -z $GF_VIEWONLY ]; then
 cat<<EOF
 <input type="submit" name="sub" value="OK">

Mercurial > hgrepos > hgweb.cgi > s4

comparison y4-funcs.sh @ 13:f2204bd941d5