diff --git a/html.c b/html.c index 5543a2d..d808e3b 100644 --- a/html.c +++ b/html.c @@ -325,8 +325,8 @@ d_char *html_user_header(snac *snac, d_char *s, int local) s1 = xs_fmt( "%s - " "%s\n", - snac->actor, L("RSS"), - snac->actor, L("private")); + snac->uid, L("RSS"), + snac->uid, L("private")); else { xs *n_list = notify_list(snac, 1); int n_len = xs_list_len(n_list); @@ -340,18 +340,17 @@ d_char *html_user_header(snac *snac, d_char *s, int local) n_str = xs_str_new(""); s1 = xs_fmt( - "%s - " - "%s - " - "%s%s - " - "%s - " - "%s" - "\n", - snac->actor, L("public"), - snac->actor, L("private"), - snac->actor, L("notifications"), n_str, - snac->actor, L("people"), - snac->actor, L("settings") - ); + "%s - " + "%s - " + "%s%s - " + "%s\n" + "%s" + "" + snac->uid, L("public"), + L("private"), + L("notifications"), n_str, + L("people"), + L("settings")); } s = xs_str_cat(s, s1); @@ -398,7 +397,7 @@ xs_str *html_top_controls(snac *snac, xs_str *s, int settings) "
\n" "
%s\n" "
\n" + "action=\"admin/note\" enctype=\"multipart/form-data\">\n" "\n" "\n" @@ -435,12 +434,12 @@ xs_str *html_top_controls(snac *snac, xs_str *s, int settings) "
\n" "

%s\n" - "\n" /** follow **/ + "\n" /** follow **/ "\n" " %s\n" "

\n" - "

\n" /** boost **/ + "\n" /** boost **/ "\n" " %s\n" "

\n" @@ -453,7 +452,7 @@ xs_str *html_top_controls(snac *snac, xs_str *s, int settings) "

\n" /** user setup **/ "
\n" + "action=\"admin/user-setup\" enctype=\"multipart/form-data\">\n" "

%s:
\n" "

\n" @@ -538,7 +537,6 @@ xs_str *html_top_controls(snac *snac, xs_str *s, int settings) xs *s1 = xs_fmt(_tmpl, settings ? "style=\"display: none\"" : "", L("New Post..."), - snac->actor, L("Sensitive content"), L("Sensitive content description"), L("Only for mentioned people"), @@ -560,16 +558,12 @@ xs_str *html_top_controls(snac *snac, xs_str *s, int settings) settings ? "style=\"display: none\"" : "", L("Operations..."), - snac->actor, L("Follow"), L("(by URL or user@host)"), - - snac->actor, L("Boost"), L("(by URL)"), !settings ? "style=\"display: none\"" : "", L("User Settings"), - snac->actor, L("Display name"), es1, L("Avatar"), @@ -673,13 +667,13 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch { xs *s1 = xs_fmt( - "\n" + "\n" "\n" "\n" "\n" "\n", - snac->actor, id, actor, md5 + id, actor, md5 ); s = xs_str_cat(s, s1); @@ -733,7 +727,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch xs *s1 = xs_fmt( "

%s\n" "

\n" - "\n" "\n" @@ -784,7 +778,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch xs *s1 = xs_fmt( "

%s\n" "

\n" - "\n" "\n" @@ -807,7 +801,7 @@ xs_str *html_entry_controls(snac *snac, xs_str *os, const xs_dict *msg, const ch L("Reply..."), md5, - snac->actor, md5, + md5, ct, id, L("Sensitive content"), @@ -1102,10 +1096,10 @@ xs_str *html_entry(snac *snac, xs_str *os, const xs_dict *msg, int local, /* poll still active */ xs *s1 = xs_fmt("
\n" "\n" + "method=\"post\" action=\"admin/vote\">\n" "\n" "\n", - snac->actor, actor, id); + actor, id); while (xs_list_iter(&p, &v)) { const char *name = xs_dict_get(v, "name"); @@ -1495,11 +1489,11 @@ d_char *html_people_list(snac *snac, d_char *os, d_char *list, const char *heade s = xs_str_cat(s, "
\n"); xs *s1 = xs_fmt( - "

\n" + "

\n" "\n" "\n", - snac->actor, actor_id + actor_id ); s = xs_str_cat(s, s1); @@ -1523,7 +1517,7 @@ d_char *html_people_list(snac *snac, d_char *os, d_char *list, const char *heade xs *s2 = xs_fmt( "

%s\n" "

\n" - "\n" "\n" @@ -1535,7 +1529,7 @@ d_char *html_people_list(snac *snac, d_char *os, d_char *list, const char *heade L("Direct Message..."), md5, t, - snac->actor, md5, + md5, actor_id, L("Post") ); @@ -1586,9 +1580,9 @@ xs_str *html_notifications(snac *snac) xs *s1 = xs_fmt( "\n" + "method=\"post\" action=\"admin/clear-notifications\" id=\"clear\">\n" "\n" - "

\n", snac->actor, L("Clear all")); + "

\n", L("Clear all")); s = xs_str_cat(s, s1); while (xs_list_iter(&p, &v)) { @@ -2402,7 +2396,7 @@ int html_post_handler(const xs_dict *req, const char *q_path, if (xs_is_null(redir)) redir = "snac-posts"; - *body = xs_fmt("%s/admin#%s", snac.actor, redir); + *body = xs_fmt("../admin#%s", redir); *b_size = strlen(*body); } diff --git a/httpd.c b/httpd.c index 9aac3b5..1d2200e 100644 --- a/httpd.c +++ b/httpd.c @@ -91,7 +91,7 @@ int server_get_handler(xs_dict *req, char *q_path, if (user_open(&snac, uid)) { xs *u = xs_fmt( "

  • @%s@%s (%s)
  • \n", - snac.actor, uid, host, + uid, uid, host, xs_dict_get(snac.config, "name")); ul = xs_str_cat(ul, u);