s4

changeset 288:d50996dc2664

Function `grpaction' should be provided with moderated/ismember class
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 18 Aug 2016 19:04:15 +0859
parents 422270e94adc
children af84e8da1008
files s4-blog.sh s4-funcs.sh
diffstat 2 files changed, 24 insertions(+), 12 deletions(-) [+]
line diff
     1.1 --- a/s4-blog.sh	Mon Aug 15 13:45:59 2016 +0859
     1.2 +++ b/s4-blog.sh	Thu Aug 18 19:04:15 2016 +0859
     1.3 @@ -587,17 +587,7 @@
     1.4  		 WHERE id=(SELECT id FROM blog WHERE rowid=$rowid)
     1.5  		       AND key='team';
     1.6  	 \"|htmlescape`"
     1.7 -    qgrp=`sqlquote "$owner"`
     1.8 -    sql="SELECT coalesce(
     1.9 -	   (SELECT val FROM grp_s WHERE gname=$qgrp AND key='regmode'),
    1.10 -	   'open')
    1.11 -         ||
    1.12 -	   CASE WHEN '$user'
    1.13 -	     	      IN (SELECT user FROM grp_mem WHERE gname=$qgrp)
    1.14 -	        THEN ' ismember'
    1.15 -	        ELSE ''
    1.16 -	   END"
    1.17 -    memclass=`query "$sql;"`
    1.18 +    memclass=`grp_getbodyclass "$owner"`
    1.19    fi
    1.20    if [ -z "$title" ]; then
    1.21      echo "日記番号指定が無効です。" | html p
     2.1 --- a/s4-funcs.sh	Mon Aug 15 13:45:59 2016 +0859
     2.2 +++ b/s4-funcs.sh	Thu Aug 18 19:04:15 2016 +0859
     2.3 @@ -1931,6 +1931,26 @@
     2.4      echo '</table></div>'
     2.5    fi
     2.6  }
     2.7 +grp_getbodyclass() {
     2.8 +  # Get css class name for document.
     2.9 +  # `moderated' for moderated groups
    2.10 +  # `ismember'  for groups where user belongs
    2.11 +  # $1=GroupName (w/o quote)
    2.12 +  # $user=userNameCurrentlyLogin
    2.13 +  err grp_getbodyclass: 1="$1"
    2.14 +  qgrp=`sqlquote "$1"`
    2.15 +  query<<-EOF
    2.16 +	SELECT coalesce(
    2.17 +	   (SELECT val FROM grp_s WHERE gname=$qgrp AND key='regmode'),
    2.18 +	   'open')
    2.19 +	 ||
    2.20 +	   CASE WHEN '$user'
    2.21 +	     	      IN (SELECT user FROM grp_mem WHERE gname=$qgrp)
    2.22 +	        THEN ' ismember'
    2.23 +	        ELSE ''
    2.24 +	   END;
    2.25 +	EOF
    2.26 +}
    2.27  grpaction() {			# $1=group-rowid
    2.28    err GRP_ACTION:IN
    2.29    grid=${1:-`getpar grp`}
    2.30 @@ -1942,7 +1962,9 @@
    2.31      echo "加入者のみに許可された操作です。" | html p; return
    2.32    fi
    2.33    echo "グループ $grp 個別選択操作" \
    2.34 -      | _m4 -D_TITLE_="syscmd(\`cat')" $layout/html.m4.html
    2.35 +      | _m4 -D_TITLE_="syscmd(\`cat')" \
    2.36 +	    -D_BODYCLASS_="`grp_getbodyclass \"$grp\"`" \
    2.37 +	    $layout/html.m4.html
    2.38  
    2.39    isowner=""
    2.40    isgrpowner "$user" "$grp" && isowner="yes"