Mercurial > hgrepos > hgweb.cgi > s4
changeset 549:2a48690b8cbc
Put $S4NAME in title
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Sun, 07 Apr 2019 08:52:41 +0900 |
parents | 1f7d6999ed4c |
children | fb9d684a93d9 |
files | examples/common/default/html.m4.html s4-funcs.sh scripts/add-group-csv.sh |
diffstat | 3 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/common/default/html.m4.html Sat Apr 06 21:34:53 2019 +0900 +++ b/examples/common/default/html.m4.html Sun Apr 07 08:52:41 2019 +0900 @@ -6,7 +6,7 @@ ifdef(`_S4COLOR_', `<meta name="theme-color" content="_S4COLOR_">', `<meta name="theme-color" content="#8ea">') -<title>_TITLE_</title> +<title>_TITLE_|ifdef(`_S4NAME_',_S4NAME,s4)</title> <link rel="stylesheet" type="text/css" href="templ/default/default.css"> ifdef(`_S4CSS_', `<link rel="stylesheet" type="text/css" href="_S4CSS_">
--- a/s4-funcs.sh Sat Apr 06 21:34:53 2019 +0900 +++ b/s4-funcs.sh Sun Apr 07 08:52:41 2019 +0900 @@ -383,8 +383,8 @@ logend } _m4() { - #_S4NAME_=f,f,f - m4 ${_S4NAME_:+"-D_S4NAME_=${_S4NAME_}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} "$@" + #S4NAME=f,f,f + m4 ${_S4NAME_:+"-D_S4NAME_=${S4NAME}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} "$@" } ismember() { # $1=user, $2=group @@ -1842,7 +1842,7 @@ tf=$tmpd/title.$$ pf=$tmpd/profile.$$ bf=$tmpd/blogs.$$ sf=$tmpd/search.$$ search_form "$search_form_args" > $sf - echo "$gecos さん" > $tf + printf "%s さん" "$gecos" > $tf { echo "<div class=\"noprofimg\">" viewtable $formdir/user.def user $1 echo "</div>"
--- a/scripts/add-group-csv.sh Sat Apr 06 21:34:53 2019 +0900 +++ b/scripts/add-group-csv.sh Sun Apr 07 08:52:41 2019 +0900 @@ -21,6 +21,17 @@ .mode csv CREATE TEMPORARY TABLE _gusers(gname, user, admin); .import $target _gusers - REPLACE INTO grp SELECT * FROM _gusers; - REPLACE INTO grp_adm SELECT * FROM _gusers WHERE admin LIKE 'admin'; + REPLACE INTO grp SELECT distinct gname FROM _gusers; + + CREATE TEMPORARY TABLE _default_grp_attr(key, val); + INSERT INTO _default_grp_attr + VALUES ('tag', 'lecture'), ('mtime', datetime('now', 'localtime')); + + REPLACE INTO grp_s + SELECT gname, key, 'string', val, NULL + FROM (SELECT distinct gname FROM _gusers) + JOIN _default_grp_attr; + REPLACE INTO grp_mem SELECT gname, user FROM _gusers; + REPLACE INTO grp_adm SELECT gname, user + FROM _gusers WHERE admin LIKE 'admin'; EOF