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 diff
1.1 --- a/examples/common/default/html.m4.html Sat Apr 06 21:34:53 2019 +0900 1.2 +++ b/examples/common/default/html.m4.html Sun Apr 07 08:52:41 2019 +0900 1.3 @@ -6,7 +6,7 @@ 1.4 ifdef(`_S4COLOR_', 1.5 `<meta name="theme-color" content="_S4COLOR_">', 1.6 `<meta name="theme-color" content="#8ea">') 1.7 -<title>_TITLE_</title> 1.8 +<title>_TITLE_|ifdef(`_S4NAME_',_S4NAME,s4)</title> 1.9 <link rel="stylesheet" type="text/css" href="templ/default/default.css"> 1.10 ifdef(`_S4CSS_', 1.11 `<link rel="stylesheet" type="text/css" href="_S4CSS_">
2.1 --- a/s4-funcs.sh Sat Apr 06 21:34:53 2019 +0900 2.2 +++ b/s4-funcs.sh Sun Apr 07 08:52:41 2019 +0900 2.3 @@ -383,8 +383,8 @@ 2.4 logend 2.5 } 2.6 _m4() { 2.7 - #_S4NAME_=f,f,f 2.8 - m4 ${_S4NAME_:+"-D_S4NAME_=${_S4NAME_}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} "$@" 2.9 + #S4NAME=f,f,f 2.10 + m4 ${_S4NAME_:+"-D_S4NAME_=${S4NAME}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} "$@" 2.11 } 2.12 ismember() { 2.13 # $1=user, $2=group 2.14 @@ -1842,7 +1842,7 @@ 2.15 2.16 tf=$tmpd/title.$$ pf=$tmpd/profile.$$ bf=$tmpd/blogs.$$ sf=$tmpd/search.$$ 2.17 search_form "$search_form_args" > $sf 2.18 - echo "$gecos さん" > $tf 2.19 + printf "%s さん" "$gecos" > $tf 2.20 { echo "<div class=\"noprofimg\">" 2.21 viewtable $formdir/user.def user $1 2.22 echo "</div>"
3.1 --- a/scripts/add-group-csv.sh Sat Apr 06 21:34:53 2019 +0900 3.2 +++ b/scripts/add-group-csv.sh Sun Apr 07 08:52:41 2019 +0900 3.3 @@ -21,6 +21,17 @@ 3.4 .mode csv 3.5 CREATE TEMPORARY TABLE _gusers(gname, user, admin); 3.6 .import $target _gusers 3.7 - REPLACE INTO grp SELECT * FROM _gusers; 3.8 - REPLACE INTO grp_adm SELECT * FROM _gusers WHERE admin LIKE 'admin'; 3.9 + REPLACE INTO grp SELECT distinct gname FROM _gusers; 3.10 + 3.11 + CREATE TEMPORARY TABLE _default_grp_attr(key, val); 3.12 + INSERT INTO _default_grp_attr 3.13 + VALUES ('tag', 'lecture'), ('mtime', datetime('now', 'localtime')); 3.14 + 3.15 + REPLACE INTO grp_s 3.16 + SELECT gname, key, 'string', val, NULL 3.17 + FROM (SELECT distinct gname FROM _gusers) 3.18 + JOIN _default_grp_attr; 3.19 + REPLACE INTO grp_mem SELECT gname, user FROM _gusers; 3.20 + REPLACE INTO grp_adm SELECT gname, user 3.21 + FROM _gusers WHERE admin LIKE 'admin'; 3.22 EOF