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 diff
1.1 --- a/s4-blog.sh Thu Oct 27 11:51:29 2016 +0859 1.2 +++ b/s4-blog.sh Thu Oct 27 16:54:08 2016 +0859 1.3 @@ -70,7 +70,7 @@ 1.4 td=`getcachedir "article/$2"` 1.5 [ -d "$td" ] || mkdir -p $td 1.6 tbl=${1%%[!A-Z0-9a-z_]*} rowid=${2%%[!A-Z0-9a-z_]*} 1.7 -err rowid=$rowid, '$2'=$2 1.8 + err blow_showentry: rowid=$rowid, '$2'=$2 user=$user 1.9 ts=${tbl}_s tm=${tbl}_m 1.10 at=article as=article_s am=article_m 1.11 serial=$(($(date +%s)-1420038000))s$$ 1.12 @@ -374,9 +374,9 @@ 1.13 on a.id=m.id where blogid=(select id from blog where rowid=$1)\ 1.14 and m.key in ('image', 'document', 'binary');" \ 1.15 | while IFS='|' read rowid author filename; do 1.16 - # err isfilereadable $user article_m $rowid 1.17 + err isfilereadable $user article_m $rowid 1.18 isfilereadable $user article_m $rowid || continue 1.19 - # err ok 1.20 + err ok 1.21 i=$((i+1)) 1.22 dir=`printf $bd/%03d $i` 1.23 mkdir $dir 1.24 @@ -389,8 +389,9 @@ 1.25 return 1.26 fi 1.27 (cd $bd 1.28 - err cdto$bd; (pwd; ls -lFa) 1>&3 1.29 + ## err cdto$bd; (pwd; ls -lFa) 1>&3 1.30 tar zcf .archive.tar.gz * && mv .archive.tar.gz archive.tar.gz 1.31 + err Creating tar archive "`ls -l archive.tar.gz`" 1.32 ) 1.33 arc=$bd/archive.tar.gz 1.34 echo "Content-type: application/x-gzip" 1.35 @@ -573,8 +574,7 @@ 1.36 </table> 1.37 EOF 1.38 if [ -s "$result" ]; then 1.39 - found=`grep "^<TR><TD>" $result | wc -l` 1.40 - found=$((found+0)) 1.41 + found=$((`grep "^<TR><TD>" $result | wc -l` + 0)) # Cast to INT 1.42 one=${found%1} 1.43 echo "$found match${one:+es} found" 1.44 else 1.45 @@ -597,7 +597,7 @@ 1.46 # $1=GRPname(if it is a group) 1.47 grprowid=$1 1.48 rowid=`getpar rowid` 1.49 - err blog_addentry0: rowid=$rowid 1.50 + ## err blog_addentry0: rowid=$rowid 1.51 if [ -n "$grprowid" ]; then 1.52 owner=`getgroupbyid $grprowid` 1.53 else 1.54 @@ -627,7 +627,7 @@ 1.55 fi 1.56 par2table $formdir/blog.def 1.57 serial=`getpar serial` 1.58 - err SERIAL: $serial ROWID=$rowid listing=$listing 1.59 + ## err SERIAL: $serial ROWID=$rowid listing=$listing 1.60 id="" 1.61 if [ -n "$rowid" ]; then 1.62 # Here, id becomes NULL when removal of entries at par2table 1.63 @@ -635,7 +635,7 @@ 1.64 elif [ -n "$serial" ]; then 1.65 # If new blog leader created, traverse to its head. 1.66 id=`query "select rowid from blog where id='$serial';"` 1.67 - err new-Leader: "select rowid from blog where id='$serial';" id=$id 1.68 + ## err new-Leader: "select rowid from blog where id='$serial';" id=$id 1.69 fi 1.70 if [ -n "$id" ]; then 1.71 ## If new aritcle is entered, JUMP to blog_reply 1.72 @@ -657,7 +657,6 @@ 1.73 1.74 blog_reply() { 1.75 rowid=$1 1.76 - err rowid=$1 1.77 1.78 if [ -z "$rowid" ]; then 1.79 echo "表示する日記番号が未指定です。" | html p 1.80 @@ -687,7 +686,7 @@ 1.81 if [ -n "$text" ]; then 1.82 if blog_writable $rowid $user; then 1.83 par2table $formdir/article.def 1.84 - st=$? # ; err par2t-st=$st 1.85 + st=$? 1.86 case $st in 1.87 0|4) 1.88 [ "$st" = "4" ] && act="書込削除"
2.1 --- a/s4-funcs.sh Thu Oct 27 11:51:29 2016 +0859 2.2 +++ b/s4-funcs.sh Thu Oct 27 16:54:08 2016 +0859 2.3 @@ -427,7 +427,7 @@ 2.4 id=(select id from $2 where rowid=$3))='$1' 2.5 then 'user+author' 2.6 else '' end;" 2.7 - err isfilereadable: sql="`echo $sql`" 2.8 + ## err isfilereadable: sql="`echo $sql`" 2.9 # caseのネストで内側のcaseがスカラーtrueを返しても外側はtrue扱いにならない 2.10 result=`query "$sql"` 2.11 [ -n "$result" ] && return 0 2.12 @@ -512,11 +512,11 @@ 2.13 getpar() { 2.14 err getpar: "select val from par where var='$1' and sessid='$session' $2;" 2.15 val=`query "select val from par where var='$1' and sessid='$session' $2;"` 2.16 -err getpar/val1: "val=[$val]" 2.17 +## err getpar/val1: "val=[$val]" 2.18 if [ -z "$val" ]; then 2.19 val=`query "select val from cookie where var='$1' and sessid='$session' $2;"` 2.20 fi 2.21 -err getpar/val2: "val=[$val]" 2.22 +## err getpar/val2: "val=[$val]" 2.23 case "$var" in 2.24 owner) 2.25 if [ x"$user" = x"$val" ]; then 2.26 @@ -525,7 +525,7 @@ 2.27 echo $val; return 2.28 fi ;; 2.29 esac 2.30 -err getpar/ret: "val=[$val]" 2.31 +## err getpar/ret: "val=[$val]" 2.32 echo "$val" 2.33 } 2.34 2.35 @@ -617,7 +617,6 @@ 2.36 2.37 (for c in `gettblcols $1`; do 2.38 if [ x"$2" = x"$c" ]; then 2.39 - err "select $2 from $1 where rowid=$3" 2.40 ###sq $db "select $2 from $1 where rowid=$3" 2.41 query "select $2 from $1 where rowid=$3;" 2.42 return 2.43 @@ -1048,7 +1047,7 @@ 2.44 # $1=passwd 2.45 dbpswd=`getpwfield $user pswd` 2.46 encpswd=`mycrypt "$1" "$dbpswd"` 2.47 - err user=$user, pswd=$1, db=$dbpswd, enc=$encpswd 2.48 + ## err user=$user, pswd=$1, db=$dbpswd, enc=$encpswd 2.49 [ x"$dbpswd" = x"$encpswd" ] 2.50 } 2.51 mypwhash() { 2.52 @@ -1078,7 +1077,6 @@ 2.53 skc=`getpar skey` # from cookie 2.54 [ -z "$user" ] && return 3 2.55 skey="`getpwfield $user skey`" 2.56 -err user=$user skey=$skey 2.57 if [ -n "$skey" ]; then 2.58 if [ x"$skey" = x"$skc" ]; then 2.59 return 0 2.60 @@ -1200,13 +1198,11 @@ 2.61 left join grp_mem_s s on g.gname=s.gname and g.user=s.user 2.62 and s.key='email' 2.63 where g.gname=$qgrp and g.user in ($users);" 2.64 - err `echo $sql` 2.65 query "$sql" 2.66 } 2.67 email4groupbyuid() { 2.68 # Get for-$1=group email address(es) for $2...=user-ids 2.69 qgrp=`sqlquote "$1"`; shift 2.70 -err em4gbid-IN: "\$1=$1 qgrp=$qgrp" 2.71 uids=`echo "$@"` 2.72 uids=`echo $uids|tr ' ' ','` 2.73 sql="WITH 2.74 @@ -1223,7 +1219,7 @@ 2.75 FROM useremails u LEFT JOIN grpemails g 2.76 ON u.name=g.user 2.77 WHERE u.rid in ($uids);" 2.78 - err email4gByid `echo $sql` 2.79 + ## err email4gByid `echo $sql` 2.80 query "$sql" 2.81 } 2.82 collectemail() ( 2.83 @@ -1249,7 +1245,7 @@ 2.84 on g.gname=s.gname and g.user=s.user and s.key='email' 2.85 left join user_m um on g.user=um.name and um.key='email' 2.86 where g.gname=$qgrp $ex;" 2.87 - err CollectEmail: `echo "$sql"` 2.88 + ## err CollectEmail: `echo "$sql"` 2.89 query "$sql" 2.90 fi 2.91 done 2.92 @@ -1302,7 +1298,6 @@ 2.93 *) repo="無効なアドレスです" ;; 2.94 esac 2.95 addr=`query "select val from par where sessid like 'invite-%-$user';"` 2.96 -err addr=$addr 2.97 if [ -n "$addr" ]; then 2.98 susp="<h2>招待済みで加入待ちのアドレス</h2><pre>$addr</pre>" 2.99 fi 2.100 @@ -1346,7 +1341,6 @@ 2.101 groupupdate() { 2.102 gname=`getpar gname` 2.103 qgname=`sqlquote $gname` 2.104 - err Enter:groupupdate 2.105 if [ -n "$gname" ]; then 2.106 # See ALSO same job in showgroup() 2.107 newgname=`group_safename "$gname"` 2.108 @@ -1359,10 +1353,10 @@ 2.109 fi 2.110 # Name confliction check 2.111 parow=`getpar rowid` 2.112 -err parow=$parow 2.113 +## err parow=$parow 2.114 qgname=`sqlquote $gname` # Set again in case gname modified 2.115 query "BEGIN EXCLUSIVE;" 2.116 - err "select count(gname) from grp where rowid != ${parow:-0} and gname = $qgname;" 2.117 + ## err "select count(gname) from grp where rowid != ${parow:-0} and gname = $qgname;" 2.118 count=$(query "select count(gname) from grp where rowid != ${parow:-0} and gname = $qgname;") 2.119 if [ $count -gt 0 ]; then 2.120 echo "そのグループ名は既にあります。" | html p 2.121 @@ -1379,7 +1373,7 @@ 2.122 a left join blog_s b on a.id=b.id and b.key='owner'; 2.123 EOF 2.124 rm=`getpar rm` cfm=`getpar confirm` 2.125 - err groupupdate:::: after par2tbl rmcfm=$rm$cfm 2.126 + ## err groupupdate:::: after par2tbl rmcfm=$rm$cfm 2.127 if [ x"$rm$cfm" = x"yesyes" ]; then 2.128 if [ -z "`query \"select gname from grp where gname=$qgname;\"`" ]; then 2.129 sql="delete from blog where id in 2.130 @@ -1394,7 +1388,7 @@ 2.131 fi 2.132 sql="select rowid from grp where gname=$qgname;" 2.133 grid=$(query $sql) 2.134 - err grpupdate:new-grid=$grid, sql=$sql 2.135 + ## err grpupdate:new-grid=$grid, sql=$sql 2.136 grp $grid 2.137 } 2.138 groupman() { 2.139 @@ -1419,7 +1413,6 @@ 2.140 _m4 -D_BODYCLASS_=groupconf -D_TITLE_="グループ情報編集" $layout/html.m4.html 2.141 #rowid=`query "select rowid from grp where gname='$1';"` 2.142 rowid=${1%%[!A-Z0-9a-z_]*} 2.143 -err gcon \$1=$1 rowid=$rowid 2.144 # GF_ACTION="?grp+$1" edittable "$formdir/grp.def" "grp" "$rowid" #2015-0804 2.145 GF_STAGE="groupupdate" edittable "$formdir/grp.def" "grp" "$rowid" 2.146 } 2.147 @@ -1441,11 +1434,9 @@ 2.148 gpg=`getpar grp` 2.149 grid=${1:-$gpg} 2.150 grp=`getgroupbyid "$grid"` 2.151 - err grp: getpar-grp"(gpg)=[$grp]" 2.152 ## . ./s4-blog.sh 2.153 jg=`getpar joingrp` 2.154 if [ -n "$jg" ]; then 2.155 - err jg=$jg, grp=$grp 2.156 [ -n "$jg" -a -n "$grp" ] && 2.157 joingrp "$grp" "$user" "$jg" "`getpar email`" 2.158 fi 2.159 @@ -1632,10 +1623,10 @@ 2.160 *@*) uname=`getvalbypkey user name "$1"` ;; 2.161 *) uname=`getvalbyid user name $1` ;; 2.162 esac 2.163 - err ShowHome: uname=$uname 2.164 + ## err ShowHome: uname=$uname 2.165 td=`getcachedir home/"$1"` 2.166 gecos=`gecos "$uname"` 2.167 - err SH:gecos=$gecos 2.168 + ## err SH:gecos=$gecos 2.169 GF_VIEWONLY=1 2.170 cond="gname in (select gname from grp_mem where user='$uname')" 2.171 search_form_args="" 2.172 @@ -1647,7 +1638,7 @@ 2.173 sql="select count(id) from article_m where id 2.174 in (select id from article where author='$user') 2.175 and type like 'file:%';" 2.176 - err nfile-sql=`echo "$sql"` 2.177 + ## err nfile-sql=`echo "$sql"` 2.178 nfile=`query "$sql"` 2.179 # err nfile=$nfile 2.180 if [ $nfile -gt 0 ]; then 2.181 @@ -1785,7 +1776,7 @@ 2.182 } 2.183 commission() { # $1=grp-rowid $2=user-rowid 2.184 contenttype; echo 2.185 - err commission: "$@" 2.186 + ## err commission: "$@" 2.187 gname=`getgroupbyid $1` 2.188 echo "グループ $gname 管理者委任" \ 2.189 | _m4 -D_TITLE_="syscmd(\`cat')" $layout/html.m4.html 2.190 @@ -1806,10 +1797,10 @@ 2.191 max(case key when 'ctime' then val end) as ctime\ 2.192 from grp_s group by gname order by ctime);" 2.193 sql="select val from grp_s where key='tag' $and$* group by val;" 2.194 -err ListGRP: query sql="$sql" 2.195 +## err ListGRP: query sql="$sql" 2.196 for tag in `query "$sql"` 2.197 do 2.198 -err ListGrp: tag=$tag 2.199 +## err ListGrp: tag=$tag 2.200 tn=${tagline%%=${tag}*} 2.201 tn=${tn##*[ :]} 2.202 sql="select rowid||':'||gname as 'グループ名',説明 from 2.203 @@ -1820,7 +1811,7 @@ 2.204 max(case key when 'tag' then val end) as 'tag', 2.205 max(case key when 'mtime' then val end) as mtime from grp_s 2.206 $where$* group by gname having tag='$tag' order by mtime desc);" 2.207 - err PersonalGroupList= `echo $sql` 2.208 +## err PersonalGroupList= `echo $sql` 2.209 echo "<h2>$tn</h2>" 2.210 echo '<table class="b listgroup">' 2.211 sq -header -html $db "$sql" \ 2.212 @@ -1833,7 +1824,7 @@ 2.213 # $1=icon-file, $2=Href $3=title $4...=anchor 2.214 data=`percenthex "$1"` 2.215 ct=`file --mime-type - < "$1"|cut -d' ' -f2` 2.216 -err iconhref: \$1=$1 \$2=$2 \$3="$@" 2.217 +## err iconhref: \$1=$1 \$2=$2 \$3="$@" 2.218 href=$2; title=$3; shift 3 2.219 echo "<a href=\"$href\"><img title=\"$title\" src=\"data:$ct,$data\">$@</a>" 2.220 ) 2.221 @@ -1846,7 +1837,7 @@ 2.222 listentry() ( 2.223 # $1=user/group $2=SearchKeyword $3=condition(if any) $4=grprowid(if in grp) 2.224 # Referring variable $iamowner=$grp to attach owner-request links 2.225 -err listentry: \$1=$1 \$2=$2 \$3=$3 2.226 +## err listentry: \$1=$1 \$2=$2 \$3=$3 2.227 cond='' hiddens='' 2.228 offset=`getpar offset` 2.229 offset=${offset%%[!0-9]*} 2.230 @@ -1868,7 +1859,7 @@ 2.231 tagline=`grep :tag: $formdir/grp.def|cut -d: -f5-` 2.232 if [ -n "$tagline" ]; then 2.233 tagconv=`echo $tagline|sed 's/\([^= :]*\)=\([^= :]*\)/-D\2=\1/g'` 2.234 -err tagconv=$tagconv 2.235 +## err tagconv=$tagconv 2.236 fi 2.237 fi 2.238 if [ ! -d $dir ]; then 2.239 @@ -1926,7 +1917,7 @@ 2.240 order by b.tag desc, b.mtime desc, a.rowid asc" 2.241 # Give precedence to newer maintained groups (2016-09-24) 2.242 # Note that mtime is stored only in grp_s. 2.243 -err LE:sql.1="$sql" 2.244 +## err LE:sql.1="$sql" 2.245 total=`query "with x as ($sql) select count(*) from x;"` 2.246 echo "${entity} 一覧" | html h2 2.247 if [ $total -gt $limit ]; then 2.248 @@ -1966,7 +1957,7 @@ 2.249 pnbtn="$nextbtn$prevbtn" 2.250 echo $pnbtn 2.251 2.252 - err ListEntry: `echo "$sql"\;` 2.253 +## err ListEntry: `echo "$sql"\;` 2.254 query "$sql limit $limit ${offset:+offset $offset};" \ 2.255 | while IFS='|' read id lnk name gecos tag ownerp type; do 2.256 err name=$name owner=$ownerp lnk=$lnk 2.257 @@ -2009,7 +2000,7 @@ 2.258 fi 2.259 grp=`getgroupbyid $grid` 2.260 qgrp=`sqlquote $grp` 2.261 -err showgroup2: grp=$grp qgrp="[$(sqlquote $grp)]" 2.262 +## err showgroup2: grp=$grp qgrp="[$(sqlquote $grp)]" 2.263 if isgroup "$grp"; then 2.264 tf=$tmpd/title.$$ 2.265 bodyclass=`query "SELECT val FROM grp_s 2.266 @@ -2083,7 +2074,6 @@ 2.267 EOF 2.268 fi 2.269 # 加入ボタン + 加入者リスト 2.270 -err ismember $user $grp 2.271 if [ -n "$ismember" ]; then 2.272 ismem='checked' state="(参加中)" 2.273 else 2.274 @@ -2092,9 +2082,9 @@ 2.275 # このグループでの加入アドレス 2.276 eml=`query "select val from grp_mem_s where gname=$qgrp and user='$user' \ 2.277 and key='email';"` 2.278 -err EML: "select val from grp_mem_s where gname='$2' and user='$user' \ 2.279 - and key='email';" 2.280 -err email=$eml 2.281 +##err EML: "select val from grp_mem_s where gname='$2' and user='$user' \ 2.282 +## and key='email';" 2.283 +##err email=$eml 2.284 cat <<EOF 2.285 <div class="fold clear"> 2.286 `cgi_checkbox reg yes id="reg"`<label 2.287 @@ -2153,7 +2143,7 @@ 2.288 # `ismember' for groups where user belongs 2.289 # $1=GroupName (w/o quote) 2.290 # $user=userNameCurrentlyLogin 2.291 - err grp_getbodyclass: 1="$1" 2.292 + ## err grp_getbodyclass: 1="$1" 2.293 qgrp=`sqlquote "$1"` 2.294 query<<-EOF 2.295 SELECT coalesce( 2.296 @@ -2187,11 +2177,11 @@ 2.297 usel=`getpar usel` 2.298 if [ -n "$usel" ]; then 2.299 uids=$(echo `echo $usel`|tr ' ' ',') 2.300 - err grpaction-1: grp=$grp, `echo $sql` 2.301 + ## err grpaction-1: grp=$grp, `echo $sql` 2.302 text=`getpar text` 2.303 2.304 rm=`getpar rm` cfm=`getpar confirm` 2.305 -err rm=$rm cfm=$cfm 2.306 +## err rm=$rm cfm=$cfm 2.307 if [ x"$rm" = x"yes" ]; then 2.308 if [ "$isowner" ]; then 2.309 if [ x"$rm$cfm" = x"yesyes" ]; then 2.310 @@ -2319,7 +2309,7 @@ 2.311 WHERE name in (select user from grp_mem where 2.312 gname=(select gname from grp where rowid=$grid)) 2.313 ORDER by a.gecos;" 2.314 - err grpaction: "`echo \"$sql\"`" 2.315 + ## err grpaction: "`echo \"$sql\"`" 2.316 tf=$tmpd/title.$$ 2.317 echo "グループ[<a href=\"?grp+$grid\">$grp</a>]参加メンバーに対する操作" > $tf 2.318 cmmsg="`cgi_radio rm commission id=\"cmadmin\"`<label 2.319 @@ -2446,9 +2436,9 @@ 2.320 if isuser "$owner"; then 2.321 crview4article $rowid 2.322 n=`query "SELECT count(*) FROM writeusers;"` 2.323 - err N=$n 2.324 + ## err N=$n 2.325 if [ $((n)) -gt 0 ]; then 2.326 - err ROWID=$rowid 2.327 + ## err ROWID=$rowid 2.328 sql="SELECT growid || ':' || gname FROM movablegroups;" 2.329 cat<<-EOF 2.330 <div class="fold"> 2.331 @@ -2523,7 +2513,7 @@ 2.332 ########## TRANSACTION BEGIN 2.333 query "BEGIN;" 2.334 n=`query "SELECT count(*) FROM writeusers;"` 2.335 - err Nwriteuser=$n 2.336 + ## err Nwriteuser=$n 2.337 if [ $((n)) -gt 0 ]; then 2.338 query<<-EOF 2.339 UPDATE blog_s SET val=(SELECT gname FROM grp WHERE rowid=$mv2grp) 2.340 @@ -2571,7 +2561,7 @@ 2.341 owner=`getvalbyid blog owner $blogrowid` 2.342 title=`getvalbyid blog title $blogrowid` 2.343 author=`getvalbyid article author $rowid` 2.344 - err EDITart: owner=$owner, author=$author 2.345 + ## err EDITart: owner=$owner, author=$author 2.346 if isgrpowner $user $owner; then 2.347 : EDIT OK 2.348 elif [ x"$owner" != x"$user" -a x"$author" != x"$user" ]; then 2.349 @@ -2627,7 +2617,7 @@ 2.350 fi 2.351 t_usr=`session=$2 getpar user` 2.352 t_grp=`session=$2 getpar group` 2.353 - err joingrpadmit: t_usr=$t_usr, t_grp=$t_grp 2.354 + ## err joingrpadmit: t_usr=$t_usr, t_grp=$t_grp 2.355 _m4 -D_TITLE_="joingrp" $layout/html.m4.html 2.356 if [ -z "$t_usr" -o -z "$t_grp" ]; then 2.357 echo "無効な加入依頼です。" | html p 2.358 @@ -2647,7 +2637,7 @@ 2.359 esac 2.360 gid=$(query "select rowid from grp where gname=`sqlquote $t_grp`;") 2.361 rcpts="`getgroupadminmails $t_grp` $user" 2.362 - err admit: msgdir=$msgdir, rcpts="["$rcpts"]" 2.363 + ## err admit: msgdir=$msgdir, rcpts="["$rcpts"]" 2.364 body="グループ <a href=\"?grp+$gid\">$t_grp</a> 2.365 に 2.366 $t_usr 2.367 @@ -2682,7 +2672,7 @@ 2.368 } 2.369 joingrp() { 2.370 # $1=group $2=user $3=yes/no $4=email(if any $5=AsAdmin) 2.371 - err joingrp: \$1=$1 \$2=$2 \$3=$3 \$4=$4 2.372 + ## err joingrp: \$1=$1 \$2=$2 \$3=$3 \$4=$4 2.373 if isgrpowner "$user" "$1"; then 2.374 isowner="yes" 2.375 elif [ -n "$5" ]; then 2.376 @@ -2690,7 +2680,7 @@ 2.377 else 2.378 isowner="" 2.379 fi 2.380 - err jg:isgrpowner: isowner="$isowner" 2.381 + ## err jg:isgrpowner: isowner="$isowner" 2.382 if [ -n "$isowner" ]; then 2.383 : # GROUP OWNER CAN DO EVERYTHING ABOUT REGISTRATION/RETIREMENT 2.384 elif [ x"$2" != x"$user" ]; then # if user is not login user 2.385 @@ -2716,8 +2706,6 @@ 2.386 query "replace into grp_mem values($qgname, '$2');" 2.387 if [ -n "$4" ]; then 2.388 if msg=`emaildomaincheck "$4"`; then 2.389 -err "replace into grp_mem_s values($qgname, '$user', 'email', \ 2.390 - 'string', '$4', NULL);" 2.391 query "replace into grp_mem_s values($qgname, '$user', 'email', \ 2.392 'string', '$4', NULL);" 2.393 else 2.394 @@ -2735,7 +2723,7 @@ 2.395 else '' end; " 2.396 err NewGrpChk: $sql 2.397 if [ -n "`query \"$sql\"`" ]; then 2.398 - err ADMIN: "replace into grp_adm values($qgname, '$user');" 2.399 + ## err ADMIN: "replace into grp_adm values($qgname, '$user');" 2.400 query "replace into grp_adm values($qgname, '$user');" 2.401 fi 2.402 fi 2.403 @@ -2872,7 +2860,7 @@ 2.404 max(case key when 'owner' 2.405 then (SELECT gecos FROM gecoses WHERE name=val) END) as gecos 2.406 from ${2}_s c group by $pk) b on a.$pk=b.$pk $4;"} 2.407 - err SQL="`echo \"$presql$sql\"|tr -d '\n'`" 2.408 + err dt:SQL="`echo \"$presql$sql\"|tr -d '\n'`" 2.409 cat<<EOF | sed "s,\(<TR><TD>\)\([1-9][0-9]*\)\(#[0-9a-fxs]*\)*</TD>,\1$elink$dvlink</TD>," 2.410 <div> <!-- for folding by check button (s4-funcs.sh:dumptable()) --> 2.411 <div class="dumptable"> 2.412 @@ -2899,7 +2887,6 @@ 2.413 # 7: Password mismatch 2.414 # 8: Old password incorrect 2.415 rowid=`getpar rowid` 2.416 -err ...........rowid=$rowid 2.417 if [ ! -e $1 ]; then 2.418 echo "テーブル定義ファイルが見付かりません" | html p 2.419 exit 1 2.420 @@ -2945,7 +2932,7 @@ 2.421 for col in `gettblcols $tbl`; do 2.422 val=`getparquote $col` 2.423 [ -z "$val" ] && continue 2.424 - err query "update $tbl set $col=$val where rowid=$rowid" 2.425 + ## err query "update $tbl set $col=$val where rowid=$rowid" 2.426 ## XX: THIS IS DIRTY hack to ensure non-foreign key in blog_s 2.427 sql="update $tbl set $col=$val where rowid=$rowid;" 2.428 if [ x"$tbl" = x"grp" -a x"$col" = x"gname" \ 2.429 @@ -2953,7 +2940,7 @@ 2.430 ## User name cannot be changed with interface provided with this 2.431 ## script. But we offer the trigger to change owner user 2.432 ## of blog_s table. 2.433 - err "select quote($col) from $tbl where rowid=$rowid;" 2.434 + #err "select quote($col) from $tbl where rowid=$rowid;" 2.435 old=`query "select quote($col) from $tbl where rowid=$rowid;"` 2.436 cat<<-EOF | query 2.437 BEGIN; 2.438 @@ -2983,7 +2970,7 @@ 2.439 [ -z "$val" ] && continue 2.440 pval="$pval${pval:+, }$val" 2.441 done 2.442 -err pval=$pval 2.443 +##err pval=$pval 2.444 for col in `gettblfkey $tbl`; do 2.445 # args for values() to insertion into master table 2.446 val=`getvalquote $tbl $col` 2.447 @@ -2991,12 +2978,12 @@ 2.448 formaster=$formaster"${formaster:+, }$val" 2.449 done 2.450 formaster="$pval${formaster:+, }$formaster" 2.451 -err formaster=$formaster 2.452 +## err formaster=$formaster 2.453 if [ -z "$formaster" ]; then 2.454 echo "項目を全て埋めてください" | html pre 2.455 return 1 2.456 fi 2.457 - err "replace into $tbl values($formaster);" 2.458 + ## err "replace into $tbl values($formaster);" 2.459 query "replace into $tbl values($formaster);" 2.460 ## Insertion to master table, done 2.461 fi 2.462 @@ -3010,15 +2997,15 @@ 2.463 if [ $kt = m ]; then 2.464 # sessID|address.1.22|string|Somewhere-x.y.z 2.465 sql="" 2.466 -err dots from query "select var from par where var like '$col.%';" 2.467 +##err dots from query "select var from par where var like '$col.%';" 2.468 for v in `query "select var from par where var like '$col.%';"`; do 2.469 # v=address.1.22 2.470 st_rowid=${v##*.} 2.471 origcol=${v%%.*} # original column derived from 2.472 -err Updating for $v st_rowid=$st_rowid, partype=`getpartype $v` 2.473 +##err Updating for $v st_rowid=$st_rowid, partype=`getpartype $v` 2.474 ##case `getpartype $v` in 2.475 - err CASE `gettbl_coltype $tbl/$origcol` in 2.476 - err edit flag = `getpar action.$v` 2.477 + ## err CASE `gettbl_coltype $tbl/$origcol` in 2.478 + ## err edit flag = `getpar action.$v` 2.479 case `getpar action.$v` in 2.480 rm) 2.481 if [ x`getpar confirm.$v` = x"yes" ]; then 2.482 @@ -3030,7 +3017,7 @@ 2.483 case `gettbl_coltype $tbl/$origcol` in 2.484 image|document|binary) 2.485 file=$tmpd/`getparfilename $v` 2.486 - err type=file=$file 2.487 + ## err type=file=$file 2.488 [ -z "$file" ] && continue 2.489 bn=`sqlquotestr "${file##*/}"` 2.490 bin="X'"$(hexize "$file")"'" 2.491 @@ -3056,16 +3043,16 @@ 2.492 done 2.493 2.494 if [ x"$bin" = x"NULL" ]; then 2.495 - err repl:normal sql=`echo $sql` 2.496 + ## err repl:normal sql=`echo $sql` 2.497 query "$sql 2.498 delete from $tb2 where type='string' and val='';" 2.499 - err repl:normal done 2.500 + ## err repl:normal done 2.501 else 2.502 sqlfile="$tmpd/sqlf.$$" 2.503 echo "$sql" > $sqlfile 2.504 - err repl:sqlfile=`ls -lF $sqlfile` 2.505 + ## err repl:sqlfile=`ls -lF $sqlfile` 2.506 query ".read $sqlfile" 2.507 - err repl:done 2.508 + ## err repl:done 2.509 fi 2.510 # Rest of kt==m: set multiple mode 2.511 nr=`getparcount $col` 2.512 @@ -3079,12 +3066,12 @@ 2.513 i=$((i+1)) # increase beforehand against continue 2.514 val=`getvalquote $tbl $col "$limit"` 2.515 [ -z "$val" -o x"$val" = x'""' -o x"$val" = x"NULL" ] && continue 2.516 -err $col=$val 2.517 - bin=NULL 2.518 -err partype$col=`getpartype $col "$limit"` 2.519 + ## err $col=$val 2.520 + bin=NULL 2.521 + ## err partype$col=`getpartype $col "$limit"` 2.522 case $ptype in 2.523 file) file=$tmpd/`getparfilename $col "$limit"` 2.524 -err parfile-$col=$file 2.525 + ## err parfile-$col=$file 2.526 [ -z "$file" ] && continue 2.527 bin="X'"$(hexize "$file")"'" 2.528 ct=`file --mime-type - < "$file"|cut -d' ' -f2` 2.529 @@ -3120,19 +3107,19 @@ 2.530 fi 2.531 ;; 2.532 esac 2.533 - err p2t: "replace into $tb2 values($pval, \"$col\", $type, $val, bin...);" 2.534 + ## err p2t: "replace into $tb2 values($pval, \"$col\", $type, $val, bin...);" 2.535 #query "replace into $tb2 values($pval, \"$col\", $type, $val, $bin);" 2.536 sql="replace into $tb2 values($pval, \"$col\", $type, $val, $bin);" 2.537 if [ x"$bin" = x"NULL" ]; then 2.538 - err Normal-query: `echo $sql` 2.539 + ## err Normal-query: `echo $sql` 2.540 query "$sql" 2.541 else 2.542 sqlfile="$tmpd/query.$$" 2.543 echo "$sql" > $sqlfile 2.544 - err sqlfile=`ls -lF $sqlfile` 2.545 + ## err sqlfile=`ls -lF $sqlfile` 2.546 query ".read $sqlfile" 2.547 fi 2.548 - err p2t done 2.549 + ## err p2t done 2.550 done 2.551 done 2.552 done 2.553 @@ -3151,14 +3138,11 @@ 2.554 echo "そのようなデータベースはないようです($2)。" | html p 2.555 return 2.556 elif [ -n "$2" ]; then 2.557 -err genform1: "select * from $2 where rowid='$rowid'" 2.558 rec=`query "select * from $2 where rowid='$rowid';"` 2.559 if [ -z "$rec" ]; then 2.560 pk=`gettblpkey $2` 2.561 ###rec=`sq $db "select rowid from $2 where $pk='$rowid'"` 2.562 -err "select rowid from $2 where $pk='$rowid';" 2.563 rec=`query "select rowid from $2 where $pk='$rowid';"` 2.564 -err rec-rowid=$rec 2.565 rowid=$rec 2.566 rec=$3 2.567 fi 2.568 @@ -3174,7 +3158,7 @@ 2.569 <input name="confirm" type=checkbox value="yes">はい</span>' 2.570 fi 2.571 # Image Cache dir 2.572 - err genform: getcache=$2/$rowid 2.573 + ## err genform: getcache=$2/$rowid 2.574 td=`getcachedir "$2/$rowid"` 2.575 while IFS=: read prompt name keytype type args; do 2.576 [ -z "${prompt%%\#*}" ] && continue # skip comment line(#) 2.577 @@ -3184,8 +3168,8 @@ 2.578 # err genform2a: Seeking for "$2.$name, type=$type" 2.579 rawval=`getvalbyid $2 $name $rowid $td` 2.580 val=`echo "$rawval"|htmlescape` 2.581 -err genform3a: getvalbyid $2 $name $rowid $td 2.582 -err genform3b: val="[$val]" type="$type" 2.583 +## err genform3a: getvalbyid $2 $name $rowid $td 2.584 +## err genform3b: val="[$val]" type="$type" 2.585 fi 2.586 if [ -n "$GF_VIEWONLY" ]; then 2.587 is_hidden "$2" "$name" && continue 2.588 @@ -3203,7 +3187,6 @@ 2.589 val="<table>$nl$val$nl</table>" 2.590 else 2.591 #form="<input name=\"$name\" value=\"$val\" type=\"$type\"$sp$args>$nl" 2.592 -err genform: cgi_$type $name $val "$args" 2.593 form=`cgi_$type $name "$val" "$args"` 2.594 fi 2.595 ;; 2.596 @@ -3227,7 +3210,6 @@ 2.597 ;; 2.598 [Ii][Mm][Aa][Gg][Ee]|[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt]|[Bb]inary) 2.599 if [ -s $td/$name.count ]; then 2.600 -err Calling cgi_multi_file: "nae=[$name] td=[$td] args=[$args]" 2.601 form=`cgi_multi_file $name $td "$args"` 2.602 if [ -n "$val" ]; then 2.603 hrfb="$myname?showattc+$2_m" 2.604 @@ -3237,7 +3219,7 @@ 2.605 #ct=`cat $td/$fn.content-type` 2.606 ct=`file --mime-type - < "$td/$fn"|cut -d' ' -f2` 2.607 ri=`cat "$td/$fn.rowid"` 2.608 - err fn=$fn, name=$name, ri=$ri; ls -lF "$td/" 1>&3 2.609 +## err fn=$fn, name=$name, ri=$ri; ls -lF "$td/" 1>&3 2.610 #imgsrc="<img src=\"data:$ct,$data\">" 2.611 #echo "<a href=\"$hrfb+$ri\">$imgsrc</a><br>" 2.612 iconhref "$td/$fn" "$hrfb+$ri" "" 2.613 @@ -3341,7 +3323,7 @@ 2.614 } 2.615 showattc() { 2.616 # $1=table_m $2=rowid &optional $3=RawFlag 2.617 - err \$1=$1 \$2=$2 2.618 + ## err \$1=$1 \$2=$2 \$3=$3 2.619 if ! isfilereadable $user $1 $2; then 2.620 contenttype; echo 2.621 echo "このファイルは管理者のみしか見られません" | html p 2.622 @@ -3351,11 +3333,11 @@ 2.623 # tmpfiles=$tmpfiles"${tmpfiles+ }$idir" 2.624 bin=$idir/$myname-$$.bin 2.625 sql="select quote(bin) from $1 where rowid='$2';" 2.626 -err showattc: sql: $sql 2.627 + ## err showattc: sql: $sql 2.628 sq $db "$sql" | unhexize > $bin 2.629 tv=`query "select type||'//'||val from $1 where rowid='$2';"` 2.630 type=${tv%//*} fn=${tv#*//} 2.631 - err tv=$tv type=$type fn=$fn, tp2=${tv%\|*} 2.632 + ## err tv=$tv type=$type fn=$fn, tp2=${tv%\|*} 2.633 ct=${type#file:} 2.634 case $ct in # all text/* changed to text/plain 2.635 text/*) 2.636 @@ -3438,7 +3420,7 @@ 2.637 done 2.638 sql="select rowid from $tbl where $cond;" 2.639 rowid=`query "$sql"` 2.640 - err smail1 - "$sql" "-> rowid=$rowid" 2.641 + ## err smail1 - "$sql" "-> rowid=$rowid" 2.642 2.643 while IFS=: read prompt name keytype type args; do # Read from $1 2.644 val=`getpar $name` 2.645 @@ -3455,14 +3437,14 @@ 2.646 err mv $tmpd/$fn.orig $tmpd/$fn 2.647 mv $tmpd/$fn.orig $tmpd/$fn 2.648 rm $tmpd/$fn.rowid # Remove cache flag 2.649 - err "`ls $tmpd/$fn`" 2.650 + ## err "`ls $tmpd/$fn`" 2.651 echo $fn 2.652 done) 2.653 files="$files $fns" 2.654 ;; 2.655 esac 2.656 done < $1 2.657 - err FILES=$files "`ls -lF $tmpd`" 2.658 + ## err FILES=$files "`ls -lF $tmpd`" 2.659 subj="from ${REMOTE_ADDR}" 2.660 (echo "$url" 2.661 echo "への書き込みがありました。"