Mercurial > hgrepos > hgweb.cgi > s4
diff s4-blog.sh @ 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 | 1ec02d6f9bf3 |
| children | fdc8008c236c |
line wrap: on
line diff
--- a/s4-blog.sh Fri Jan 22 18:41:52 2016 +0859 +++ b/s4-blog.sh Fri Jan 29 10:53:49 2016 +0859 @@ -34,8 +34,9 @@ no) return ;; *) emails=`collectemail $blogowner` ;; esac -err notify: user=$user Admins=`getgroupadmins $blogowner` Mode=$mode Emails="[$emails]" - smail "$emails" "${action}通知 $urlbase"<<EOF + err notify: user=$user Admins=`getgroupadmins $blogowner` Mode=$mode Emails="[$emails]" + SMAIL_TO="$blogowner readers <$admin>" \ + smail "$emails" "${action}通知 $urlbase"<<EOF [$blogtitle]板に${action}がありました。 場所: $blogurl 題目: $blogtitle @@ -574,6 +575,10 @@ if [ -z "$kwd" ]; then echo "検索語を指定してください" | html p; return fi + for k in `echo "$kwd" | sed "s/'/''/g"`; do + kc=$kc${kc:+" AND "}"s.val LIKE '%$k%'" + done + kwd=`echo "$kwd"|htmlescape` owner=`getpar owner` owner=${owner:-$1} echo "「$kwd」による検索結果" | html p @@ -598,7 +603,7 @@ on blog.id=bs.id and bs.key='title') b join (select a.id,a.blogid,s.val from article a join article_s s - on a.id=s.id where s.val like '%$kwd%') + on a.id=s.id where $kc) x on b.id=x.blogid where b.id in (select id from blog_s $cond);"
