diff --git a/place/berlin.c b/place/berlin.c index 36e71ab..4a81b20 100644 --- a/place/berlin.c +++ b/place/berlin.c @@ -1,2 +1,4 @@ #define PLACE_HISTORY_EXPORT +#define PLACE_SCRATCHPAD +#define SECURE #include diff --git a/place/git.c b/place/git.c new file mode 100644 index 0000000..b3fb622 --- /dev/null +++ b/place/git.c @@ -0,0 +1,9 @@ +#include +#define NAME "git" + +//#ifdef BRAIN +# define REDIRECT "psyc://psyced.org/@PSYC" +//#endif + +#include // now generate the place according to the rules + diff --git a/world/default/de/html.textdb b/world/default/de/html.textdb index 432a5b2..addd971 100644 --- a/world/default/de/html.textdb +++ b/world/default/de/html.textdb @@ -722,6 +722,11 @@ _PAGES_help_settings |Mit "/set filter off" kann der private Firewall wieder abgeschaltet |werden. "default" geht auf die Voreinstellung zurück. | +| +|

/set loginhistory <Anzahl>

+|taugt zur Einschränkung wieviele Nachrichten aus der Historie vergangener +|öffentlicher Nachrichten beim Einloggvorgang dargestellt werden. +| | |

/set presencefilter [ on | off | all | automatic ]

|hilft die Menge an Anwesenheit- und Abwesenheitsbekundungen in Zaum zu diff --git a/world/default/en/html.textdb b/world/default/en/html.textdb index 11d9dc1..f5e33b8 100644 --- a/world/default/en/html.textdb +++ b/world/default/en/html.textdb @@ -203,6 +203,11 @@ _PAGES_help_display |wait to meet you in a room. "default" resets this value to |the local default. | +| +|

/set loginhistory <amount>

+|lets you define an upper limit in the number of history +|messages you want to see when logging into the server. +| | |{_HTML_info_split} |
diff --git a/world/net/irc/user.c b/world/net/irc/user.c index d8e0b1e..93909db 100644 --- a/world/net/irc/user.c +++ b/world/net/irc/user.c @@ -897,7 +897,7 @@ logon() { // version strings, only IRC makes it terribly complicated and // even political. oh of course, that's because on irc the server // admin isn't necessarily a person of your trusting. - w("_request_version", 0, 0, SERVER_UNIFORM); + w("_request_version"); //, 0, 0, SERVER_UNIFORM); # endif #endif return rc; diff --git a/world/net/library/profiles.html b/world/net/library/profiles.html index 6d5854c..e866dd2 100644 --- a/world/net/library/profiles.html +++ b/world/net/library/profiles.html @@ -24,6 +24,7 @@ _address_streetstreetstreetSTREETADR/STREETstreet _address_zone_timetimezoneTZTZ _affiliationaffiliationorg_nameORGNAMEORG/ORGNAMEo +_amount_history_loginloginhistory _character_actionactioncharacter _character_commandcommandcharacter _colorcolor diff --git a/world/net/library/profiles.i b/world/net/library/profiles.i index aa33926..2b358f4 100644 --- a/world/net/library/profiles.i +++ b/world/net/library/profiles.i @@ -166,6 +166,7 @@ volatile mapping psyc2set = ([ "_address_street" : "street", "_address_zone_time" : "timezone", "_affiliation" : "affiliation", + "_amount_history_login" : "loginhistory", "_character_action" : "actioncharacter", "_character_command" : "commandcharacter", "_color" : "color", @@ -288,6 +289,7 @@ volatile mapping set2psyc = ([ "street" : "_address_street", "timezone" : "_address_zone_time", "affiliation" : "_affiliation", + "loginhistory" : "_amount_history_login", "actioncharacter" : "_character_action", "commandcharacter" : "_character_command", "color" : "_color", diff --git a/world/net/library/profiles.pl b/world/net/library/profiles.pl index e3c977c..efe85b8 100644 --- a/world/net/library/profiles.pl +++ b/world/net/library/profiles.pl @@ -21,7 +21,7 @@ while () { $_ = $psyc = $1; $psyc{$psyc} = 1; next if /^_INTERNAL/; - s/_(address|contact|voice|scheme|source|flag|person|select)//g; + s/_(address|amount|contact|voice|scheme|source|flag|person|select)//g; s/_date/_day/g; s/_description/_text/g; s/_favorite/_fave/g; @@ -633,6 +633,9 @@ jProf places_lived PSYC _place_home set home +PSYC _amount_history_login +#set loginhistory + PSYC _flag_filter_strangers set filter diff --git a/world/net/user.c b/world/net/user.c index d0d9942..84f2e51 100644 --- a/world/net/user.c +++ b/world/net/user.c @@ -1724,7 +1724,8 @@ autojoin() { // says it, too. # endif teleport(v("place"), "_login", 0, 0, ([ "_amount_history": - _limit_amount_history_place_default ])); + v("loginhistory") ? to_int(v("loginhistory")) + : _limit_amount_history_place_default ])); # endif // subscriptions are stored in lowercase, warum auch immer if (sizeof(v("subscriptions"))) { diff --git a/world/net/usercmd.i b/world/net/usercmd.i index 839d18e..40991b0 100644 --- a/world/net/usercmd.i +++ b/world/net/usercmd.i @@ -2745,6 +2745,10 @@ checkVar(key, value) { if (value == "off" || value == "-") value = "-"; else if (value) value = "on"; break; + case "loginhistory": + // zero is an intentional value in this case + if (value == "0") break; + // fall through case "postalcode": // integer settings case "latitude": case "longitude":