diff options
| -rw-r--r-- | Changes | 2 | ||||
| -rw-r--r-- | Changes.lang | 2 | ||||
| -rw-r--r-- | include/extern.h | 1 | ||||
| -rw-r--r-- | include/version.sh | 2 | ||||
| -rw-r--r-- | lang/cat.l | 4 | ||||
| -rw-r--r-- | lang/de.l | 4 | ||||
| -rw-r--r-- | lang/en_us.l | 4 | ||||
| -rw-r--r-- | lang/es.l | 18 | ||||
| -rw-r--r-- | lang/fr.l | 4 | ||||
| -rw-r--r-- | lang/gr.l | 4 | ||||
| -rw-r--r-- | lang/hun.l | 4 | ||||
| -rw-r--r-- | lang/it.l | 4 | ||||
| -rw-r--r-- | lang/nl.l | 4 | ||||
| -rw-r--r-- | lang/pl.l | 4 | ||||
| -rw-r--r-- | lang/pt.l | 4 | ||||
| -rw-r--r-- | lang/ru.l | 4 | ||||
| -rw-r--r-- | lang/tr.l | 4 | ||||
| -rw-r--r-- | src/main.c | 1 | ||||
| -rw-r--r-- | src/operserv.c | 22 | ||||
| -rw-r--r-- | src/ptlink.c | 6 | ||||
| -rw-r--r-- | version.log | 7 |
21 files changed, 94 insertions, 15 deletions
@@ -10,6 +10,7 @@ Provided by Trystan <trystan@nomadirc.net> - 2004 11/21 A Opened SGLINE to all ircd that support GEOS bans [ #00] 11/21 A Opened SZLINE to all ircd that support ZLINE's [ #00] 11/19 A Added anope_cmd_ctcp() to code API, for sending CTCP messages. [ #00] +11/23 F PTLink anope_cmd_server() message [ #00] 11/20 F Disables UseRDB if there is an error duing SQL init [ #00] 11/20 F MS CHECK now checks if the nick is forbidden. [#225] 11/20 F Removing Sqline on bot nicks change if the nick was registered. [#224] @@ -19,6 +20,7 @@ Provided by Trystan <trystan@nomadirc.net> - 2004 11/16 F NickTracking could allow usage of forbidden nick in some cases. [ #00] Provided by DrStein <gacevedo@anope.org> - 2004 +11/23 F Moving Services Operators to Services Admins and vice-versa [#230] 11/22 F HelpChan +h mode not being given if status was greater then op. [#223] Anope Version 1.7.6 diff --git a/Changes.lang b/Changes.lang index 200bf02f4..3a713e46c 100644 --- a/Changes.lang +++ b/Changes.lang @@ -3,6 +3,8 @@ Anope Version S V N *** New Strings: NICK_REGISTERED_NO_MASK + OPER_ADMIN_MOVED + OPER_OPER_MOVED *** Mod Strings: diff --git a/include/extern.h b/include/extern.h index 9c8a889a3..31b37a8cf 100644 --- a/include/extern.h +++ b/include/extern.h @@ -578,6 +578,7 @@ E int MailValidate(const char *email); /**** main.c ****/ E const char version_number[]; +E const char version_number_dotted[]; E const char version_build[]; E const char version_protocol[]; E const char version_flags[]; diff --git a/include/version.sh b/include/version.sh index ccb176369..0dd82c693 100644 --- a/include/version.sh +++ b/include/version.sh @@ -13,6 +13,7 @@ else fi VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_EXTRA} (${VERSION_BUILD})" +VERSIONDOTTED="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_EXTRA}.${VERSION_BUILD}" if [ -f version.h ] ; then BUILD=`fgrep '#define BUILD' version.h | sed 's/^#define BUILD.*\([0-9]*\).*$/\1/'` @@ -49,6 +50,7 @@ cat >version.h <<EOF #define BUILD "$BUILD" #define VERSION_STRING "$VERSION" +#define VERSION_STRING_DOTTED "$VERSIONDOTTED" #ifdef DEBUG_COMMANDS # define VER_DEBUG "D" diff --git a/lang/cat.l b/lang/cat.l index d040de11f..49d242b39 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -2437,6 +2437,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR La llista d'administradors de serveis ha estat netegada. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2468,6 +2470,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR La llista d'operadors de serveis ha estat netegada. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX @@ -2427,6 +2427,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR Die Liste der Services Administratoren wurde geleert. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2458,6 +2460,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR Die Liste der Services Operatoren wurde geleert. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX diff --git a/lang/en_us.l b/lang/en_us.l index 08fea4294..b9915434f 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -2370,6 +2370,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR Services admin list has been cleared. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2401,6 +2403,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR Services operator list has been cleared. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX @@ -333,13 +333,13 @@ NICK_ALREADY_REGISTERED NICK_REGISTERED El nickname %s esta registrado bajo tu cuenta: %s NICK_REGISTERED_NO_MASK - Nickname %s registered. + Nickname %s registrado. NICK_PASSWORD_IS Tu clave es %s - Recuerdala para uso futuro. # GROUP responses NICK_REG_DELAY - You have to be connected longer than %d seconds to register your nick. + Debes estar conectado mas de %d segundos para registrar tu nick. # GROUP responses NICK_GROUP_SYNTAX @@ -891,9 +891,9 @@ CHAN_REGISTERED CHAN_PASSWORD_IS Tu clave para el canal es %s - Recuerdala para uso futuro. CHAN_REGISTER_NONE_CHANNEL - You have attempted to register a none existant channel %s + Has intentado registrar el canal %s, el cual no existe. CHAN_SYMBOL_REQUIRED - Please use the symbol of # or & when attempting to register + Por favor usar el simbolo # o & cuando intentes registrar un canal. # IDENTIFY responses @@ -2416,6 +2416,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR La lista de administradores de Servicios ha sido limpiada. +OPER_ADMIN_MOVED + %s ha sido movido a la lista de Administradores de Servicios. # OPER responses OPER_OPER_SYNTAX @@ -2447,6 +2449,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR La lista de operadores de Servicios ha sido limpiada. +OPER_OPER_MOVED + %s ha sido movido a la lista de Operadores de Servicios. # AKILL responses OPER_AKILL_SYNTAX @@ -6108,9 +6112,9 @@ BOT_SERVADMIN_HELP_BOT BOT LIST es un alias de BOTLIST y solo lista todos los bots disponibles en la red. - Notese: si creas un bot con un nick ya registrado, - sera botado. Ademas, si un usuario esta actualmente - usando el nick, sera killeado. + Nota:: no puedes crear un bot que tenga un nick que ya + este registrado. Si un usuario no registrado esta usando + el nick, sera killeado. BOT_SERVADMIN_HELP_SET @@ -2448,6 +2448,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR La liste des Services admins a été vidée. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2479,6 +2481,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR La liste des Services operators a été vidée. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX @@ -2426,6 +2426,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR Ç ëßóôá ôùí õðçñåóéþí êáèáñßóôçêå. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2457,6 +2459,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR Ç ëßóôá ôùí operators êáèáñßóôçêå. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX diff --git a/lang/hun.l b/lang/hun.l index 96ac03587..766fb319e 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -2387,6 +2387,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR Szervíz admin lista törölve. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER válaszok OPER_OPER_SYNTAX @@ -2418,6 +2420,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR Szervíz operátor lista törölve. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL válaszok OPER_AKILL_SYNTAX @@ -2433,6 +2433,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR La lista dei Services admin è stata svuotata. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2464,6 +2466,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR La lista dei Services oper è stata svuotata. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX @@ -2403,6 +2403,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR Services admin lijst is leeggemaakt. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2434,6 +2436,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR Services operator lijst is leeggemaakt. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX @@ -2607,6 +2607,8 @@ OPER_ADMIN_LIST_FORMAT OPER_ADMIN_CLEAR Lista administratorów serwisów zosta³a wyczyszczona. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2639,6 +2641,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR Lista operatorów serwisów zosta³a wyczyszczona. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX @@ -2428,6 +2428,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR Lista de Administradores dos Services foi apagada. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2459,6 +2461,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR A lista de Operadores dos Services foi apagada. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX @@ -2400,6 +2400,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR Ñïèñîê Àäìèíèñòðàòîðîâ ñåðâèñîâ î÷èùåí. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2431,6 +2433,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR Ñïèñîê Îïåðàòîðîâ ñåðâèñîâ î÷èùåí. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX @@ -2431,6 +2431,8 @@ OPER_ADMIN_LIST_FORMAT %3d %s OPER_ADMIN_CLEAR Servis adminleri listesi temizlendi. +OPER_ADMIN_MOVED + %s has been moved to Services Administrators list. # OPER responses OPER_OPER_SYNTAX @@ -2462,6 +2464,8 @@ OPER_OPER_LIST_FORMAT %3d %s OPER_OPER_CLEAR Servis operatörleri listesi temizlendi. +OPER_OPER_MOVED + %s has been moved to Services Operators list. # AKILL responses OPER_AKILL_SYNTAX diff --git a/src/main.c b/src/main.c index ebcbe22fd..46d03a0ab 100644 --- a/src/main.c +++ b/src/main.c @@ -77,6 +77,7 @@ char **my_av, **my_envp; /* Moved here from version.h */ const char version_number[] = VERSION_STRING; +const char version_number_dotted[] = VERSION_STRING_DOTTED; const char version_build[] = "build #" BUILD ", compiled " __DATE__ " " __TIME__; /* the space is needed cause if you build with nothing it will complain */ diff --git a/src/operserv.c b/src/operserv.c index 739ea2685..025005d44 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -4040,8 +4040,15 @@ static int do_admin(User * u) notice_lang(s_OperServ, u, OPER_ADMIN_REACHED_LIMIT, nick); return MOD_CONT; } else { - na->nc->flags |= NI_SERVICES_ADMIN; - notice_lang(s_OperServ, u, OPER_ADMIN_ADDED, nick); + if (na->nc->flags & NI_SERVICES_OPER + && (res = slist_indexof(&servopers, na->nc)) != -1) { + slist_delete(&servopers, res); + na->nc->flags |= NI_SERVICES_ADMIN; + notice_lang(s_OperServ, u, OPER_ADMIN_MOVED, nick); + } else { + na->nc->flags |= NI_SERVICES_ADMIN; + notice_lang(s_OperServ, u, OPER_ADMIN_ADDED, nick); + } } if (readonly) @@ -4329,8 +4336,15 @@ static int do_oper(User * u) notice_lang(s_OperServ, u, OPER_OPER_REACHED_LIMIT, nick); return MOD_CONT; } else { - na->nc->flags |= NI_SERVICES_OPER; - notice_lang(s_OperServ, u, OPER_OPER_ADDED, nick); + if (na->nc->flags & NI_SERVICES_ADMIN + && (res = slist_indexof(&servadmins, na->nc)) != -1) { + slist_delete(&servadmins, res); + na->nc->flags |= NI_SERVICES_OPER; + notice_lang(s_OperServ, u, OPER_OPER_MOVED, nick); + } else { + na->nc->flags |= NI_SERVICES_OPER; + notice_lang(s_OperServ, u, OPER_OPER_ADDED, nick); + } } if (readonly) diff --git a/src/ptlink.c b/src/ptlink.c index f4744b2e4..5f6ea4220 100644 --- a/src/ptlink.c +++ b/src/ptlink.c @@ -16,7 +16,7 @@ #ifdef IRC_PTLINK -const char version_protocol[] = "PTlink 6.14.5+"; +const char version_protocol[] = "PTlink 6.15.*+"; /* Not all ircds use +f for their flood/join throttle system */ const char flood_mode_char_set[] = "+f"; /* mode char for FLOOD mode on set */ @@ -24,7 +24,7 @@ const char flood_mode_char_remove[] = "-f"; /* mode char for FLOOD mode on r int UseTSMODE = 0; IRCDVar ircd[] = { - {"PTlinkIRCd 6.14.*", /* ircd name */ + {"PTlink 6.15.*+", /* ircd name */ "+o", /* nickserv mode */ "+o", /* chanserv mode */ "+o", /* memoserv mode */ @@ -789,7 +789,7 @@ void anope_cmd_capab() void anope_cmd_server(char *servname, int hop, char *descript) { send_cmd(NULL, "SERVER %s %d Anope.Services%s :%s", servname, hop, - version_number, descript); + version_number_dotted, descript); } int anope_event_privmsg(char *source, int ac, char **av) diff --git a/version.log b/version.log index 791643459..6be4f2372 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,15 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="6" -VERSION_BUILD="460" +VERSION_BUILD="461" # $Log$ # +# BUILD : 1.7.6 (461) +# BUGS : 230 +# NOTES : 1. Moving Services Operators to Services Admins and vice-versa (230), 2. PTlink anope_cmd_server() had a minor +# issue thats now fixed +# # BUILD : 1.7.6 (460) # BUGS : 223 # NOTES : HelpChan +h mode not being given if status was greater then op. |