diff options
-rw-r--r-- | CMakeLists.txt | 11 | ||||
-rw-r--r-- | data/chanserv.example.conf | 7 | ||||
-rw-r--r-- | docs/Changes | 2 | ||||
-rw-r--r-- | include/version.cpp | 2 | ||||
-rw-r--r-- | language/anope.nl_NL.po | 373 | ||||
-rw-r--r-- | modules/commands/cs_ban.cpp | 14 | ||||
-rw-r--r-- | modules/commands/cs_kick.cpp | 14 | ||||
-rw-r--r-- | modules/extra/m_ldap_oper.cpp | 28 | ||||
-rw-r--r-- | modules/m_xmlrpc.cpp | 2 | ||||
-rw-r--r-- | modules/protocol/inspircd20.cpp | 50 | ||||
-rw-r--r-- | src/version.sh | 2 |
11 files changed, 289 insertions, 216 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 94331ef22..e1f2bf882 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,9 @@ if(COMMAND cmake_policy) if(POLICY CMP0026) cmake_policy(SET CMP0026 OLD) endif(POLICY CMP0026) + if(POLICY CMP0007) + cmake_policy(SET CMP0007 OLD) + endif(POLICY CMP0007) endif(COMMAND cmake_policy) # If the Source dir and the Binary dir are the same, we are building in-source, which we will disallow due to Autotools being there (but only on non-Windows) @@ -412,9 +415,13 @@ read_from_file(${Anope_SOURCE_DIR}/src/version.sh "^VERSION_" VERSIONS) # Iterate through the strings found foreach(VERSION_STR ${VERSIONS}) string(REGEX REPLACE "^VERSION_([A-Z]+)=\"?([^\"]*)\"?$" "\\1;\\2" VERSION_OUT ${VERSION_STR}) + # Depends on CMP0007 OLD + list(LENGTH VERSION_OUT VERSION_LEN) list(GET VERSION_OUT 0 VERSION_TYPE) - list(GET VERSION_OUT 1 VERSION_DATA) - set(VERSION_${VERSION_TYPE} ${VERSION_DATA}) + if(${VERSION_LEN} GREATER 1) + list(GET VERSION_OUT 1 VERSION_DATA) + set(VERSION_${VERSION_TYPE} ${VERSION_DATA}) + endif(${VERSION_LEN} GREATER 1) endforeach(VERSION_STR ${VERSIONS}) # Default build version to 0 diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf index 0ad131482..3d0e96871 100644 --- a/data/chanserv.example.conf +++ b/data/chanserv.example.conf @@ -152,6 +152,13 @@ module reasonmax = 200 /* + * The message formatting to use for signed kick messages. + * %n is the nick of the kicker + * %m is the message specified + */ + signkickformat = "%m (%n)" + + /* * If set, prevents channel access entries from containing hostmasks. */ disallow_hostmask_access = false diff --git a/docs/Changes b/docs/Changes index ea29a58db..fae8b2da9 100644 --- a/docs/Changes +++ b/docs/Changes @@ -11,7 +11,7 @@ Allow users with topic change privilege to change the topic instead of requiring Fix negatively locking param modes in default mlock Change entrymsg to check for the SET privilege, not real founder Allow configuring characters allowed in nicknames -Fix crash when non users register channels externally (like XMLRPC0 +Fix crash when non users register channels externally (like XMLRPC) Remove operserv/exception MOVE, it did not function correctly. Instead reorder the list by deleting/adding entries. Allow flood ttb to be 0. Enforce mlock when disabling defcon modes diff --git a/include/version.cpp b/include/version.cpp index 22921202b..f6feb3354 100644 --- a/include/version.cpp +++ b/include/version.cpp @@ -108,7 +108,7 @@ static bool write_build_h(const std::string &buildh, const std::string &git_vers fd << "/* This file is automatically generated by version.cpp - do not edit it! */" << std::endl; fd << build << std::endl; if (!git_version.empty()) - fd << "#define GIT_VERSION \"" << git_version << "\"" << std::endl; + fd << "#define VERSION_GIT \"" << git_version << "\"" << std::endl; fd.close(); return true; diff --git a/language/anope.nl_NL.po b/language/anope.nl_NL.po index 1d560b297..30da9c68f 100644 --- a/language/anope.nl_NL.po +++ b/language/anope.nl_NL.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Anope\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-07 17:23+0100\n" -"PO-Revision-Date: 2014-12-07 17:36+0100\n" +"POT-Creation-Date: 2015-03-23 02:37+0100\n" +"PO-Revision-Date: 2015-03-16 02:15+0100\n" "Last-Translator: Robby <robby@chat.be>\n" "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -183,7 +183,7 @@ msgstr "%s bestaat al op de uitzonderingenlijst." msgid "%s cannot be taken as times to ban." msgstr "%s kan niet worden ingesteld als aantal keer om dan te bannen." -#: modules/commands/os_mode.cpp:157 +#: modules/commands/os_mode.cpp:163 #, c-format msgid "%s changed your usermodes to %s." msgstr "%s heeft je gebruikersmodes veranderd naar %s." @@ -490,7 +490,7 @@ msgstr "CHANGE oudenick nieuwenick [ident [host [naam]]]" msgid "DEL nick" msgstr "DEL nick" -#: modules/commands/os_session.cpp:601 +#: modules/commands/os_session.cpp:560 msgid "" "EXCEPTION ADD adds the given host mask to the exception list.\n" "Note that nick!user@host and user@host masks are invalid!\n" @@ -504,9 +504,6 @@ msgid "" " \n" "EXCEPTION DEL removes the given mask from the exception list.\n" " \n" -"EXCEPTION MOVE moves exception num to position. The\n" -"sessions inbetween will be shifted up or down to fill the gap.\n" -" \n" "EXCEPTION LIST and EXCEPTION VIEW show all current\n" "sessions if the optional mask is given, the list is limited\n" "to those sessions matching the mask. The difference is that\n" @@ -531,10 +528,6 @@ msgstr "" "EXCEPTION DEL verwijdert het gegeven masker van de\n" "uitzonderingenlijst.\n" " \n" -"EXCEPTION MOVE verplaatst uitzondering nr naar positie.\n" -"De tussenliggende uitzonderingen worden omhoog of omlaag\n" -"geschoven om het gat op te vullen.\n" -" \n" "EXCEPTION LIST en EXCEPTION VIEW geven alle huidige\n" "uitzonderingen weer; als het optionele masker is gegeven wordt de\n" "lijst gelimiteerd tot uitzonderingen overeenkomend met het\n" @@ -578,7 +571,7 @@ msgstr "[auto-memo] De memo die je naar %s gestuurd hebt is bekeken." msgid "[target] [password]" msgstr "[doel] [wachtwoord]" -#: modules/commands/ns_set.cpp:435 +#: modules/commands/ns_set.cpp:442 msgid "address" msgstr "adres" @@ -623,7 +616,7 @@ msgstr "kanaal nick" msgid "channel nick [reason]" msgstr "kanaal nick [reden]" -#: modules/commands/cs_clone.cpp:21 +#: modules/commands/cs_clone.cpp:115 msgid "channel target [what]" msgstr "kanaal doel [wat]" @@ -824,7 +817,7 @@ msgstr "kanaal {ON | OFF}" msgid "email" msgstr "e-mail" -#: modules/commands/ns_set.cpp:773 +#: modules/commands/ns_set.cpp:780 msgid "language" msgstr "taal" @@ -841,7 +834,7 @@ msgstr "bericht" msgid "modname" msgstr "modnaam" -#: modules/commands/ns_set.cpp:322 +#: modules/commands/ns_set.cpp:327 msgid "new-display" msgstr "nieuwe-weergave" @@ -884,7 +877,7 @@ msgstr "nick [reden]" msgid "nickname" msgstr "nick" -#: modules/commands/ns_set.cpp:525 +#: modules/commands/ns_set.cpp:532 msgid "nickname address" msgstr "nickname adres" @@ -892,7 +885,7 @@ msgstr "nickname adres" msgid "nickname email" msgstr "nick e-mail" -#: modules/commands/ns_set.cpp:848 +#: modules/commands/ns_set.cpp:855 msgid "nickname language" msgstr "nickname taal" @@ -900,11 +893,11 @@ msgstr "nickname taal" msgid "nickname message" msgstr "nickname bericht" -#: modules/commands/ns_set.cpp:385 +#: modules/commands/ns_set.cpp:390 msgid "nickname new-display" msgstr "nickname nieuwe-weergave" -#: modules/commands/ns_set.cpp:168 +#: modules/commands/ns_set.cpp:170 msgid "nickname new-password" msgstr "nickname nieuw-wachtwoord" @@ -924,14 +917,14 @@ msgstr "nick [+verlooptijd] [reden]" msgid "nickname {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}" msgstr "nick {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}" -#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:294 -#: modules/commands/ns_set.cpp:610 modules/commands/ns_set.cpp:961 -#: modules/commands/ns_set.cpp:1052 modules/commands/ns_set.cpp:1081 +#: modules/extra/stats/m_chanstats.cpp:122 modules/commands/ns_set.cpp:299 +#: modules/commands/ns_set.cpp:617 modules/commands/ns_set.cpp:968 +#: modules/commands/ns_set.cpp:1059 modules/commands/ns_set.cpp:1088 #: modules/commands/ns_list.cpp:252 msgid "nickname {ON | OFF}" msgstr "nickname {ON | OFF}" -#: modules/commands/ns_set.cpp:739 +#: modules/commands/ns_set.cpp:746 msgid "nickname {ON | QUICK | IMMED | OFF}" msgstr "nickname {ON | QUICK | IMMED | OFF}" @@ -987,7 +980,7 @@ msgstr "patroon [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]" msgid "server [reason]" msgstr "server [reden]" -#: modules/commands/os_mode.cpp:141 +#: modules/commands/os_mode.cpp:147 msgid "user modes" msgstr "nick modes" @@ -1047,7 +1040,7 @@ msgstr "" "Let op: omdat het naam masker spaties mag bevatten, is de scheiding\n" "tussen het masker en de reden een dubbele punt (:)." -#: modules/commands/os_sxline.cpp:668 +#: modules/commands/os_sxline.cpp:670 msgid "" " \n" "SQLINE ADD adds the given (nick's) mask to the SQLINE\n" @@ -1420,7 +1413,7 @@ msgstr "" " \n" "SNLINE CLEAR verwijdert alle vermeldingen van de SNLINE lijst." -#: modules/commands/os_sxline.cpp:687 +#: modules/commands/os_sxline.cpp:689 msgid "" " \n" "The SQLINE DEL command removes the given mask from the\n" @@ -1525,7 +1518,7 @@ msgstr " Geladen op: %p" msgid " but %s mysteriously dematerialized." msgstr " maar %s is in rook opgegaan." -#: src/messages.cpp:335 +#: src/messages.cpp:341 #, c-format msgid "" "\"/msg %s\" is no longer supported. Use \"/msg %s@%s\" or \"/%s\" instead." @@ -1566,7 +1559,7 @@ msgstr "%c%c is niet vergrendeld op %s." msgid "%c%c%s has been unlocked from %s." msgstr "%c%c%s werd ontgrendeld op %s." -#: modules/commands/cs_clone.cpp:140 +#: modules/commands/cs_clone.cpp:56 #, c-format msgid "%d access entries from %s have been cloned to %s." msgstr "%d toegangsvermeldingen van %s zijn gekopiëerd naar %s." @@ -1728,7 +1721,7 @@ msgstr "" "%s kan de opvolger niet zijn op kanaal %s omdat hij/zij de stichter is." #: modules/pseudoclients/global.cpp:90 modules/pseudoclients/hostserv.cpp:78 -#: modules/pseudoclients/operserv.cpp:272 +#: modules/pseudoclients/operserv.cpp:279 #, c-format msgid "%s commands:" msgstr "%s commando's:" @@ -2104,7 +2097,7 @@ msgstr "%s is nog steeds online." msgid "<unknown>" msgstr "<onbekend>" -#: modules/commands/ns_set.cpp:484 +#: modules/commands/ns_set.cpp:491 #, c-format msgid "" "A confirmation e-mail has been sent to %s. Follow the instructions in it to " @@ -2162,7 +2155,7 @@ msgstr "ADD doel info" msgid "ADD text" msgstr "ADD tekst" -#: modules/commands/os_session.cpp:561 +#: modules/commands/os_session.cpp:523 msgid "ADD [+expiry] mask limit reason" msgstr "ADD [+verlooptijd] masker limiet reden" @@ -2339,6 +2332,15 @@ msgstr "Server %s toegevoegd." msgid "Added zone %s." msgstr "Domein %s toegevoegd." +#: modules/commands/cs_entrymsg.cpp:257 +msgid "" +"Adding, deleting, or clearing entry messages requires the\n" +"SET permission." +msgstr "" +"Toevoegen, verwijderen, of leegmaken van de welkomstberichtenlijst vereist " +"het\n" +"SET recht." + #: modules/commands/ns_register.cpp:90 msgid "" "Additionally, Services Operators with the nickserv/confirm permission can\n" @@ -2363,7 +2365,7 @@ msgstr "" msgid "All O:lines of %s have been reset." msgstr "Alle O:lines van %s zijn hersteld." -#: modules/commands/cs_clone.cpp:154 +#: modules/commands/cs_clone.cpp:71 #, c-format msgid "All akick entries from %s have been cloned to %s." msgstr "Alle autokicks van %s zijn gekopiëerd naar %s." @@ -2373,11 +2375,16 @@ msgstr "Alle autokicks van %s zijn gekopiëerd naar %s." msgid "All available commands for %s:" msgstr "Alle beschikbare commando's voor %s:" -#: modules/commands/cs_clone.cpp:178 +#: modules/commands/cs_clone.cpp:96 #, c-format msgid "All badword entries from %s have been cloned to %s." msgstr "Alle slechte woorden van %s zijn gekopiëerd naar %s." +#: modules/commands/cs_clone.cpp:108 +#, c-format +msgid "All level entries from %s have been cloned into %s." +msgstr "Alle toegangsniveaus van %s zijn gekopiëerd naar %s." + #: modules/commands/os_news.cpp:38 msgid "All logon news items deleted." msgstr "Alle login nieuwsberichten zijn verwijderd." @@ -2387,12 +2394,12 @@ msgstr "Alle login nieuwsberichten zijn verwijderd." msgid "All memos for channel %s have been deleted." msgstr "Alle memo's voor kanaal %s zijn verwijderd." -#: modules/commands/os_mode.cpp:55 +#: modules/commands/os_mode.cpp:61 #, c-format msgid "All modes cleared on %s." msgstr "Alle modes verwijderd op %s." -#: modules/commands/ns_register.cpp:360 +#: modules/commands/ns_register.cpp:362 msgid "" "All new accounts must be validated by an administrator. Please wait for your " "registration to be confirmed." @@ -2417,7 +2424,7 @@ msgstr "Alle operators van %s zijn verwijderd." msgid "All random news items deleted." msgstr "Alle willekeurige nieuwsberichten zijn verwijderd." -#: modules/commands/cs_clone.cpp:105 +#: modules/commands/cs_clone.cpp:210 #, c-format msgid "All settings from %s have been cloned to %s." msgstr "Alle instellingen van %s zijn gekopiëerd naar %s." @@ -2559,7 +2566,7 @@ msgstr "" "naar alle gebruikers op het netwerk. Berichten zullen\n" "verstuurd worden vanaf de nick %s." -#: modules/commands/os_mode.cpp:127 +#: modules/commands/os_mode.cpp:133 msgid "" "Allows Services Operators to change modes for any channel.\n" "Parameters are the same as for the standard /MODE command.\n" @@ -2573,7 +2580,7 @@ msgstr "" "dan zullen alle modes, inclusief gebruikersstatus modes, weggehaald\n" "worden." -#: modules/commands/os_mode.cpp:167 +#: modules/commands/os_mode.cpp:173 msgid "" "Allows Services Operators to change modes for any user.\n" "Parameters are the same as for the standard /MODE command." @@ -2725,7 +2732,9 @@ msgid "" "connect, Services will not allow it to pursue his IRC\n" "session.\n" "If the first character of the mask is #, services will\n" -"prevent the use of matching channels." +"prevent the use of matching channels. If the mask is a\n" +"regular expression, the expression will be matched against\n" +"channels too." msgstr "" "Stelt Services Operators in staat de SQLINE lijst te beheren.\n" "Als een gebruiker probeert te verbinden met een nick die\n" @@ -2733,9 +2742,10 @@ msgstr "" "die gebruiker verwijderen.\n" "Indien de eerste karakter van een masker begint met een #,\n" "dan zal Services het gebruik van overeenkomende kanalen\n" -"verbieden." +"verbieden. Als het masker een reguliere expressie is, dan zal\n" +"deze expressie ook op kanalen van toepassing zijn." -#: modules/commands/os_session.cpp:592 +#: modules/commands/os_session.cpp:551 msgid "" "Allows Services Operators to manipulate the list of hosts that\n" "have specific session limits - allowing certain machines,\n" @@ -2868,7 +2878,7 @@ msgstr "" "Voorbeeld:\n" " MODIFY nickserv forcemail no" -#: modules/commands/ns_set.cpp:968 +#: modules/commands/ns_set.cpp:975 msgid "" "Allows you to choose the way Services are communicating with\n" "the given user. With MSG set, Services will use messages,\n" @@ -2878,7 +2888,7 @@ msgstr "" "gebruiker stuurt. Als MSG ingesteld is zal Services privé-\n" "berichten gebruiken, anders zullen ze notice's gebruiken." -#: modules/commands/ns_set.cpp:942 +#: modules/commands/ns_set.cpp:949 #, c-format msgid "" "Allows you to choose the way Services are communicating with\n" @@ -2998,7 +3008,7 @@ msgstr "" "Hierna kun je de bot voor het kanaal instellen zoals je\n" "wil." -#: data/chanserv.example.conf:1193 +#: data/chanserv.example.conf:1200 msgid "Associate a URL with the channel" msgstr "Koppel een URL aan het kanaal" @@ -3014,11 +3024,11 @@ msgstr "Koppel een URL aan jouw account" msgid "Associate a greet message with your nickname" msgstr "Koppel een begroeting aan je nick" -#: data/chanserv.example.conf:1194 +#: data/chanserv.example.conf:1201 msgid "Associate an E-mail address with the channel" msgstr "Koppel een e-mail adres aan het kanaal" -#: modules/commands/ns_set.cpp:434 +#: modules/commands/ns_set.cpp:441 msgid "Associate an E-mail address with your nickname" msgstr "Koppel een e-mail adres aan jouw nick" @@ -3026,11 +3036,11 @@ msgstr "Koppel een e-mail adres aan jouw nick" msgid "Associate oper info with a nick or channel" msgstr "Koppel oper informatie aan een nick of kanaal" -#: modules/commands/ns_set.cpp:537 +#: modules/commands/ns_set.cpp:544 msgid "Associates the given E-mail address with the nickname." msgstr "Koppel het opgegeven e-mail adres aan de nick" -#: modules/commands/ns_set.cpp:512 +#: modules/commands/ns_set.cpp:519 msgid "" "Associates the given E-mail address with your nickname.\n" "This address will be displayed whenever someone requests\n" @@ -3040,7 +3050,7 @@ msgstr "" "zal worden weergegeven wanneer iemand informatie over je\n" "nick opvraagt met het INFO commando." -#: modules/commands/ns_set.cpp:1290 +#: modules/commands/ns_set.cpp:1297 msgid "Auto-op" msgstr "Auto-op" @@ -3105,7 +3115,7 @@ msgstr "Slechtewoordenlijst is nu leeg." msgid "Ban expiry may not be longer than 1 day." msgstr "Ban verlooptijd mag niet langer dan 1 dag zijn." -#: modules/commands/cs_ban.cpp:138 modules/commands/cs_ban.cpp:167 +#: modules/commands/cs_ban.cpp:141 modules/commands/cs_ban.cpp:176 #, c-format msgid "Ban on %s expires in %s." msgstr "Ban op %s verloopt over %s." @@ -3123,7 +3133,7 @@ msgstr "Ban type voor kanaal %s is nu #%d." msgid "Bans a given nick or mask on a channel" msgstr "Ban een opgegeven nick of masker op een kanaal" -#: modules/commands/cs_ban.cpp:214 +#: modules/commands/cs_ban.cpp:228 msgid "" "Bans a given nick or mask on a channel. An optional expiry may\n" "be given to cause services to remove the ban after a set amount\n" @@ -3345,7 +3355,7 @@ msgid "Bot won't kick for repeats anymore." msgstr "Bot zal niet meer kicken voor herhalingen." #: modules/commands/cs_access.cpp:472 modules/commands/os_sxline.cpp:199 -#: modules/commands/os_session.cpp:552 +#: modules/commands/os_session.cpp:514 msgid "By" msgstr "Door" @@ -3378,12 +3388,12 @@ msgstr "" "nick of kanaal, indien deze nog niet gelezen is op het moment\n" "dat je dit commando gebruikt." -#: modules/commands/cs_clone.cpp:55 +#: modules/commands/cs_clone.cpp:149 #, c-format msgid "Cannot clone channel %s to itself!" msgstr "Kan kanaal %s niet naar zichzelf clonen!" -#: modules/commands/ns_register.cpp:303 +#: modules/commands/ns_register.cpp:305 msgid "Cannot send mail now; please retry a little later." msgstr "Onmogelijk e-mail te sturen; probeer later opnieuw." @@ -3449,20 +3459,20 @@ msgstr "ChanServ is vereist om PERSIST te activeren op dit netwerk." msgid "Change channel modes" msgstr "Wijzig kanaalmodes" -#: modules/commands/ns_set.cpp:881 +#: modules/commands/ns_set.cpp:888 msgid "Change the communication method of Services" msgstr "Verander de communicatiemethode van Services" -#: modules/commands/os_mode.cpp:140 +#: modules/commands/os_mode.cpp:146 msgid "Change user modes" msgstr "Wijzig gebruikersmodes" -#: modules/commands/os_mode.cpp:155 +#: modules/commands/os_mode.cpp:161 #, c-format msgid "Changed usermodes of %s to %s." msgstr "Gebruikersmodes van %s veranderd naar %s." -#: modules/commands/ns_set.cpp:397 +#: modules/commands/ns_set.cpp:402 msgid "" "Changes the display used to refer to the nickname group in\n" "Services. The new display MUST be a nick of the group." @@ -3470,7 +3480,7 @@ msgstr "" "Verandert de weergegeven nick van de nick-groep in Services.\n" "De nieuwe weergave MOET een nick in de groep zijn." -#: modules/commands/ns_set.cpp:373 +#: modules/commands/ns_set.cpp:378 msgid "" "Changes the display used to refer to your nickname group in\n" "Services. The new display MUST be a nick of your group." @@ -3486,7 +3496,7 @@ msgstr "" "Verandert de stichter van een kanaal. De nieuwe nick moet\n" "een geregistreerde nick zijn." -#: modules/commands/ns_set.cpp:860 +#: modules/commands/ns_set.cpp:867 msgid "" "Changes the language Services uses when sending messages to\n" "the given user (for example, when responding to a command they send).\n" @@ -3498,7 +3508,7 @@ msgstr "" "op een commando dat werd verzonden). taal moet gekozen\n" "worden uit de volgende lijst van ondersteunde talen:" -#: modules/commands/ns_set.cpp:824 +#: modules/commands/ns_set.cpp:831 msgid "" "Changes the language Services uses when sending messages to\n" "you (for example, when responding to a command you send).\n" @@ -3510,13 +3520,13 @@ msgstr "" "op een commando dat je hebt verzonden). taal moet gekozen\n" "worden uit de volgende lijst van ondersteunde talen:" -#: modules/commands/ns_set.cpp:219 +#: modules/commands/ns_set.cpp:224 msgid "Changes the password used to identify as the nick's owner." msgstr "" "Verandert het wachtwoord dat gebruikt wordt om te identificeren\n" "als de eigenaar van de nick." -#: modules/commands/ns_set.cpp:156 +#: modules/commands/ns_set.cpp:158 msgid "" "Changes the password used to identify you as the nick's\n" "owner." @@ -3824,19 +3834,19 @@ msgstr "" "Beheer welke berichten verstuurd worden naar gebruikers wanneer ze het " "kanaal betreden." -#: modules/commands/cs_clone.cpp:193 +#: modules/commands/cs_clone.cpp:241 msgid "" "Copies all settings, access, akicks, etc from channel to the\n" -"target channel. If what is ACCESS, AKICK, or BADWORDS\n" -"then only the respective settings are cloned.\n" +"target channel. If what is ACCESS, AKICK, BADWORDS,\n" +"or LEVELS then only the respective settings are cloned.\n" "You must be the founder of channel and target." msgstr "" "Kopiëert alle instellingen, toegangen, autokicks, enz. van kanaal naar het\n" -"doel kanaal. Als wat één van ACCESS, AKICK, or BADWORDS\n" -"is, dan worden enkel de respectievelijke instellingen gekopiëerd.\n" +"doel kanaal. Als wat één van ACCESS, AKICK, BADWORDS of\n" +"LEVELS is, dan worden enkel de respectievelijke instellingen gekopiëerd.\n" "Je moet de stichter zijn van zowel kanaal als doel." -#: modules/commands/cs_clone.cpp:20 +#: modules/commands/cs_clone.cpp:114 msgid "Copy all settings from one channel to another" msgstr "Kopiëer alle instellingen van het ene kanaal naar het andere" @@ -3844,7 +3854,7 @@ msgstr "Kopiëer alle instellingen van het ene kanaal naar het andere" #: modules/commands/cs_mode.cpp:433 modules/commands/cs_entrymsg.cpp:116 #: modules/commands/os_sxline.cpp:199 modules/commands/os_news.cpp:156 #: modules/commands/hs_request.cpp:306 modules/commands/cs_akick.cpp:380 -#: modules/commands/os_session.cpp:552 modules/commands/bs_info.cpp:58 +#: modules/commands/os_session.cpp:514 modules/commands/bs_info.cpp:58 #: modules/commands/os_akill.cpp:355 msgid "Created" msgstr "Gemaakt" @@ -3866,7 +3876,7 @@ msgstr "Huidige %s lijst:" msgid "Current AKILL list:" msgstr "Huidige AKILL lijst:" -#: modules/commands/os_session.cpp:531 +#: modules/commands/os_session.cpp:493 msgid "Current Session Limit Exception list:" msgstr "Huidige uitzonderingenlijst voor sessielimieten:" @@ -3919,7 +3929,7 @@ msgstr "DEL [nick] masker" msgid "DEL {mask | entry-num | list | id}" msgstr "DEL {masker | nr | lijst | id}" -#: modules/commands/os_session.cpp:562 +#: modules/commands/os_session.cpp:524 msgid "DEL {mask | entry-num | list}" msgstr "DEL {masker | nr | lijst}" @@ -4375,12 +4385,12 @@ msgstr "" "is kan je al je toegangen en kanalen verliezen dat u bezit.\n" "Iedereen kan dan deze nick opnieuw registreren." -#: modules/commands/ns_set.cpp:492 +#: modules/commands/ns_set.cpp:499 #, c-format msgid "E-mail address for %s changed to %s." msgstr "E-mail adres voor %s gewijzigd naar %s." -#: modules/commands/ns_set.cpp:498 +#: modules/commands/ns_set.cpp:505 #, c-format msgid "E-mail address for %s unset." msgstr "E-mail adres voor %s verwijderd." @@ -4451,7 +4461,7 @@ msgstr "Activeer fantasie commando's" msgid "Enable greet messages" msgstr "Activeer begroetingen" -#: modules/commands/ns_set.cpp:547 +#: modules/commands/ns_set.cpp:554 msgid "Enable or disable keep modes" msgstr "Activeer of deactiveer KEEPMODES" @@ -4481,7 +4491,7 @@ msgstr "" "onthouden en pogen deze terug te zetten wanneer het kanaal\n" "de volgende keer weer aangemaakt wordt." -#: modules/commands/ns_set.cpp:622 +#: modules/commands/ns_set.cpp:629 msgid "" "Enables or disables keepmodes for the given nick. If keep\n" "modes is enabled, services will remember users' usermodes\n" @@ -4492,7 +4502,7 @@ msgstr "" "onthouden en pogen deze terug te zetten wanneer ze de\n" "volgende keer identificeren." -#: modules/commands/ns_set.cpp:597 +#: modules/commands/ns_set.cpp:604 msgid "" "Enables or disables keepmodes for your nick. If keep\n" "modes is enabled, services will remember your usermodes\n" @@ -4752,8 +4762,8 @@ msgstr "" "die ermee overeenstemmen, en LIMIT zal gebruikers kicken tot het\n" "gebruikersaantal onder de kanaallimiet zakt, indien ingesteld." -#: src/language.cpp:44 modules/commands/ns_set.cpp:832 -#: modules/commands/ns_set.cpp:867 +#: src/language.cpp:44 modules/commands/ns_set.cpp:839 +#: modules/commands/ns_set.cpp:874 msgid "English" msgstr "Nederlands" @@ -4838,21 +4848,16 @@ msgstr "" " CERT LIST\n" " Toont de huidige certificaatlijst." -#: modules/commands/os_session.cpp:454 -#, c-format -msgid "Exception for %s (#%d) moved to position %d." -msgstr "Uitzondering voor %s (#%d) verplaatst naar positie %d." - #: modules/commands/os_session.cpp:358 #, c-format msgid "Exception for %s has been updated to %d." msgstr "Uitzondering voor %s is geüpdatet naar %d." -#: modules/pseudoclients/chanserv.cpp:460 +#: modules/pseudoclients/chanserv.cpp:456 #: modules/pseudoclients/nickserv.cpp:559 #: modules/pseudoclients/nickserv.cpp:564 modules/commands/os_ignore.cpp:266 #: modules/commands/os_sxline.cpp:199 modules/commands/os_forbid.cpp:346 -#: modules/commands/os_session.cpp:552 modules/commands/ns_group.cpp:315 +#: modules/commands/os_session.cpp:514 modules/commands/ns_group.cpp:315 #: modules/commands/os_akill.cpp:355 msgid "Expires" msgstr "Verloopt" @@ -4867,7 +4872,7 @@ msgstr "Verlooptijd en reden voor %s geüpdatet." msgid "Expiry for %s updated." msgstr "Verlooptijd voor %s geüpdatet." -#: modules/fantasy.cpp:198 +#: modules/fantasy.cpp:214 msgid "Fantasy" msgstr "Fantasie" @@ -5112,7 +5117,7 @@ msgstr "Negeerlijst is leeg." msgid "Ignore list:" msgstr "Negeerlijst:" -#: modules/commands/ns_set.cpp:1280 +#: modules/commands/ns_set.cpp:1287 msgid "Immediate protection" msgstr "Onmiddellijke berscherming" @@ -5201,16 +5206,16 @@ msgstr "Cursiefkicker" msgid "Join a group" msgstr "Bij een groep aanmelden" -#: modules/commands/cs_set.cpp:1358 modules/commands/ns_set.cpp:1294 +#: modules/commands/cs_set.cpp:1353 modules/commands/ns_set.cpp:1301 msgid "Keep modes" msgstr "Behoud modes" -#: modules/commands/cs_set.cpp:374 modules/commands/ns_set.cpp:582 +#: modules/commands/cs_set.cpp:374 modules/commands/ns_set.cpp:589 #, c-format msgid "Keep modes for %s is now off." msgstr "Modes behouden voor %s is nu uit." -#: modules/commands/cs_set.cpp:366 modules/commands/ns_set.cpp:576 +#: modules/commands/cs_set.cpp:366 modules/commands/ns_set.cpp:583 #, c-format msgid "Keep modes for %s is now on." msgstr "Modes behouden voor %s is nu aan." @@ -5228,7 +5233,7 @@ msgstr "Sleutel voor kanaal %s is %s." msgid "Kick a user from a channel" msgstr "Kick een gebruiker uit een kanaal" -#: modules/commands/cs_ban.cpp:204 modules/commands/cs_kick.cpp:103 +#: modules/commands/cs_ban.cpp:218 modules/commands/cs_kick.cpp:116 #, c-format msgid "Kicked %d/%d users matching %s from %s." msgstr "%d/%d gebruikers gekickd die overeenstemden met %s uit %s." @@ -5237,7 +5242,7 @@ msgstr "%d/%d gebruikers gekickd die overeenstemden met %s uit %s." msgid "Kicks a specified nick from a channel" msgstr "Kick een gegeven nick uit een kanaal" -#: modules/commands/cs_kick.cpp:115 +#: modules/commands/cs_kick.cpp:128 msgid "" "Kicks a specified nick from a channel.\n" " \n" @@ -5272,7 +5277,7 @@ msgstr "LIST aantal" msgid "LIST [mask | list | id]" msgstr "LIST [masker | lijst | id]" -#: modules/commands/os_session.cpp:564 +#: modules/commands/os_session.cpp:525 msgid "LIST [mask | list]" msgstr "LIST [masker | lijst]" @@ -5285,7 +5290,7 @@ msgstr "LIST [nick]" msgid "LOGONNEWS {ADD|DEL|LIST} [text|num]" msgstr "LOGONNEWS {ADD|DEL|LIST} [text|nr]" -#: modules/commands/ns_set.cpp:812 +#: modules/commands/ns_set.cpp:819 msgid "Language changed to English." msgstr "Taal gewijzigd naar Nederlands." @@ -5338,8 +5343,8 @@ msgstr "Niveau voor %s op kanaal %s gewijzigd naar enkel-stichter." msgid "Level must be between %d and %d inclusive." msgstr "Niveau moet tussen de %d en %d inclusief zijn." -#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:544 -#: modules/commands/os_session.cpp:552 +#: modules/commands/os_dns.cpp:217 modules/commands/os_session.cpp:506 +#: modules/commands/os_session.cpp:514 msgid "Limit" msgstr "Limiet" @@ -5708,10 +5713,6 @@ msgstr "" msgid "Looking for yourself, eh %s?" msgstr "Zoek je jezelf, %s?" -#: modules/commands/os_session.cpp:563 -msgid "MOVE num position" -msgstr "MOVE nr positie" - #: modules/commands/cs_mode.cpp:715 #, c-format msgid "" @@ -5965,7 +5966,7 @@ msgstr "Pas de topic van het gegeven kanaal aan" #: modules/commands/os_sxline.cpp:191 modules/commands/os_sxline.cpp:199 #: modules/commands/os_forbid.cpp:346 modules/commands/cs_akick.cpp:367 #: modules/commands/cs_akick.cpp:380 modules/commands/ms_ignore.cpp:86 -#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552 +#: modules/commands/os_session.cpp:506 modules/commands/os_session.cpp:514 #: modules/commands/os_list.cpp:147 modules/commands/bs_info.cpp:56 #: modules/commands/os_akill.cpp:341 modules/commands/os_akill.cpp:355 msgid "Mask" @@ -6043,7 +6044,7 @@ msgstr "Memo's voor %s:" msgid "Message" msgstr "Bericht" -#: modules/commands/ns_set.cpp:1288 +#: modules/commands/ns_set.cpp:1295 msgid "Message mode" msgstr "Berichtenmodus" @@ -6065,7 +6066,7 @@ msgstr "Mode" msgid "Mode %s is not a status or list mode." msgstr "Mode %s is geen status- of lijst-mode." -#: modules/commands/cs_mode.cpp:983 +#: modules/commands/cs_mode.cpp:1007 msgid "Mode lock" msgstr "Mode-vergrendeling" @@ -6078,6 +6079,11 @@ msgstr "Mode-vergrendelingen voor %s:" msgid "Modes" msgstr "Modes" +#: modules/commands/os_mode.cpp:44 +#, c-format +msgid "Modes cleared on %s and the channel destroyed." +msgstr "Modes verwijderd op %s en het kanaal vernietigd." + #: modules/commands/ns_access.cpp:166 #, c-format msgid "" @@ -6158,7 +6164,7 @@ msgstr "Wijzig de lijst van gebruikers met privileges" msgid "Modify the nickname client certificate list" msgstr "Wijzig de certificaatlijst" -#: modules/commands/os_session.cpp:560 +#: modules/commands/os_session.cpp:522 msgid "Modify the session-limit exception list" msgstr "Wijzig de uitzonderingenlijst voor sessielimieten" @@ -6291,12 +6297,12 @@ msgstr "Nick %s is niet geregistreerd." msgid "Nick %s was truncated to %d characters." msgstr "Nick %s werd verkort naar %d tekens." -#: modules/commands/ns_set.cpp:1111 +#: modules/commands/ns_set.cpp:1118 #, c-format msgid "Nick %s will expire." msgstr "Nick %s zal verlopen." -#: modules/commands/ns_set.cpp:1105 +#: modules/commands/ns_set.cpp:1112 #, c-format msgid "Nick %s will not expire." msgstr "Nick %s zal niet verlopen." @@ -6361,17 +6367,17 @@ msgstr "Nick %s is al geregistreerd!" msgid "Nickname %s may not be registered." msgstr "Nick %s mag niet geregistreerd worden." -#: modules/commands/ns_register.cpp:204 +#: modules/commands/ns_register.cpp:206 #, c-format msgid "Nickname %s registered under your user@host-mask: %s" msgstr "Nick %s is geregistreerd onder jouw gebruikersmasker: %s" -#: modules/commands/ns_register.cpp:206 +#: modules/commands/ns_register.cpp:208 #, c-format msgid "Nickname %s registered." msgstr "Nick %s is geregistreerd." -#: modules/commands/cs_set.cpp:1360 +#: modules/commands/cs_set.cpp:1355 msgid "No auto-op" msgstr "Geen auto-op" @@ -6379,7 +6385,7 @@ msgstr "Geen auto-op" msgid "No bot" msgstr "Geen bot" -#: modules/commands/cs_set.cpp:1356 modules/commands/ns_set.cpp:1292 +#: modules/commands/cs_set.cpp:1351 modules/commands/ns_set.cpp:1299 msgid "No expire" msgstr "Verloopt niet" @@ -6428,7 +6434,7 @@ msgstr "Geen overeenkomsten op %s autokicklijst." msgid "No matching entries on %s bad words list." msgstr "Geen overeenkomsten op %s slechtewoordenlijst." -#: modules/commands/os_session.cpp:145 modules/commands/os_session.cpp:528 +#: modules/commands/os_session.cpp:145 modules/commands/os_session.cpp:490 msgid "No matching entries on session-limit exception list." msgstr "Geen overeenkomsten op de uitzonderingenlijst voor sessielimieten." @@ -6495,7 +6501,7 @@ msgstr "Geen statistieken voor %s." msgid "No such info \"%s\" on %s." msgstr "Geen zulke info \"%s\" over %s." -#: modules/commands/cs_ban.cpp:206 modules/commands/cs_kick.cpp:105 +#: modules/commands/cs_ban.cpp:220 modules/commands/cs_kick.cpp:118 #, c-format msgid "No users on %s match %s." msgstr "Geen gebruikers op %s die overeenkomen met %s." @@ -6510,7 +6516,7 @@ msgstr "Geen-botmodus staat nu uit op kanaal %s." msgid "No-bot mode is now on on channel %s." msgstr "Geen-botmodus staat nu aan op kanaal %s." -#: modules/commands/os_mode.cpp:58 +#: modules/commands/os_mode.cpp:64 #, c-format msgid "Non-status modes cleared on %s." msgstr "Niet-statusmodes weggehaald op %s." @@ -6531,7 +6537,7 @@ msgstr "Niets te doen." #: modules/commands/bs_badwords.cpp:194 modules/commands/os_news.cpp:156 #: modules/commands/hs_request.cpp:306 modules/commands/cs_akick.cpp:367 #: modules/commands/cs_akick.cpp:380 modules/commands/cs_log.cpp:127 -#: modules/commands/os_session.cpp:544 modules/commands/os_session.cpp:552 +#: modules/commands/os_session.cpp:506 modules/commands/os_session.cpp:514 #: modules/commands/os_akill.cpp:341 modules/commands/os_akill.cpp:355 #: modules/commands/ns_ajoin.cpp:100 msgid "Number" @@ -6631,12 +6637,12 @@ msgstr "Wachtwoord aanvaard." msgid "Password authentication required for that command." msgstr "Wachtwoord authenticatie vereist voor dat commando." -#: modules/commands/ns_set.cpp:147 modules/commands/ns_set.cpp:210 +#: modules/commands/ns_set.cpp:149 modules/commands/ns_set.cpp:215 #, c-format msgid "Password for %s changed to %s." msgstr "Wachtwoord voor %s gewijzigd naar %s." -#: modules/commands/ns_set.cpp:149 modules/commands/ns_set.cpp:212 +#: modules/commands/ns_set.cpp:151 modules/commands/ns_set.cpp:217 #, c-format msgid "Password for %s changed." msgstr "Wachtwoord voor %s gewijzigd." @@ -6655,7 +6661,7 @@ msgstr "Fout wachtwoord." msgid "Password reset email for %s has been sent." msgstr "Wachtwoord reset e-mail voor %s werd verstuurd." -#: modules/commands/cs_set.cpp:1342 +#: modules/commands/cs_set.cpp:1337 msgid "Peace" msgstr "Vrede" @@ -6669,7 +6675,7 @@ msgstr "Vrede-optie voor %s is nu uit." msgid "Peace option for %s is now on." msgstr "Vrede-optie voor %s is nu aan." -#: modules/commands/cs_set.cpp:1354 +#: modules/commands/cs_set.cpp:1349 msgid "Persistent" msgstr "Permanent" @@ -6724,7 +6730,7 @@ msgstr "" "Gelieve %d seconden te wachten alvorens het GROUP commando opnieuw te " "gebruiken." -#: modules/commands/ns_register.cpp:176 +#: modules/commands/ns_register.cpp:178 #, c-format msgid "Please wait %d seconds before using the REGISTER command again." msgstr "" @@ -6766,7 +6772,7 @@ msgstr "Voorkom dat het kanaal verloopt" msgid "Prevent the nickname from appearing in the LIST command" msgstr "Voorkom dat de nick in het LIST commando verschijnt" -#: modules/commands/ns_set.cpp:1080 +#: modules/commands/ns_set.cpp:1087 msgid "Prevent the nickname from expiring" msgstr "Voorkom dat de nick verloopt" @@ -6819,26 +6825,26 @@ msgstr "Privilege %s toegevoegd bij %s op %s, nieuwe vlaggen zijn +%s" msgid "Privilege %s removed from %s on %s, new flags are +%s" msgstr "Privilege %s verwijderd van %s op %s, nieuwe vlaggen zijn +%s" -#: modules/commands/ns_set.cpp:1284 +#: modules/commands/ns_set.cpp:1291 msgid "Protection" msgstr "Bescherming" -#: modules/commands/ns_set.cpp:700 +#: modules/commands/ns_set.cpp:707 #, c-format msgid "Protection is now off for %s." msgstr "Bescherming is nu uit voor %s." -#: modules/commands/ns_set.cpp:679 +#: modules/commands/ns_set.cpp:686 #, c-format msgid "Protection is now on for %s, with a reduced delay." msgstr "Bescherming is nu aan voor %s, met een kortere vertraging." -#: modules/commands/ns_set.cpp:689 +#: modules/commands/ns_set.cpp:696 #, c-format msgid "Protection is now on for %s, with no delay." msgstr "Bescherming is nu aan voor %s, zonder vertraging." -#: modules/commands/ns_set.cpp:671 +#: modules/commands/ns_set.cpp:678 #, c-format msgid "Protection is now on for %s." msgstr "Bescherming is nu aan voor %s." @@ -6853,7 +6859,7 @@ msgstr "" "gebruikt de volledige echte ident@host voor elke nick,\n" "en dwingt dan de AKILL af." -#: modules/commands/ns_set.cpp:1282 +#: modules/commands/ns_set.cpp:1289 msgid "Quick protection" msgstr "Snelle bescherming" @@ -6898,7 +6904,7 @@ msgstr "Echte naam" #: modules/commands/os_ignore.cpp:266 modules/commands/os_sxline.cpp:191 #: modules/commands/os_sxline.cpp:199 modules/commands/os_forbid.cpp:346 #: modules/commands/cs_akick.cpp:367 modules/commands/cs_akick.cpp:380 -#: modules/commands/os_session.cpp:552 modules/commands/os_akill.cpp:341 +#: modules/commands/os_session.cpp:514 modules/commands/os_akill.cpp:341 #: modules/commands/os_akill.cpp:355 msgid "Reason" msgstr "Reden" @@ -6937,7 +6943,7 @@ msgstr "Neemt de controle van je nick weer over" msgid "Regex is disabled." msgstr "Regex is uitgeschakeld." -#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:684 +#: modules/commands/os_sxline.cpp:452 modules/commands/os_sxline.cpp:686 #: modules/commands/os_akill.cpp:438 #, c-format msgid "" @@ -7021,7 +7027,7 @@ msgstr "" "%s zal ook automatisch de stichter kanaaloperator\n" "status geven wanneer deze het kanaal binnenkomt." -#: modules/commands/ns_register.cpp:240 +#: modules/commands/ns_register.cpp:242 #, c-format msgid "" "Registers your nickname in the %s database. Once\n" @@ -7177,7 +7183,7 @@ msgstr "" "door de netwerkbeheerders. Gelieve geduldig te wachten\n" "terwijl uw aanvraag lopende is." -#: modules/commands/ns_register.cpp:283 +#: modules/commands/ns_register.cpp:285 msgid "Resend registration confirmation email" msgstr "Registratiebevestigings-e-mail opnieuw verzenden" @@ -7185,7 +7191,7 @@ msgstr "Registratiebevestigings-e-mail opnieuw verzenden" msgid "Restrict access to the channel" msgstr "Beperk de toegang tot het kanaal" -#: modules/commands/cs_set.cpp:1344 +#: modules/commands/cs_set.cpp:1339 msgid "Restricted access" msgstr "Beperkte toegang" @@ -7337,7 +7343,7 @@ msgstr "Sla de database op en herstart Services" msgid "Searches logs for a matching pattern" msgstr "Doorzoekt logs voor een overeenstemmend patroon" -#: modules/commands/cs_set.cpp:1348 +#: modules/commands/cs_set.cpp:1343 msgid "Secure founder" msgstr "Strikte stichter controle" @@ -7351,7 +7357,7 @@ msgstr "Strikte stichter controle-optie voor %s is nu uit." msgid "Secure founder option for %s is now on." msgstr "Strikte stichter controle-optie voor %s is nu aan." -#: modules/commands/cs_set.cpp:1350 +#: modules/commands/cs_set.cpp:1345 msgid "Secure ops" msgstr "Strikte operator controle" @@ -7375,12 +7381,12 @@ msgstr "Veiligheidsoptie voor %s is nu uit." msgid "Secure option for %s is now on." msgstr "Veiligheidsoptie voor %s is nu aan." -#: modules/commands/ns_set.cpp:1020 +#: modules/commands/ns_set.cpp:1027 #, c-format msgid "Secure option is now off for %s." msgstr "Veiligheidsoptie is nu uit voor %s." -#: modules/commands/ns_set.cpp:1014 +#: modules/commands/ns_set.cpp:1021 #, c-format msgid "Secure option is now on for %s." msgstr "Veiligheidsoptie is nu aan voor %s." @@ -7390,7 +7396,7 @@ msgstr "Veiligheidsoptie is nu aan voor %s." msgid "Secureops enforced on %s." msgstr "SECUREOPS afgedwongen op %s." -#: modules/commands/cs_set.cpp:1346 modules/commands/ns_set.cpp:1286 +#: modules/commands/cs_set.cpp:1341 modules/commands/ns_set.cpp:1293 msgid "Security" msgstr "Veiligheid" @@ -7584,7 +7590,7 @@ msgstr "Service" msgid "Service's hold on %s has been released." msgstr "Nick %s werd vrijgegeven." -#: data/nickserv.example.conf:234 data/chanserv.example.conf:820 +#: data/nickserv.example.conf:234 data/chanserv.example.conf:827 msgid "Services Operator commands" msgstr "Services Operator commando's" @@ -7653,7 +7659,7 @@ msgstr "" msgid "Services up %s." msgstr "Services draaien reeds %s." -#: modules/commands/ns_set.cpp:258 +#: modules/commands/ns_set.cpp:263 #, c-format msgid "Services will from now on set status modes on %s in channels." msgstr "Services zal vanaf nu status modes geven aan %s in kanalen." @@ -7664,7 +7670,7 @@ msgid "Services will no longer automatically give modes to users in %s." msgstr "" "Services zal nu niet langer automatisch modes geven aan gebruikers in %s." -#: modules/commands/ns_set.cpp:264 +#: modules/commands/ns_set.cpp:269 #, c-format msgid "Services will no longer set status modes on %s in channels." msgstr "Services zal niet langer status modes geven aan %s in kanalen." @@ -7674,12 +7680,12 @@ msgstr "Services zal niet langer status modes geven aan %s in kanalen." msgid "Services will now automatically give modes to users in %s." msgstr "Services zal nu automatisch modes geven aan gebruikers in %s." -#: modules/commands/ns_set.cpp:916 +#: modules/commands/ns_set.cpp:923 #, c-format msgid "Services will now reply to %s with messages." msgstr "Services zal nu antwoorden sturen naar %s via privé berichten." -#: modules/commands/ns_set.cpp:922 +#: modules/commands/ns_set.cpp:929 #, c-format msgid "Services will now reply to %s with notices." msgstr "Services zal nu antwoorden sturen naar %s via notice." @@ -7697,7 +7703,7 @@ msgstr "Sessie" msgid "Session limit for %s set to %d." msgstr "Sessielimiet voor %s veranderd naar %d." -#: modules/commands/os_session.cpp:257 modules/commands/os_session.cpp:573 +#: modules/commands/os_session.cpp:257 modules/commands/os_session.cpp:534 msgid "Session limiting is disabled." msgstr "Sessielimitering is uitgeschakeld." @@ -7734,7 +7740,7 @@ msgstr "Stel het kanaal als permanent in" msgid "Set the channel description" msgstr "Stelt de kanaalbeschrijving in" -#: modules/commands/ns_set.cpp:321 +#: modules/commands/ns_set.cpp:326 msgid "Set the display of your group in Services" msgstr "Stel de weergave van je groep in Services in" @@ -7742,13 +7748,13 @@ msgstr "Stel de weergave van je groep in Services in" msgid "Set the founder of a channel" msgstr "Stelt de stichter van een kanaal in" -#: modules/commands/ns_set.cpp:772 +#: modules/commands/ns_set.cpp:779 msgid "Set the language Services will use when messaging you" msgstr "" "Selecteer de taal die Services zal gebruiken voor het versturen van " "berichten naar jou" -#: modules/commands/ns_set.cpp:167 +#: modules/commands/ns_set.cpp:169 msgid "Set the nickname password" msgstr "Verander het wachtwoord van de nick" @@ -8068,7 +8074,7 @@ msgstr "" msgid "Sets various nickname options. option can be one of:" msgstr "Stelt verscheidene nick opties in. optie kan een van de volgende zijn:" -#: modules/commands/ns_set.cpp:229 +#: modules/commands/ns_set.cpp:234 msgid "" "Sets whether services should set channel status modes on you automatically." msgstr "" @@ -8082,7 +8088,7 @@ msgstr "" "Stelt in of het gegeven kanaal zal verlopen. Door deze optie\n" "AAN te zetten kun je verhinderen dat het kanaal verloopt." -#: modules/commands/ns_set.cpp:307 +#: modules/commands/ns_set.cpp:312 #, c-format msgid "" "Sets whether the given nickname will be given its status modes\n" @@ -8096,7 +8102,7 @@ msgstr "" "te zetten wanneer de nick kanalen betreed. Let op dat afhankelijk van de\n" "kanaalinstellingen sommige modes niet automatisch gezet kunnen worden." -#: modules/commands/ns_set.cpp:1121 +#: modules/commands/ns_set.cpp:1128 msgid "" "Sets whether the given nickname will expire. Setting this\n" "to ON prevents the nickname from expiring." @@ -8104,7 +8110,7 @@ msgstr "" "Stelt in of de gegeven nick zal verlopen of niet.\n" "Dit aan zetten voorkomt dat de nick zal verlopen." -#: modules/commands/ns_set.cpp:280 +#: modules/commands/ns_set.cpp:285 #, c-format msgid "" "Sets whether you will be given your channel status modes automatically.\n" @@ -8177,7 +8183,7 @@ msgstr "" msgid "Signed kick option for %s is now on." msgstr "Ondertekende kicks-optie voor %s is nu aan." -#: modules/commands/cs_set.cpp:1352 +#: modules/commands/cs_set.cpp:1347 msgid "Signed kicks" msgstr "Ondertekende kicks" @@ -8894,7 +8900,7 @@ msgstr "" "Het ENTRYMSG LIST commando toont een lijst van berichten\n" "die naar gebruikers gestuurd worden wanneer ze het kanaal betreden." -#: modules/commands/ns_set.cpp:692 +#: modules/commands/ns_set.cpp:699 msgid "The IMMED option is not available on this network." msgstr "De IMMED optie is niet beschikbaar op dit netwerk." @@ -8988,7 +8994,7 @@ msgstr "" "Het STATS commando toont statistieken over opgeslagen nicks en " "geheugenverbruik." -#: modules/commands/ns_register.cpp:262 +#: modules/commands/ns_register.cpp:264 msgid "" "The email parameter is optional and will set the email\n" "for your nick immediately.\n" @@ -9188,7 +9194,7 @@ msgstr "De memolimiet voor %s mag niet worden veranderd." msgid "The mode lock list of %s is full." msgstr "De mode blokkeerlijst van %s is vol." -#: modules/commands/ns_set.cpp:347 +#: modules/commands/ns_set.cpp:352 #, c-format msgid "The new display MUST be a nickname of the nickname group %s." msgstr "De nieuwe weergave MOET een nick zijn van de nick-groep %s." @@ -9232,7 +9238,7 @@ msgstr "" "Het services toegangsniveau van %s zal vanaf nu getoond worden in %s INFO " "opvragingen." -#: modules/commands/os_session.cpp:471 +#: modules/commands/os_session.cpp:433 msgid "The session exception list is empty." msgstr "De uitzonderingenlijst voor sessielimieten is leeg." @@ -9386,7 +9392,7 @@ msgstr "" "HUIDIGE nick de vHost van alle nicks in dezelfde groep te\n" "laten zijn." -#: modules/commands/ns_register.cpp:270 +#: modules/commands/ns_register.cpp:272 msgid "" "This command also creates a new group for your nickname,\n" "that will allow you to register other nicks later sharing\n" @@ -9519,7 +9525,7 @@ msgstr "" "Services Operators kunnen een nick opgeven om anderen hun\n" "autojoinlijsten aan te passen." -#: modules/commands/ns_set.cpp:337 modules/commands/ns_set.cpp:648 +#: modules/commands/ns_set.cpp:342 modules/commands/ns_set.cpp:655 msgid "" "This command may not be used on this network because nickname ownership is " "disabled." @@ -9591,7 +9597,7 @@ msgstr "" msgid "This command unloads the module named modname." msgstr "Dit commando ontlaadt de module genaamd modnaam." -#: modules/commands/ns_register.cpp:324 +#: modules/commands/ns_register.cpp:326 msgid "This command will resend you the registration confirmation email." msgstr "" "Dit commando zal je de registratiebevestigings-e-mail opnieuw toezenden." @@ -9720,11 +9726,11 @@ msgstr "Zet hoofdletters UIT!" msgid "Turn chanstats statistics on or off" msgstr "Zet chanstats statistieken aan of uit" -#: modules/commands/ns_set.cpp:985 +#: modules/commands/ns_set.cpp:992 msgid "Turn nickname security on or off" msgstr "Zet nickname beveiliging aan of uit" -#: modules/commands/ns_set.cpp:634 +#: modules/commands/ns_set.cpp:641 msgid "Turn protection on or off" msgstr "Zet bescherming aan of uit" @@ -9758,7 +9764,7 @@ msgstr "" "iedereen die je nick weet kan nog steeds informatie krijgen\n" "via het INFO commando." -#: modules/commands/ns_set.cpp:1035 modules/commands/ns_set.cpp:1064 +#: modules/commands/ns_set.cpp:1042 modules/commands/ns_set.cpp:1071 #, c-format msgid "" "Turns %s's security features on or off for your\n" @@ -9785,7 +9791,7 @@ msgstr "Zet chanstats statistieken aan of uit." msgid "Turns chanstats channel statistics ON or OFF for this user." msgstr "Zet chanstats kanaal statistieken aan of uit voor deze gebruiker." -#: modules/commands/ns_set.cpp:751 +#: modules/commands/ns_set.cpp:758 #, c-format msgid "" "Turns the automatic protection option for the nick\n" @@ -9815,7 +9821,7 @@ msgstr "" "Deze optie kan ook uitgeschakeld zijn door de netwerk\n" "administrators." -#: modules/commands/ns_set.cpp:717 +#: modules/commands/ns_set.cpp:724 #, c-format msgid "" "Turns the automatic protection option for your nick\n" @@ -10060,15 +10066,15 @@ msgstr "" msgid "Used on" msgstr "Gebruikt op" -#: data/chanserv.example.conf:814 +#: data/chanserv.example.conf:821 msgid "Used to manage channels" msgstr "Dient om kanalen te beheren" -#: data/chanserv.example.conf:802 +#: data/chanserv.example.conf:809 msgid "Used to manage the list of privileged users" msgstr "Dient om de lijst van gebruikers met privileges te beheren" -#: data/chanserv.example.conf:808 +#: data/chanserv.example.conf:815 msgid "Used to modify the channel status of you or other users" msgstr "Dient om de kanaalstatus van jezelf of anderen aan te passen" @@ -10137,7 +10143,7 @@ msgstr "VIEW host" msgid "VIEW [mask | list | id]" msgstr "VIEW [masker | lijst | id]" -#: modules/commands/os_session.cpp:565 +#: modules/commands/os_session.cpp:526 msgid "VIEW [mask | list]" msgstr "VIEW [masker | lijst]" @@ -10380,7 +10386,7 @@ msgstr "Je kan geen kanaal toevoegen op zijn eigen toegangslijst." msgid "You can't logout %s, they are a Services Operator." msgstr "Je kan %s niet uitloggen omdat hij een Services Operator is." -#: modules/commands/ns_set.cpp:903 +#: modules/commands/ns_set.cpp:910 #, c-format msgid "You cannot %s on this network." msgstr "Je kan geen %s doen op dit netwerk." @@ -10406,7 +10412,7 @@ msgstr "" "Je kan geen bottoewijzingen ongedaan maken zolang persist geactiveerd is op " "het kanaal." -#: modules/commands/ns_set.cpp:462 +#: modules/commands/ns_set.cpp:469 msgid "You cannot unset the e-mail on this network." msgstr "Je kan het e-mail adres niet verwijderen op dit netwerk." @@ -10543,15 +10549,15 @@ msgstr "Je kan de registraties van nicks in je groep verwijderen." msgid "You may not (un)lock mode %c." msgstr "Je mag mode %c niet (de)blokkeren." -#: modules/commands/ns_set.cpp:467 +#: modules/commands/ns_set.cpp:474 msgid "You may not change the e-mail of other Services Operators." msgstr "Je mag het e-mail adres van andere Services Operators niet wijzigen." -#: modules/commands/ns_set.cpp:456 +#: modules/commands/ns_set.cpp:463 msgid "You may not change the email of an unconfirmed account." msgstr "Je mag het e-mail adres van een onbevestigde account niet wijzigen." -#: modules/commands/ns_set.cpp:191 +#: modules/commands/ns_set.cpp:193 msgid "You may not change the password of other Services Operators." msgstr "Je mag het wachtwoord van andere Services Operators niet wijzigen." @@ -10699,22 +10705,22 @@ msgstr "" "Je IRCd ondersteunt geen vIdent's, indien dit niet klopt, gelieve dit dan te " "melden als een fout" -#: modules/extra/m_ldap_authentication.cpp:110 +#: modules/extra/m_ldap_authentication.cpp:102 #: modules/extra/m_sql_authentication.cpp:47 #, c-format msgid "Your account %s has been successfully created." msgstr "Je account %s is succesvol aangemaakt." -#: modules/commands/ns_register.cpp:299 +#: modules/commands/ns_register.cpp:301 msgid "Your account is already confirmed." msgstr "Je account is reeds bevestigd." -#: modules/commands/ns_register.cpp:367 +#: modules/commands/ns_register.cpp:369 #, c-format msgid "Your account will expire, if not confirmed, in %s." msgstr "Je account verloopt, indien niet bevestigd, over %s." -#: modules/commands/ns_set.cpp:1249 +#: modules/commands/ns_set.cpp:1256 #, c-format msgid "Your email address has been changed to %s." msgstr "Je e-mail adres werd gewijzigd naar %s." @@ -10723,7 +10729,7 @@ msgstr "Je e-mail adres werd gewijzigd naar %s." msgid "Your email address is not allowed, choose a different one." msgstr "Je e-mail adres is niet toegelaten, kies een andere." -#: modules/commands/ns_register.cpp:362 +#: modules/commands/ns_register.cpp:364 msgid "" "Your email address is not confirmed. To confirm it, follow the instructions " "that were emailed to you." @@ -10736,7 +10742,7 @@ msgstr "" msgid "Your email address of %s has been confirmed." msgstr "Je e-mail adres %s werd bevestigd." -#: modules/extra/m_ldap_authentication.cpp:171 +#: modules/extra/m_ldap_authentication.cpp:151 #, c-format msgid "Your email has been updated to %s" msgstr "Je e-mail werd geüpdatet naar %s." @@ -10802,21 +10808,20 @@ msgstr "Je nickname wordt nu veranderd in %s" msgid "Your oper block doesn't require logging in." msgstr "Je oper blok vereist geen aanmelding." -#: modules/commands/ns_register.cpp:307 +#: modules/commands/ns_register.cpp:309 #, c-format msgid "Your passcode has been re-sent to %s." msgstr "Je bevestingscode is opnieuw gestuurd naar %s." -#: modules/commands/ns_register.cpp:210 +#: modules/commands/ns_register.cpp:212 #, c-format msgid "Your password is %s - remember this for later use." msgstr "Je wachtwoord is %s - onthoudt dit voor later gebruik." #: include/language.h:77 -msgid "Your password is too long. Please try again with a shorter password." -msgstr "" -"Je wachtwoord is te lang. Gelieve opnieuw te proberen met een korter " -"wachtwoord." +#, c-format +msgid "Your password is too long. It must not exceed %u characters." +msgstr "Je wachtwoord is te lang. Het mag niet langer zijn dan %u karakters." #: modules/commands/ns_resetpass.cpp:96 msgid "Your password reset request has expired." diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp index be15df66c..de6a4f40e 100644 --- a/modules/commands/cs_ban.cpp +++ b/modules/commands/cs_ban.cpp @@ -101,6 +101,9 @@ class CommandCSBan : public Command if (reason.length() > reasonmax) reason = reason.substr(0, reasonmax); + Anope::string signkickformat = Config->GetModule("chanserv")->Get<Anope::string>("signkickformat", "%m (%n)"); + signkickformat = signkickformat.replace_all_cs("%n", source.GetNick()); + User *u = source.GetUser(); User *u2 = User::Find(target, true); @@ -146,7 +149,10 @@ class CommandCSBan : public Command if (block->Get<bool>("kick", "yes")) { if (ci->HasExt("SIGNKICK") || (ci->HasExt("SIGNKICK_LEVEL") && !source.AccessFor(ci).HasPriv("SIGNKICK"))) - c->Kick(ci->WhoSends(), u2, "%s (%s)", reason.c_str(), source.GetNick().c_str()); + { + signkickformat = signkickformat.replace_all_cs("%m", reason); + c->Kick(ci->WhoSends(), u2, "%s", signkickformat.c_str()); + } else c->Kick(ci->WhoSends(), u2, "%s", reason.c_str()); } @@ -197,7 +203,11 @@ class CommandCSBan : public Command { ++kicked; if (ci->HasExt("SIGNKICK") || (ci->HasExt("SIGNKICK_LEVEL") && !u_access.HasPriv("SIGNKICK"))) - c->Kick(ci->WhoSends(), uc->user, "%s (Matches %s) (%s)", reason.c_str(), mask.c_str(), source.GetNick().c_str()); + { + reason += " (Matches " + mask + ")"; + signkickformat = signkickformat.replace_all_cs("%m", reason); + c->Kick(ci->WhoSends(), uc->user, "%s", signkickformat.c_str()); + } else c->Kick(ci->WhoSends(), uc->user, "%s (Matches %s)", reason.c_str(), mask.c_str()); } diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp index a3505d254..5b28b5f18 100644 --- a/modules/commands/cs_kick.cpp +++ b/modules/commands/cs_kick.cpp @@ -47,6 +47,9 @@ class CommandCSKick : public Command if (reason.length() > reasonmax) reason = reason.substr(0, reasonmax); + Anope::string signkickformat = Config->GetModule("chanserv")->Get<Anope::string>("signkickformat", "%m (%n)"); + signkickformat = signkickformat.replace_all_cs("%n", source.GetNick()); + AccessGroup u_access = source.AccessFor(ci); if (!u_access.HasPriv("KICK") && !source.HasPriv("chanserv/kick")) @@ -66,7 +69,10 @@ class CommandCSKick : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "for " << u2->nick; if (ci->HasExt("SIGNKICK") || (ci->HasExt("SIGNKICK_LEVEL") && !u_access.HasPriv("SIGNKICK"))) - c->Kick(ci->WhoSends(), u2, "%s (%s)", reason.c_str(), source.GetNick().c_str()); + { + signkickformat = signkickformat.replace_all_cs("%m", reason); + c->Kick(ci->WhoSends(), u2, "%s", signkickformat.c_str()); + } else c->Kick(ci->WhoSends(), u2, "%s", reason.c_str()); } @@ -96,7 +102,11 @@ class CommandCSKick : public Command ++kicked; if (ci->HasExt("SIGNKICK") || (ci->HasExt("SIGNKICK_LEVEL") && !u_access.HasPriv("SIGNKICK"))) - c->Kick(ci->WhoSends(), uc->user, "%s (Matches %s) (%s)", reason.c_str(), mask.c_str(), source.GetNick().c_str()); + { + reason += " (Matches " + mask + ")"; + signkickformat = signkickformat.replace_all_cs("%m", reason); + c->Kick(ci->WhoSends(), uc->user, "%s", signkickformat.c_str()); + } else c->Kick(ci->WhoSends(), uc->user, "%s (Matches %s)", reason.c_str(), mask.c_str()); } diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp index 05579da0b..fb6d9a369 100644 --- a/modules/extra/m_ldap_oper.cpp +++ b/modules/extra/m_ldap_oper.cpp @@ -6,27 +6,15 @@ static Anope::string opertype_attribute; class IdentifyInterface : public LDAPInterface { - std::map<LDAPQuery, Anope::string> requests; + Reference<User> u; public: - IdentifyInterface(Module *m) : LDAPInterface(m) + IdentifyInterface(Module *m, User *user) : LDAPInterface(m), u(user) { } - void Add(LDAPQuery id, const Anope::string &nick) - { - this->requests[id] = nick; - } - void OnResult(const LDAPResult &r) anope_override { - std::map<LDAPQuery, Anope::string>::iterator it = this->requests.find(r.id); - if (it == this->requests.end()) - return; - User *u = User::Find(it->second); - this->requests.erase(it); - - if (!u || !u->Account()) return; @@ -71,14 +59,17 @@ class IdentifyInterface : public LDAPInterface void OnError(const LDAPResult &r) anope_override { - this->requests.erase(r.id); + } + + void OnDelete() anope_override + { + delete this; } }; class LDAPOper : public Module { ServiceReference<LDAPProvider> ldap; - IdentifyInterface iinterface; Anope::string binddn; Anope::string password; @@ -86,7 +77,7 @@ class LDAPOper : public Module Anope::string filter; public: LDAPOper(const Anope::string &modname, const Anope::string &creator) : - Module(modname, creator, EXTRA | VENDOR), ldap("LDAPProvider", "ldap/main"), iinterface(this) + Module(modname, creator, EXTRA | VENDOR), ldap("LDAPProvider", "ldap/main") { } @@ -117,8 +108,7 @@ class LDAPOper : public Module if (!this->binddn.empty()) this->ldap->Bind(NULL, this->binddn.replace_all_cs("%a", u->Account()->display), this->password.c_str()); - LDAPQuery id = this->ldap->Search(&this->iinterface, this->basedn, this->filter.replace_all_cs("%a", u->Account()->display)); - this->iinterface.Add(id, u->nick); + this->ldap->Search(new IdentifyInterface(this, u), this->basedn, this->filter.replace_all_cs("%a", u->Account()->display)); } catch (const LDAPException &ex) { diff --git a/modules/m_xmlrpc.cpp b/modules/m_xmlrpc.cpp index 01300fbbb..dc80625f7 100644 --- a/modules/m_xmlrpc.cpp +++ b/modules/m_xmlrpc.cpp @@ -179,7 +179,7 @@ class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage if (!request.id.empty()) request.reply("id", request.id); - Anope::string r = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n<methodResponse>\n<methodName>" + request.name + "</methodName>\n<params>\n<param>\n<value>\n<struct>\n"; + Anope::string r = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n<methodResponse>\n<params>\n<param>\n<value>\n<struct>\n"; for (std::map<Anope::string, Anope::string>::const_iterator it = request.get_replies().begin(); it != request.get_replies().end(); ++it) r += "<member>\n<name>" + it->first + "</name>\n<value>\n<string>" + this->Sanitize(it->second) + "</string>\n</value>\n</member>\n"; r += "</struct>\n</value>\n</param>\n</params>\n</methodResponse>"; diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 3d5d2a25f..d95f09591 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -847,6 +847,49 @@ struct IRCDMessageSave : IRCDMessage } }; +class IRCDMessageMetadata : IRCDMessage +{ + ServiceReference<IRCDMessage> insp12_metadata; + const bool &do_topiclock; + const bool &do_mlock; + + public: + IRCDMessageMetadata(Module *creator, const bool &handle_topiclock, const bool &handle_mlock) : IRCDMessage(creator, "METADATA", 3), insp12_metadata("IRCDMessage", "inspircd12/metadata"), do_topiclock(handle_topiclock), do_mlock(handle_mlock) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); } + + void Run(MessageSource &source, const std::vector<Anope::string> ¶ms) anope_override + { + // We deliberately ignore non-bursting servers to avoid pseudoserver fights + if ((params[0][0] == '#') && (!source.GetServer()->IsSynced())) + { + Channel *c = Channel::Find(params[0]); + if (c && c->ci) + { + if ((do_mlock) && (params[1] == "mlock")) + { + ModeLocks *modelocks = c->ci->GetExt<ModeLocks>("modelocks"); + Anope::string modes; + if (modelocks) + modes = modelocks->GetMLockAsString(false).replace_all_cs("+", "").replace_all_cs("-", ""); + + // Mode lock string is not what we say it is? + if (modes != params[2]) + UplinkSocket::Message(Me) << "METADATA " << c->name << " mlock :" << modes; + } + else if ((do_topiclock) && (params[1] == "topiclock")) + { + bool mystate = c->ci->GetExt<bool>("TOPICLOCK"); + bool serverstate = (params[2] == "1"); + if (mystate != serverstate) + UplinkSocket::Message(Me) << "METADATA " << c->name << " topiclock :" << (mystate ? "1" : ""); + } + } + } + + if (insp12_metadata) + insp12_metadata->Run(source, params); + } +}; + class ProtoInspIRCd20 : public Module { Module *m_insp12; @@ -871,7 +914,7 @@ class ProtoInspIRCd20 : public Module /* InspIRCd 1.2 message handlers */ ServiceAlias message_endburst, message_fjoin, message_fmode, - message_ftopic, message_idle, message_metadata, message_mode, + message_ftopic, message_idle, message_mode, message_nick, message_opertype, message_rsquit, message_server, message_squit, message_time, message_uid; @@ -880,6 +923,7 @@ class ProtoInspIRCd20 : public Module IRCDMessageEncap message_encap; IRCDMessageFHost message_fhost; IRCDMessageFIdent message_fident; + IRCDMessageMetadata message_metadata; IRCDMessageSave message_save; bool use_server_side_topiclock, use_server_side_mlock; @@ -901,7 +945,6 @@ class ProtoInspIRCd20 : public Module message_fmode("IRCDMessage", "inspircd20/fmode", "inspircd12/fmode"), message_ftopic("IRCDMessage", "inspircd20/ftopic", "inspircd12/ftopic"), message_idle("IRCDMessage", "inspircd20/idle", "inspircd12/idle"), - message_metadata("IRCDMessage", "inspircd20/metadata", "inspircd12/metadata"), message_mode("IRCDMessage", "inspircd20/mode", "inspircd12/mode"), message_nick("IRCDMessage", "inspircd20/nick", "inspircd12/nick"), message_opertype("IRCDMessage", "inspircd20/opertype", "inspircd12/opertype"), @@ -911,7 +954,8 @@ class ProtoInspIRCd20 : public Module message_time("IRCDMessage", "inspircd20/time", "inspircd12/time"), message_uid("IRCDMessage", "inspircd20/uid", "inspircd12/uid"), - message_capab(this), message_encap(this), message_fhost(this), message_fident(this), message_save(this) + message_capab(this), message_encap(this), message_fhost(this), message_fident(this), message_metadata(this, use_server_side_topiclock, use_server_side_mlock), + message_save(this) { if (ModuleManager::LoadModule("inspircd12", User::Find(creator)) != MOD_ERR_OK) diff --git a/src/version.sh b/src/version.sh index 198556b24..fff3126e2 100644 --- a/src/version.sh +++ b/src/version.sh @@ -2,6 +2,6 @@ VERSION_MAJOR=2 VERSION_MINOR=0 -VERSION_PATCH=2 +VERSION_PATCH=3 VERSION_EXTRA="-git" |