# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1476494736 -32374
# Node ID 827dd5d8653e581ca32498984af9c0ab4e51d491
# Parent  e751156de7401ab986c24b8cede7c02f73151847
Set admin value to $5 when $4 is empty(in joingrp())

diff -r e751156de740 -r 827dd5d8653e s4-funcs.sh
--- a/s4-funcs.sh	Sat Oct 15 10:17:15 2016 +0859
+++ b/s4-funcs.sh	Sat Oct 15 10:25:10 2016 +0859
@@ -2550,25 +2550,25 @@
 		'string', '$4', NULL);"
 	query "replace into grp_mem_s values($qgname, '$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=$qgname)=1\
-		 then (select user from grp_mem\
-			 where gname=$qgname and user='$user')\
-		 else '' end;"
-	  err NewGrpChk: $sql
-	  if [ -n "`query \"$sql\"`" ]; then
-	    err ADMIN: "replace into grp_adm values($qgname, '$user');"
-	    query "replace into grp_adm values($qgname, '$user');"
-	  fi
-	fi
       else
 	echo $msg
       fi
     else
       query "delete from grp_mem_s $cond and key='email';"
     fi
+    if [ -n "$5" ]; then	# as ADMIN
+      # Coming here means newly created group
+      sql="select case\
+      	when (select count(*) from grp_mem where gname=$qgname)=1\
+	then (select user from grp_mem\
+	where gname=$qgname and user='$user')\
+	else '' end;	   "
+      err NewGrpChk: $sql
+      if [ -n "`query \"$sql\"`" ]; then
+	err ADMIN: "replace into grp_adm values($qgname, '$user');"
+	query "replace into grp_adm values($qgname, '$user');"
+      fi
+    fi
   else
     query "delete from grp_mem $cond;
 delete from grp_mem_s $cond;