mirror of
git://git.psyced.org/git/psyced
synced 2024-08-15 03:25:10 +00:00
DEFAULT_HT_LOGO
This commit is contained in:
parent
0a7f208a72
commit
e45a2b4ef0
2 changed files with 10 additions and 3 deletions
|
@ -18,6 +18,9 @@
|
||||||
#include <status.h>
|
#include <status.h>
|
||||||
#include <uniform.h>
|
#include <uniform.h>
|
||||||
|
|
||||||
|
#ifndef DEFAULT_HT_LOGO
|
||||||
|
# define DEFAULT_HT_LOGO "/img/psyc.gif"
|
||||||
|
#endif
|
||||||
#ifndef HT_LOGO
|
#ifndef HT_LOGO
|
||||||
# define HT_LOGO DEFAULT_HT_LOGO
|
# define HT_LOGO DEFAULT_HT_LOGO
|
||||||
#endif
|
#endif
|
||||||
|
@ -624,6 +627,7 @@ htget(prot, query, headers, qs) {
|
||||||
|
|
||||||
// maybe this all belongs into archetype.gen.. chesmo!
|
// maybe this all belongs into archetype.gen.. chesmo!
|
||||||
htget(prot, query, headers, qs, data, noprocess) {
|
htget(prot, query, headers, qs, data, noprocess) {
|
||||||
|
PT(("%O place.gen::htget\n", ME))
|
||||||
if (probably_private(this_interactive()) <= PRIVACY_SURVEILLED) {
|
if (probably_private(this_interactive()) <= PRIVACY_SURVEILLED) {
|
||||||
hterror(prot, R_PAYMENTREQ, "To protect against abuse in this nasty world this function needs 'https' instead of 'http'.");
|
hterror(prot, R_PAYMENTREQ, "To protect against abuse in this nasty world this function needs 'https' instead of 'http'.");
|
||||||
htnotify(query, headers, "_challenge_disabled_encryption",
|
htnotify(query, headers, "_challenge_disabled_encryption",
|
||||||
|
@ -651,12 +655,14 @@ htget(prot, query, headers, qs, data, noprocess) {
|
||||||
htnotify(query, headers, "_challenge_accomplished_web",
|
htnotify(query, headers, "_challenge_accomplished_web",
|
||||||
"Challenge accomplished in [_nick_place] by [_web_on] coming from [_web_from].");
|
"Challenge accomplished in [_nick_place] by [_web_on] coming from [_web_from].");
|
||||||
# ifdef CHALLENGE_REDIRECT
|
# ifdef CHALLENGE_REDIRECT
|
||||||
|
sTextPath(query["layout"], query["lang"], "html");
|
||||||
# ifdef CHALLENGE_REDIRECT_TITLE
|
# ifdef CHALLENGE_REDIRECT_TITLE
|
||||||
# ifdef CHALLENGE_QUESTION
|
# ifdef CHALLENGE_QUESTION
|
||||||
htok3(prot, 0, "Set-Cookie: psycplace=\"challenge=done\"; Path="+ item +"; Secure; Max-Age=9\n");
|
htok3(prot, 0, "Set-Cookie: psycplace=\"challenge=done\"; Path="+ item +"; Secure; Max-Age=9\n");
|
||||||
# else
|
# else
|
||||||
htok();
|
htok();
|
||||||
# endif
|
# endif
|
||||||
|
// you can output a player iframe instead of a redirect...
|
||||||
w("_PAGES_frame_redirect", 0,
|
w("_PAGES_frame_redirect", 0,
|
||||||
([ "_uniform_page" : CHALLENGE_REDIRECT,
|
([ "_uniform_page" : CHALLENGE_REDIRECT,
|
||||||
"_title_page" : CHALLENGE_REDIRECT_TITLE,
|
"_title_page" : CHALLENGE_REDIRECT_TITLE,
|
||||||
|
@ -667,7 +673,6 @@ htget(prot, query, headers, qs, data, noprocess) {
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# ifdef HTGET
|
# ifdef HTGET
|
||||||
// you may want to output a player iframe instead of a redirect...
|
|
||||||
return HTGET;
|
return HTGET;
|
||||||
# else
|
# else
|
||||||
return ::htget(prot, query, headers, qs, data, noprocess);
|
return ::htget(prot, query, headers, qs, data, noprocess);
|
||||||
|
@ -723,7 +728,7 @@ htget(prot, query, headers, qs, data, noprocess) {
|
||||||
// url that allows other people to bypass the challenge.
|
// url that allows other people to bypass the challenge.
|
||||||
htok3(prot, 0, "Set-Cookie: psycplace=\"challenge=given\"; Path="+ item +"; Secure; Max-Age=999\n");
|
htok3(prot, 0, "Set-Cookie: psycplace=\"challenge=given\"; Path="+ item +"; Secure; Max-Age=999\n");
|
||||||
# ifndef CHALLENGE_REDIRECT_TITLE
|
# ifndef CHALLENGE_REDIRECT_TITLE
|
||||||
# define CHALLENGE_REDIRECT_TITLE "Challenge for " MYNICK
|
# define CHALLENGE_REDIRECT_TITLE "Challenge for "+ MYNICK
|
||||||
# endif
|
# endif
|
||||||
w("_PAGES_group_challenge", 0,
|
w("_PAGES_group_challenge", 0,
|
||||||
([ "_challenge" : htquote(CHALLENGE_QUESTION),
|
([ "_challenge" : htquote(CHALLENGE_QUESTION),
|
||||||
|
|
|
@ -474,7 +474,7 @@ _request_set_topic(source, mc, data, vars, b) {
|
||||||
|
|
||||||
#if HAS_PORT(HTTP_PORT, HTTP_PATH) || HAS_PORT(HTTPS_PORT, HTTP_PATH)
|
#if HAS_PORT(HTTP_PORT, HTTP_PATH) || HAS_PORT(HTTPS_PORT, HTTP_PATH)
|
||||||
// for GDPR compliance server owners are expected not to log these messages
|
// for GDPR compliance server owners are expected not to log these messages
|
||||||
htnotify(query, headers, mc, fmt, acct) {
|
htnotify(query, headers, mc, fmt, acct, qs) {
|
||||||
if (query["from"] == "") query["from"] = 0;
|
if (query["from"] == "") query["from"] = 0;
|
||||||
if (query["location"] == "") query["location"] = 0;
|
if (query["location"] == "") query["location"] = 0;
|
||||||
|
|
||||||
|
@ -490,6 +490,8 @@ htnotify(query, headers, mc, fmt, acct) {
|
||||||
query_ip_name(this_interactive()) ||
|
query_ip_name(this_interactive()) ||
|
||||||
headers["user-agent"] || "http",
|
headers["user-agent"] || "http",
|
||||||
"_host_name" : query_ip_name(this_interactive()) || "",
|
"_host_name" : query_ip_name(this_interactive()) || "",
|
||||||
|
// so far used by 'rating' only
|
||||||
|
"_parameters" : query["parameters"] || qs,
|
||||||
"_nick_place" : MYNICK || "This place",
|
"_nick_place" : MYNICK || "This place",
|
||||||
]) );
|
]) );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue