s4

changeset 306:827dd5d8653e

Set admin value to $5 when $4 is empty(in joingrp())
author HIROSE Yuuji <yuuji@gentei.org>
date Sat, 15 Oct 2016 10:25:10 +0859
parents e751156de740
children e7a7f6cb9627
files s4-funcs.sh
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line diff
     1.1 --- a/s4-funcs.sh	Sat Oct 15 10:17:15 2016 +0859
     1.2 +++ b/s4-funcs.sh	Sat Oct 15 10:25:10 2016 +0859
     1.3 @@ -2550,25 +2550,25 @@
     1.4  		'string', '$4', NULL);"
     1.5  	query "replace into grp_mem_s values($qgname, '$user', 'email', \
     1.6  		'string', '$4', NULL);"
     1.7 -	if [ -n "$5" ]; then	# as ADMIN
     1.8 -	  # Coming here means newly created group
     1.9 -	  sql="select case\
    1.10 -		 when (select count(*) from grp_mem where gname=$qgname)=1\
    1.11 -		 then (select user from grp_mem\
    1.12 -			 where gname=$qgname and user='$user')\
    1.13 -		 else '' end;"
    1.14 -	  err NewGrpChk: $sql
    1.15 -	  if [ -n "`query \"$sql\"`" ]; then
    1.16 -	    err ADMIN: "replace into grp_adm values($qgname, '$user');"
    1.17 -	    query "replace into grp_adm values($qgname, '$user');"
    1.18 -	  fi
    1.19 -	fi
    1.20        else
    1.21  	echo $msg
    1.22        fi
    1.23      else
    1.24        query "delete from grp_mem_s $cond and key='email';"
    1.25      fi
    1.26 +    if [ -n "$5" ]; then	# as ADMIN
    1.27 +      # Coming here means newly created group
    1.28 +      sql="select case\
    1.29 +      	when (select count(*) from grp_mem where gname=$qgname)=1\
    1.30 +	then (select user from grp_mem\
    1.31 +	where gname=$qgname and user='$user')\
    1.32 +	else '' end;	   "
    1.33 +      err NewGrpChk: $sql
    1.34 +      if [ -n "`query \"$sql\"`" ]; then
    1.35 +	err ADMIN: "replace into grp_adm values($qgname, '$user');"
    1.36 +	query "replace into grp_adm values($qgname, '$user');"
    1.37 +      fi
    1.38 +    fi
    1.39    else
    1.40      query "delete from grp_mem $cond;
    1.41  delete from grp_mem_s $cond;