1.1 --- a/s4-blog.sh	Sat Jun 06 16:56:02 2020 +0900
     1.2 +++ b/s4-blog.sh	Sat Jun 06 16:58:53 2020 +0900
     1.3 @@ -1058,15 +1058,16 @@
     1.4    kwd=`echo "$kwd"|htmlescape`
     1.5    owner=`getpar owner`
     1.6    owner=${owner:-$1}
     1.7 +  grid=`getpar grid`
     1.8    msg=""
     1.9 -  if [ -n "$owner" ]; then
    1.10 +  if [ -n "$grid" ]; then
    1.11 +    grp=`getgroupbyid "$grid"`
    1.12 +    qgrp=`sqlquote "$grp"`
    1.13 +    cond="WHERE key='owner' AND val=$qgrp"
    1.14 +    msg="(`linkhome $grid` グループから)"
    1.15 +  elif [ -n "$owner" ]; then
    1.16      cond="where key='owner' and val='$owner'"
    1.17 -    if isuser $owner; then
    1.18 -      msg="(`linkhome $owner` さんの記録から)"
    1.19 -    else
    1.20 -      linkhome $owner 1>&3
    1.21 -      msg="(`linkhome $owner` グループから)"
    1.22 -    fi
    1.23 +    msg="(`linkhome $owner` さんの記録から)"
    1.24    elif { author=`getpar author`; test -n "$author"; }; then
    1.25      atptn=`sqlquotestr $author`
    1.26      #kc="$kc${kc:+ AND }author=$atptn"

     2.1 --- a/s4-funcs.sh	Sat Jun 06 16:56:02 2020 +0900
     2.2 +++ b/s4-funcs.sh	Sat Jun 06 16:58:53 2020 +0900
     2.3 @@ -535,15 +535,18 @@
     2.4    [ -n "`query $sql`" ] || return 2
     2.5  }
     2.6  linkhome() {
     2.7 -  # $1=UserOrGroup
     2.8 -  echo -n '<a href="?'
     2.9 +  # $1=UserOrGroupRowid
    2.10 +  echo -n "<a href=\"$myname?"
    2.11    if isuser $1; then
    2.12      err "select 'home+'||rowid from user where name='$1';"
    2.13      query "select 'home+'||rowid from user where name='$1';"
    2.14 +    name=`gecos $1|htmlescape`
    2.15    else
    2.16 +    _grid=`numericalize "$1"`
    2.17      echo -n "grp+$1"
    2.18 +    name=`query "SELECT gname FROM grp WHERE rowid=$_grid;"|htmlescape`
    2.19    fi
    2.20 -  echo  "\">`gecos $1`</a>"
    2.21 +  echo  "\">$name</a>"
    2.22  }
    2.23  hreflink() {
    2.24    # s4 specific notation:
    2.25 @@ -1917,7 +1920,7 @@
    2.26  }
    2.27  
    2.28  search_form() {
    2.29 -  # $1		 = { author=<AUTHOR> | grp=<GROUP> }
    2.30 +  # $1		 = { author=<AUTHOR> | grid=<GroupRowid> }
    2.31    # $2(optional) = pre-input keywords
    2.32    help="(1)空白区切りの単語で本文検索
    2.33  (2)@YYYY-MM-DD 日付け(シェルパターン可)で日付け検索
    2.34 @@ -1939,9 +1942,9 @@
    2.35        placeholder="このユーザの書込検索"
    2.36        help="★★ $g さんの書き込みから検索します$nl$help"
    2.37        ;;
    2.38 -    grp=*)
    2.39 -      a=`echo "${1#grp=}"`	# group name cannot have quoting marks
    2.40 -      auth="<input type=\"hidden\" name=\"owner\" value=\"$a\">"
    2.41 +    grid=*)
    2.42 +      a=`echo "${1#grid=}"`; a=$((0 + $a))
    2.43 +      auth="<input type=\"hidden\" name=\"grid\" value=\"$a\">"
    2.44        placeholder="このグループからの検索"
    2.45        ;;
    2.46    esac
    2.47 @@ -2522,7 +2525,7 @@
    2.48        ismember="" # bodyclass="group"
    2.49      fi
    2.50      bodyclass="$bodyclass grouphome"
    2.51 -    echo "<div class=\"search\">`search_form grp=\"$grp\"`</div>"> $sf
    2.52 +    echo "<div class=\"search\">`search_form grid=\"$grid\"`</div>"> $sf
    2.53      echo "グループ $htmlgrp" > $tf
    2.54  
    2.55      showgroupsub $formdir/grp.def "$grid" | \