s4

changeset 165:4040bb8b2038

quote search kwd. $SMAIL_TO controls To: header value.
author HIROSE Yuuji <yuuji@gentei.org>
date Fri, 29 Jan 2016 10:53:49 +0859
parents 0cc22764899e
children 32557aa9af94
files s4-blog.sh
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/s4-blog.sh	Fri Jan 22 18:41:52 2016 +0859
     1.2 +++ b/s4-blog.sh	Fri Jan 29 10:53:49 2016 +0859
     1.3 @@ -34,8 +34,9 @@
     1.4      no)		return ;;
     1.5      *)		emails=`collectemail $blogowner` ;;
     1.6    esac
     1.7 -err notify: user=$user Admins=`getgroupadmins $blogowner` Mode=$mode Emails="[$emails]"
     1.8 -  smail "$emails" "${action}通知 $urlbase"<<EOF
     1.9 +  err notify: user=$user Admins=`getgroupadmins $blogowner` Mode=$mode Emails="[$emails]"
    1.10 +  SMAIL_TO="$blogowner readers <$admin>" \
    1.11 +	  smail "$emails" "${action}通知 $urlbase"<<EOF
    1.12  [$blogtitle]板に${action}がありました。
    1.13  場所: $blogurl
    1.14  題目: $blogtitle
    1.15 @@ -574,6 +575,10 @@
    1.16    if [ -z "$kwd" ]; then
    1.17      echo "検索語を指定してください" | html p; return
    1.18    fi
    1.19 +  for k in `echo "$kwd" | sed "s/'/''/g"`; do
    1.20 +    kc=$kc${kc:+" AND "}"s.val LIKE '%$k%'"
    1.21 +  done
    1.22 +  kwd=`echo "$kwd"|htmlescape`
    1.23    owner=`getpar owner`
    1.24    owner=${owner:-$1}
    1.25    echo "「$kwd」による検索結果" | html p
    1.26 @@ -598,7 +603,7 @@
    1.27  		on blog.id=bs.id and bs.key='title') b
    1.28  	  join
    1.29  	    (select a.id,a.blogid,s.val from article a join article_s s
    1.30 -		 on a.id=s.id where s.val like '%$kwd%')
    1.31 +		 on a.id=s.id where $kc)
    1.32  	     x on b.id=x.blogid
    1.33  	 where b.id in (select id from blog_s
    1.34  	$cond);"