Mercurial > hgrepos > hgweb.cgi > s4
changeset 356:c087423c8234
Most of debugging code deactivated
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Thu, 27 Oct 2016 16:54:08 +0859 |
| parents | 0d19061a3b2c |
| children | 78c0a2b43ec1 |
| files | s4-blog.sh s4-funcs.sh |
| diffstat | 2 files changed, 83 insertions(+), 102 deletions(-) [+] |
line wrap: on
line diff
--- a/s4-blog.sh Thu Oct 27 11:51:29 2016 +0859 +++ b/s4-blog.sh Thu Oct 27 16:54:08 2016 +0859 @@ -70,7 +70,7 @@ td=`getcachedir "article/$2"` [ -d "$td" ] || mkdir -p $td tbl=${1%%[!A-Z0-9a-z_]*} rowid=${2%%[!A-Z0-9a-z_]*} -err rowid=$rowid, '$2'=$2 + err blow_showentry: rowid=$rowid, '$2'=$2 user=$user ts=${tbl}_s tm=${tbl}_m at=article as=article_s am=article_m serial=$(($(date +%s)-1420038000))s$$ @@ -374,9 +374,9 @@ on a.id=m.id where blogid=(select id from blog where rowid=$1)\ and m.key in ('image', 'document', 'binary');" \ | while IFS='|' read rowid author filename; do - # err isfilereadable $user article_m $rowid + err isfilereadable $user article_m $rowid isfilereadable $user article_m $rowid || continue - # err ok + err ok i=$((i+1)) dir=`printf $bd/%03d $i` mkdir $dir @@ -389,8 +389,9 @@ return fi (cd $bd - err cdto$bd; (pwd; ls -lFa) 1>&3 + ## err cdto$bd; (pwd; ls -lFa) 1>&3 tar zcf .archive.tar.gz * && mv .archive.tar.gz archive.tar.gz + err Creating tar archive "`ls -l archive.tar.gz`" ) arc=$bd/archive.tar.gz echo "Content-type: application/x-gzip" @@ -573,8 +574,7 @@ </table> EOF if [ -s "$result" ]; then - found=`grep "^<TR><TD>" $result | wc -l` - found=$((found+0)) + found=$((`grep "^<TR><TD>" $result | wc -l` + 0)) # Cast to INT one=${found%1} echo "$found match${one:+es} found" else @@ -597,7 +597,7 @@ # $1=GRPname(if it is a group) grprowid=$1 rowid=`getpar rowid` - err blog_addentry0: rowid=$rowid + ## err blog_addentry0: rowid=$rowid if [ -n "$grprowid" ]; then owner=`getgroupbyid $grprowid` else @@ -627,7 +627,7 @@ fi par2table $formdir/blog.def serial=`getpar serial` - err SERIAL: $serial ROWID=$rowid listing=$listing + ## err SERIAL: $serial ROWID=$rowid listing=$listing id="" if [ -n "$rowid" ]; then # Here, id becomes NULL when removal of entries at par2table @@ -635,7 +635,7 @@ elif [ -n "$serial" ]; then # If new blog leader created, traverse to its head. id=`query "select rowid from blog where id='$serial';"` - err new-Leader: "select rowid from blog where id='$serial';" id=$id + ## err new-Leader: "select rowid from blog where id='$serial';" id=$id fi if [ -n "$id" ]; then ## If new aritcle is entered, JUMP to blog_reply @@ -657,7 +657,6 @@ blog_reply() { rowid=$1 - err rowid=$1 if [ -z "$rowid" ]; then echo "表示する日記番号が未指定です。" | html p @@ -687,7 +686,7 @@ if [ -n "$text" ]; then if blog_writable $rowid $user; then par2table $formdir/article.def - st=$? # ; err par2t-st=$st + st=$? case $st in 0|4) [ "$st" = "4" ] && act="書込削除"
--- a/s4-funcs.sh Thu Oct 27 11:51:29 2016 +0859 +++ b/s4-funcs.sh Thu Oct 27 16:54:08 2016 +0859 @@ -427,7 +427,7 @@ id=(select id from $2 where rowid=$3))='$1' then 'user+author' else '' end;" - err isfilereadable: sql="`echo $sql`" + ## err isfilereadable: sql="`echo $sql`" # caseのネストで内側のcaseがスカラーtrueを返しても外側はtrue扱いにならない result=`query "$sql"` [ -n "$result" ] && return 0 @@ -512,11 +512,11 @@ getpar() { err getpar: "select val from par where var='$1' and sessid='$session' $2;" val=`query "select val from par where var='$1' and sessid='$session' $2;"` -err getpar/val1: "val=[$val]" +## err getpar/val1: "val=[$val]" if [ -z "$val" ]; then val=`query "select val from cookie where var='$1' and sessid='$session' $2;"` fi -err getpar/val2: "val=[$val]" +## err getpar/val2: "val=[$val]" case "$var" in owner) if [ x"$user" = x"$val" ]; then @@ -525,7 +525,7 @@ echo $val; return fi ;; esac -err getpar/ret: "val=[$val]" +## err getpar/ret: "val=[$val]" echo "$val" } @@ -617,7 +617,6 @@ (for c in `gettblcols $1`; do if [ x"$2" = x"$c" ]; then - err "select $2 from $1 where rowid=$3" ###sq $db "select $2 from $1 where rowid=$3" query "select $2 from $1 where rowid=$3;" return @@ -1048,7 +1047,7 @@ # $1=passwd dbpswd=`getpwfield $user pswd` encpswd=`mycrypt "$1" "$dbpswd"` - err user=$user, pswd=$1, db=$dbpswd, enc=$encpswd + ## err user=$user, pswd=$1, db=$dbpswd, enc=$encpswd [ x"$dbpswd" = x"$encpswd" ] } mypwhash() { @@ -1078,7 +1077,6 @@ skc=`getpar skey` # from cookie [ -z "$user" ] && return 3 skey="`getpwfield $user skey`" -err user=$user skey=$skey if [ -n "$skey" ]; then if [ x"$skey" = x"$skc" ]; then return 0 @@ -1200,13 +1198,11 @@ left join grp_mem_s s on g.gname=s.gname and g.user=s.user and s.key='email' where g.gname=$qgrp and g.user in ($users);" - err `echo $sql` query "$sql" } email4groupbyuid() { # Get for-$1=group email address(es) for $2...=user-ids qgrp=`sqlquote "$1"`; shift -err em4gbid-IN: "\$1=$1 qgrp=$qgrp" uids=`echo "$@"` uids=`echo $uids|tr ' ' ','` sql="WITH @@ -1223,7 +1219,7 @@ FROM useremails u LEFT JOIN grpemails g ON u.name=g.user WHERE u.rid in ($uids);" - err email4gByid `echo $sql` + ## err email4gByid `echo $sql` query "$sql" } collectemail() ( @@ -1249,7 +1245,7 @@ on g.gname=s.gname and g.user=s.user and s.key='email' left join user_m um on g.user=um.name and um.key='email' where g.gname=$qgrp $ex;" - err CollectEmail: `echo "$sql"` + ## err CollectEmail: `echo "$sql"` query "$sql" fi done @@ -1302,7 +1298,6 @@ *) repo="無効なアドレスです" ;; esac addr=`query "select val from par where sessid like 'invite-%-$user';"` -err addr=$addr if [ -n "$addr" ]; then susp="<h2>招待済みで加入待ちのアドレス</h2><pre>$addr</pre>" fi @@ -1346,7 +1341,6 @@ groupupdate() { gname=`getpar gname` qgname=`sqlquote $gname` - err Enter:groupupdate if [ -n "$gname" ]; then # See ALSO same job in showgroup() newgname=`group_safename "$gname"` @@ -1359,10 +1353,10 @@ fi # Name confliction check parow=`getpar rowid` -err parow=$parow +## err parow=$parow qgname=`sqlquote $gname` # Set again in case gname modified query "BEGIN EXCLUSIVE;" - err "select count(gname) from grp where rowid != ${parow:-0} and gname = $qgname;" + ## err "select count(gname) from grp where rowid != ${parow:-0} and gname = $qgname;" count=$(query "select count(gname) from grp where rowid != ${parow:-0} and gname = $qgname;") if [ $count -gt 0 ]; then echo "そのグループ名は既にあります。" | html p @@ -1379,7 +1373,7 @@ a left join blog_s b on a.id=b.id and b.key='owner'; EOF rm=`getpar rm` cfm=`getpar confirm` - err groupupdate:::: after par2tbl rmcfm=$rm$cfm + ## err groupupdate:::: after par2tbl rmcfm=$rm$cfm if [ x"$rm$cfm" = x"yesyes" ]; then if [ -z "`query \"select gname from grp where gname=$qgname;\"`" ]; then sql="delete from blog where id in @@ -1394,7 +1388,7 @@ fi sql="select rowid from grp where gname=$qgname;" grid=$(query $sql) - err grpupdate:new-grid=$grid, sql=$sql + ## err grpupdate:new-grid=$grid, sql=$sql grp $grid } groupman() { @@ -1419,7 +1413,6 @@ _m4 -D_BODYCLASS_=groupconf -D_TITLE_="グループ情報編集" $layout/html.m4.html #rowid=`query "select rowid from grp where gname='$1';"` rowid=${1%%[!A-Z0-9a-z_]*} -err gcon \$1=$1 rowid=$rowid # GF_ACTION="?grp+$1" edittable "$formdir/grp.def" "grp" "$rowid" #2015-0804 GF_STAGE="groupupdate" edittable "$formdir/grp.def" "grp" "$rowid" } @@ -1441,11 +1434,9 @@ gpg=`getpar grp` grid=${1:-$gpg} grp=`getgroupbyid "$grid"` - err grp: getpar-grp"(gpg)=[$grp]" ## . ./s4-blog.sh jg=`getpar joingrp` if [ -n "$jg" ]; then - err jg=$jg, grp=$grp [ -n "$jg" -a -n "$grp" ] && joingrp "$grp" "$user" "$jg" "`getpar email`" fi @@ -1632,10 +1623,10 @@ *@*) uname=`getvalbypkey user name "$1"` ;; *) uname=`getvalbyid user name $1` ;; esac - err ShowHome: uname=$uname + ## err ShowHome: uname=$uname td=`getcachedir home/"$1"` gecos=`gecos "$uname"` - err SH:gecos=$gecos + ## err SH:gecos=$gecos GF_VIEWONLY=1 cond="gname in (select gname from grp_mem where user='$uname')" search_form_args="" @@ -1647,7 +1638,7 @@ sql="select count(id) from article_m where id in (select id from article where author='$user') and type like 'file:%';" - err nfile-sql=`echo "$sql"` + ## err nfile-sql=`echo "$sql"` nfile=`query "$sql"` # err nfile=$nfile if [ $nfile -gt 0 ]; then @@ -1785,7 +1776,7 @@ } commission() { # $1=grp-rowid $2=user-rowid contenttype; echo - err commission: "$@" + ## err commission: "$@" gname=`getgroupbyid $1` echo "グループ $gname 管理者委任" \ | _m4 -D_TITLE_="syscmd(\`cat')" $layout/html.m4.html @@ -1806,10 +1797,10 @@ max(case key when 'ctime' then val end) as ctime\ from grp_s group by gname order by ctime);" sql="select val from grp_s where key='tag' $and$* group by val;" -err ListGRP: query sql="$sql" +## err ListGRP: query sql="$sql" for tag in `query "$sql"` do -err ListGrp: tag=$tag +## err ListGrp: tag=$tag tn=${tagline%%=${tag}*} tn=${tn##*[ :]} sql="select rowid||':'||gname as 'グループ名',説明 from @@ -1820,7 +1811,7 @@ max(case key when 'tag' then val end) as 'tag', max(case key when 'mtime' then val end) as mtime from grp_s $where$* group by gname having tag='$tag' order by mtime desc);" - err PersonalGroupList= `echo $sql` +## err PersonalGroupList= `echo $sql` echo "<h2>$tn</h2>" echo '<table class="b listgroup">' sq -header -html $db "$sql" \ @@ -1833,7 +1824,7 @@ # $1=icon-file, $2=Href $3=title $4...=anchor data=`percenthex "$1"` ct=`file --mime-type - < "$1"|cut -d' ' -f2` -err iconhref: \$1=$1 \$2=$2 \$3="$@" +## 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>" ) @@ -1846,7 +1837,7 @@ listentry() ( # $1=user/group $2=SearchKeyword $3=condition(if any) $4=grprowid(if in grp) # Referring variable $iamowner=$grp to attach owner-request links -err listentry: \$1=$1 \$2=$2 \$3=$3 +## err listentry: \$1=$1 \$2=$2 \$3=$3 cond='' hiddens='' offset=`getpar offset` offset=${offset%%[!0-9]*} @@ -1868,7 +1859,7 @@ tagline=`grep :tag: $formdir/grp.def|cut -d: -f5-` if [ -n "$tagline" ]; then tagconv=`echo $tagline|sed 's/\([^= :]*\)=\([^= :]*\)/-D\2=\1/g'` -err tagconv=$tagconv +## err tagconv=$tagconv fi fi if [ ! -d $dir ]; then @@ -1926,7 +1917,7 @@ order by b.tag desc, b.mtime desc, a.rowid asc" # Give precedence to newer maintained groups (2016-09-24) # Note that mtime is stored only in grp_s. -err LE:sql.1="$sql" +## err LE:sql.1="$sql" total=`query "with x as ($sql) select count(*) from x;"` echo "${entity} 一覧" | html h2 if [ $total -gt $limit ]; then @@ -1966,7 +1957,7 @@ pnbtn="$nextbtn$prevbtn" echo $pnbtn - err ListEntry: `echo "$sql"\;` +## err ListEntry: `echo "$sql"\;` query "$sql limit $limit ${offset:+offset $offset};" \ | while IFS='|' read id lnk name gecos tag ownerp type; do err name=$name owner=$ownerp lnk=$lnk @@ -2009,7 +2000,7 @@ fi grp=`getgroupbyid $grid` qgrp=`sqlquote $grp` -err showgroup2: grp=$grp qgrp="[$(sqlquote $grp)]" +## err showgroup2: grp=$grp qgrp="[$(sqlquote $grp)]" if isgroup "$grp"; then tf=$tmpd/title.$$ bodyclass=`query "SELECT val FROM grp_s @@ -2083,7 +2074,6 @@ EOF fi # 加入ボタン + 加入者リスト -err ismember $user $grp if [ -n "$ismember" ]; then ismem='checked' state="(参加中)" else @@ -2092,9 +2082,9 @@ # このグループでの加入アドレス eml=`query "select val from grp_mem_s where gname=$qgrp and user='$user' \ and key='email';"` -err EML: "select val from grp_mem_s where gname='$2' and user='$user' \ - and key='email';" -err email=$eml +##err EML: "select val from grp_mem_s where gname='$2' and user='$user' \ +## and key='email';" +##err email=$eml cat <<EOF <div class="fold clear"> `cgi_checkbox reg yes id="reg"`<label @@ -2153,7 +2143,7 @@ # `ismember' for groups where user belongs # $1=GroupName (w/o quote) # $user=userNameCurrentlyLogin - err grp_getbodyclass: 1="$1" + ## err grp_getbodyclass: 1="$1" qgrp=`sqlquote "$1"` query<<-EOF SELECT coalesce( @@ -2187,11 +2177,11 @@ usel=`getpar usel` if [ -n "$usel" ]; then uids=$(echo `echo $usel`|tr ' ' ',') - err grpaction-1: grp=$grp, `echo $sql` + ## err grpaction-1: grp=$grp, `echo $sql` text=`getpar text` rm=`getpar rm` cfm=`getpar confirm` -err rm=$rm cfm=$cfm +## err rm=$rm cfm=$cfm if [ x"$rm" = x"yes" ]; then if [ "$isowner" ]; then if [ x"$rm$cfm" = x"yesyes" ]; then @@ -2319,7 +2309,7 @@ WHERE name in (select user from grp_mem where gname=(select gname from grp where rowid=$grid)) ORDER by a.gecos;" - err grpaction: "`echo \"$sql\"`" + ## err grpaction: "`echo \"$sql\"`" tf=$tmpd/title.$$ echo "グループ[<a href=\"?grp+$grid\">$grp</a>]参加メンバーに対する操作" > $tf cmmsg="`cgi_radio rm commission id=\"cmadmin\"`<label @@ -2446,9 +2436,9 @@ if isuser "$owner"; then crview4article $rowid n=`query "SELECT count(*) FROM writeusers;"` - err N=$n + ## err N=$n if [ $((n)) -gt 0 ]; then - err ROWID=$rowid + ## err ROWID=$rowid sql="SELECT growid || ':' || gname FROM movablegroups;" cat<<-EOF <div class="fold"> @@ -2523,7 +2513,7 @@ ########## TRANSACTION BEGIN query "BEGIN;" n=`query "SELECT count(*) FROM writeusers;"` - err Nwriteuser=$n + ## err Nwriteuser=$n if [ $((n)) -gt 0 ]; then query<<-EOF UPDATE blog_s SET val=(SELECT gname FROM grp WHERE rowid=$mv2grp) @@ -2571,7 +2561,7 @@ owner=`getvalbyid blog owner $blogrowid` title=`getvalbyid blog title $blogrowid` author=`getvalbyid article author $rowid` - err EDITart: owner=$owner, author=$author + ## err EDITart: owner=$owner, author=$author if isgrpowner $user $owner; then : EDIT OK elif [ x"$owner" != x"$user" -a x"$author" != x"$user" ]; then @@ -2627,7 +2617,7 @@ fi t_usr=`session=$2 getpar user` t_grp=`session=$2 getpar group` - err joingrpadmit: t_usr=$t_usr, t_grp=$t_grp + ## err joingrpadmit: t_usr=$t_usr, t_grp=$t_grp _m4 -D_TITLE_="joingrp" $layout/html.m4.html if [ -z "$t_usr" -o -z "$t_grp" ]; then echo "無効な加入依頼です。" | html p @@ -2647,7 +2637,7 @@ esac gid=$(query "select rowid from grp where gname=`sqlquote $t_grp`;") rcpts="`getgroupadminmails $t_grp` $user" - err admit: msgdir=$msgdir, rcpts="["$rcpts"]" + ## err admit: msgdir=$msgdir, rcpts="["$rcpts"]" body="グループ <a href=\"?grp+$gid\">$t_grp</a> に $t_usr @@ -2682,7 +2672,7 @@ } joingrp() { # $1=group $2=user $3=yes/no $4=email(if any $5=AsAdmin) - err joingrp: \$1=$1 \$2=$2 \$3=$3 \$4=$4 + ## err joingrp: \$1=$1 \$2=$2 \$3=$3 \$4=$4 if isgrpowner "$user" "$1"; then isowner="yes" elif [ -n "$5" ]; then @@ -2690,7 +2680,7 @@ else isowner="" fi - err jg:isgrpowner: isowner="$isowner" + ## err jg:isgrpowner: isowner="$isowner" if [ -n "$isowner" ]; then : # GROUP OWNER CAN DO EVERYTHING ABOUT REGISTRATION/RETIREMENT elif [ x"$2" != x"$user" ]; then # if user is not login user @@ -2716,8 +2706,6 @@ query "replace into grp_mem values($qgname, '$2');" if [ -n "$4" ]; then if msg=`emaildomaincheck "$4"`; then -err "replace into grp_mem_s values($qgname, '$user', 'email', \ - 'string', '$4', NULL);" query "replace into grp_mem_s values($qgname, '$user', 'email', \ 'string', '$4', NULL);" else @@ -2735,7 +2723,7 @@ else '' end; " err NewGrpChk: $sql if [ -n "`query \"$sql\"`" ]; then - err ADMIN: "replace into grp_adm values($qgname, '$user');" + ## err ADMIN: "replace into grp_adm values($qgname, '$user');" query "replace into grp_adm values($qgname, '$user');" fi fi @@ -2872,7 +2860,7 @@ max(case key when 'owner' then (SELECT gecos FROM gecoses WHERE name=val) END) as gecos from ${2}_s c group by $pk) b on a.$pk=b.$pk $4;"} - err SQL="`echo \"$presql$sql\"|tr -d '\n'`" + err dt:SQL="`echo \"$presql$sql\"|tr -d '\n'`" cat<<EOF | sed "s,\(<TR><TD>\)\([1-9][0-9]*\)\(#[0-9a-fxs]*\)*</TD>,\1$elink$dvlink</TD>," <div> <!-- for folding by check button (s4-funcs.sh:dumptable()) --> <div class="dumptable"> @@ -2899,7 +2887,6 @@ # 7: Password mismatch # 8: Old password incorrect rowid=`getpar rowid` -err ...........rowid=$rowid if [ ! -e $1 ]; then echo "テーブル定義ファイルが見付かりません" | html p exit 1 @@ -2945,7 +2932,7 @@ for col in `gettblcols $tbl`; do val=`getparquote $col` [ -z "$val" ] && continue - err query "update $tbl set $col=$val where rowid=$rowid" + ## err query "update $tbl set $col=$val where rowid=$rowid" ## XX: THIS IS DIRTY hack to ensure non-foreign key in blog_s sql="update $tbl set $col=$val where rowid=$rowid;" if [ x"$tbl" = x"grp" -a x"$col" = x"gname" \ @@ -2953,7 +2940,7 @@ ## User name cannot be changed with interface provided with this ## script. But we offer the trigger to change owner user ## of blog_s table. - err "select quote($col) from $tbl where rowid=$rowid;" + #err "select quote($col) from $tbl where rowid=$rowid;" old=`query "select quote($col) from $tbl where rowid=$rowid;"` cat<<-EOF | query BEGIN; @@ -2983,7 +2970,7 @@ [ -z "$val" ] && continue pval="$pval${pval:+, }$val" done -err pval=$pval +##err pval=$pval for col in `gettblfkey $tbl`; do # args for values() to insertion into master table val=`getvalquote $tbl $col` @@ -2991,12 +2978,12 @@ formaster=$formaster"${formaster:+, }$val" done formaster="$pval${formaster:+, }$formaster" -err formaster=$formaster +## err formaster=$formaster if [ -z "$formaster" ]; then echo "項目を全て埋めてください" | html pre return 1 fi - err "replace into $tbl values($formaster);" + ## err "replace into $tbl values($formaster);" query "replace into $tbl values($formaster);" ## Insertion to master table, done fi @@ -3010,15 +2997,15 @@ if [ $kt = m ]; then # sessID|address.1.22|string|Somewhere-x.y.z sql="" -err dots from query "select var from par where var like '$col.%';" +##err dots from query "select var from par where var like '$col.%';" for v in `query "select var from par where var like '$col.%';"`; do # v=address.1.22 st_rowid=${v##*.} origcol=${v%%.*} # original column derived from -err Updating for $v st_rowid=$st_rowid, partype=`getpartype $v` +##err Updating for $v st_rowid=$st_rowid, partype=`getpartype $v` ##case `getpartype $v` in - err CASE `gettbl_coltype $tbl/$origcol` in - err edit flag = `getpar action.$v` + ## err CASE `gettbl_coltype $tbl/$origcol` in + ## err edit flag = `getpar action.$v` case `getpar action.$v` in rm) if [ x`getpar confirm.$v` = x"yes" ]; then @@ -3030,7 +3017,7 @@ case `gettbl_coltype $tbl/$origcol` in image|document|binary) file=$tmpd/`getparfilename $v` - err type=file=$file + ## err type=file=$file [ -z "$file" ] && continue bn=`sqlquotestr "${file##*/}"` bin="X'"$(hexize "$file")"'" @@ -3056,16 +3043,16 @@ done if [ x"$bin" = x"NULL" ]; then - err repl:normal sql=`echo $sql` + ## err repl:normal sql=`echo $sql` query "$sql delete from $tb2 where type='string' and val='';" - err repl:normal done + ## err repl:normal done else sqlfile="$tmpd/sqlf.$$" echo "$sql" > $sqlfile - err repl:sqlfile=`ls -lF $sqlfile` + ## err repl:sqlfile=`ls -lF $sqlfile` query ".read $sqlfile" - err repl:done + ## err repl:done fi # Rest of kt==m: set multiple mode nr=`getparcount $col` @@ -3079,12 +3066,12 @@ i=$((i+1)) # increase beforehand against continue val=`getvalquote $tbl $col "$limit"` [ -z "$val" -o x"$val" = x'""' -o x"$val" = x"NULL" ] && continue -err $col=$val - bin=NULL -err partype$col=`getpartype $col "$limit"` + ## err $col=$val + bin=NULL + ## err partype$col=`getpartype $col "$limit"` case $ptype in file) file=$tmpd/`getparfilename $col "$limit"` -err parfile-$col=$file + ## err parfile-$col=$file [ -z "$file" ] && continue bin="X'"$(hexize "$file")"'" ct=`file --mime-type - < "$file"|cut -d' ' -f2` @@ -3120,19 +3107,19 @@ fi ;; esac - err p2t: "replace into $tb2 values($pval, \"$col\", $type, $val, bin...);" + ## err p2t: "replace into $tb2 values($pval, \"$col\", $type, $val, bin...);" #query "replace into $tb2 values($pval, \"$col\", $type, $val, $bin);" sql="replace into $tb2 values($pval, \"$col\", $type, $val, $bin);" if [ x"$bin" = x"NULL" ]; then - err Normal-query: `echo $sql` + ## err Normal-query: `echo $sql` query "$sql" else sqlfile="$tmpd/query.$$" echo "$sql" > $sqlfile - err sqlfile=`ls -lF $sqlfile` + ## err sqlfile=`ls -lF $sqlfile` query ".read $sqlfile" fi - err p2t done + ## err p2t done done done done @@ -3151,14 +3138,11 @@ echo "そのようなデータベースはないようです($2)。" | html p return elif [ -n "$2" ]; then -err genform1: "select * from $2 where rowid='$rowid'" rec=`query "select * from $2 where rowid='$rowid';"` if [ -z "$rec" ]; then pk=`gettblpkey $2` ###rec=`sq $db "select rowid from $2 where $pk='$rowid'"` -err "select rowid from $2 where $pk='$rowid';" rec=`query "select rowid from $2 where $pk='$rowid';"` -err rec-rowid=$rec rowid=$rec rec=$3 fi @@ -3174,7 +3158,7 @@ <input name="confirm" type=checkbox value="yes">はい</span>' fi # Image Cache dir - err genform: getcache=$2/$rowid + ## err genform: getcache=$2/$rowid td=`getcachedir "$2/$rowid"` while IFS=: read prompt name keytype type args; do [ -z "${prompt%%\#*}" ] && continue # skip comment line(#) @@ -3184,8 +3168,8 @@ # err genform2a: Seeking for "$2.$name, type=$type" rawval=`getvalbyid $2 $name $rowid $td` val=`echo "$rawval"|htmlescape` -err genform3a: getvalbyid $2 $name $rowid $td -err genform3b: val="[$val]" type="$type" +## err genform3a: getvalbyid $2 $name $rowid $td +## err genform3b: val="[$val]" type="$type" fi if [ -n "$GF_VIEWONLY" ]; then is_hidden "$2" "$name" && continue @@ -3203,7 +3187,6 @@ val="<table>$nl$val$nl</table>" else #form="<input name=\"$name\" value=\"$val\" type=\"$type\"$sp$args>$nl" -err genform: cgi_$type $name $val "$args" form=`cgi_$type $name "$val" "$args"` fi ;; @@ -3227,7 +3210,6 @@ ;; [Ii][Mm][Aa][Gg][Ee]|[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt]|[Bb]inary) if [ -s $td/$name.count ]; then -err Calling cgi_multi_file: "nae=[$name] td=[$td] args=[$args]" form=`cgi_multi_file $name $td "$args"` if [ -n "$val" ]; then hrfb="$myname?showattc+$2_m" @@ -3237,7 +3219,7 @@ #ct=`cat $td/$fn.content-type` ct=`file --mime-type - < "$td/$fn"|cut -d' ' -f2` ri=`cat "$td/$fn.rowid"` - err fn=$fn, name=$name, ri=$ri; ls -lF "$td/" 1>&3 +## err fn=$fn, name=$name, ri=$ri; ls -lF "$td/" 1>&3 #imgsrc="<img src=\"data:$ct,$data\">" #echo "<a href=\"$hrfb+$ri\">$imgsrc</a><br>" iconhref "$td/$fn" "$hrfb+$ri" "" @@ -3341,7 +3323,7 @@ } showattc() { # $1=table_m $2=rowid &optional $3=RawFlag - err \$1=$1 \$2=$2 + ## err \$1=$1 \$2=$2 \$3=$3 if ! isfilereadable $user $1 $2; then contenttype; echo echo "このファイルは管理者のみしか見られません" | html p @@ -3351,11 +3333,11 @@ # tmpfiles=$tmpfiles"${tmpfiles+ }$idir" bin=$idir/$myname-$$.bin sql="select quote(bin) from $1 where rowid='$2';" -err showattc: sql: $sql + ## err showattc: sql: $sql sq $db "$sql" | unhexize > $bin tv=`query "select type||'//'||val from $1 where rowid='$2';"` type=${tv%//*} fn=${tv#*//} - err tv=$tv type=$type fn=$fn, tp2=${tv%\|*} + ## err tv=$tv type=$type fn=$fn, tp2=${tv%\|*} ct=${type#file:} case $ct in # all text/* changed to text/plain text/*) @@ -3438,7 +3420,7 @@ done sql="select rowid from $tbl where $cond;" rowid=`query "$sql"` - err smail1 - "$sql" "-> rowid=$rowid" + ## err smail1 - "$sql" "-> rowid=$rowid" while IFS=: read prompt name keytype type args; do # Read from $1 val=`getpar $name` @@ -3455,14 +3437,14 @@ err mv $tmpd/$fn.orig $tmpd/$fn mv $tmpd/$fn.orig $tmpd/$fn rm $tmpd/$fn.rowid # Remove cache flag - err "`ls $tmpd/$fn`" + ## err "`ls $tmpd/$fn`" echo $fn done) files="$files $fns" ;; esac done < $1 - err FILES=$files "`ls -lF $tmpd`" + ## err FILES=$files "`ls -lF $tmpd`" subj="from ${REMOTE_ADDR}" (echo "$url" echo "への書き込みがありました。"
