From: splidge Date: Wed, 12 Mar 2008 22:44:27 +0000 (+0000) Subject: Re-disable infolines. Removed most references and flags also. X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/3a744b8f6e6a609e65d8075a4c86463fcc499932 Re-disable infolines. Removed most references and flags also. --- diff --git a/chanserv/chanserv.h b/chanserv/chanserv.h index 27a6d3d5..35c5389c 100644 --- a/chanserv/chanserv.h +++ b/chanserv/chanserv.h @@ -455,7 +455,7 @@ #define QCFLAG_USERCONTROL (QCFLAG_AUTOOP|QCFLAG_BITCH|QCFLAG_AUTOLIMIT| \ QCFLAG_ENFORCE|QCFLAG_FORCETOPIC|QCFLAG_AUTOVOICE| \ QCFLAG_PROTECT|QCFLAG_TOPICSAVE|QCFLAG_VOICEALL| \ - QCFLAG_WELCOME|QCFLAG_KNOWNONLY|QCFLAG_INFO) + QCFLAG_WELCOME|QCFLAG_KNOWNONLY) #define QCFLAG_ALL 0x7fff @@ -489,8 +489,8 @@ #define QCUFLAG_SELFCON (QCUFLAG_OP | QCUFLAG_VOICE | QCUFLAG_AUTOOP | QCUFLAG_AUTOVOICE | \ QCUFLAG_TOPIC | QCUFLAG_INFO) -#define QCUFLAGS_PUNISH (QCUFLAG_BANNED | QCUFLAG_QUIET | QCUFLAG_DENY | QCUFLAG_NOINFO) -#define QCUFLAGS_PERSONAL (QCUFLAG_INFO | QCUFLAG_HIDEWELCOME | QCUFLAG_AUTOINVITE) +#define QCUFLAGS_PUNISH (QCUFLAG_BANNED | QCUFLAG_QUIET | QCUFLAG_DENY) +#define QCUFLAGS_PERSONAL (QCUFLAG_HIDEWELCOME | QCUFLAG_AUTOINVITE) #define QCUFLAG_ALL 0xffff diff --git a/chanserv/database/chanservdb_messages.c b/chanserv/database/chanservdb_messages.c index d6457b40..966f760d 100644 --- a/chanserv/database/chanservdb_messages.c +++ b/chanserv/database/chanservdb_messages.c @@ -24,7 +24,7 @@ char *defaultmessages[MAXMESSAGES] = { /* 15 */ "User %s is not authed.", /* 16 */ "Known users on %s:", /* 17 */ "Username Flags", - /* 18 */ "Username Flags Last join Last changed Info", + /* 18 */ "Username Flags Last join Last changed ", /* 19 */ "No known users found on %s.", /* 20 */ "Flags for %s on %s: %s", /* 21 */ "User %s is not known on %s.", diff --git a/chanserv/usercmds/commandlist.c b/chanserv/usercmds/commandlist.c index f0e486bc..922cb085 100644 --- a/chanserv/usercmds/commandlist.c +++ b/chanserv/usercmds/commandlist.c @@ -33,7 +33,7 @@ void _init() { chanservaddcommand("cleanupdb", QCMD_DEV, 0, csu_docleanupdb, "Clean up database.", "Usage: cleanupdb\nCleans up inactive accounts, unused accounts and inactive channels.\n"); chanservaddcommand("deluser", QCMD_OPER, 2, csu_dodeluser, "Removes a user from the bot.", "Usage: deluser \nRemoves the specified username from the bot.\n"); chanservaddcommand("domainmode", QCMD_OPER, 4, csu_dodomainmode, "Set/Unset Mail Domain Modes", "Usage: domainmode []\nViews or modifies the domainmode flags for specified domain.\nFlags consist of:\n +b don't allow email addresses from this domain.\n +u don't allow more than accounts to share\n email addresses on this domain.\n +l don't allow more than accounts with\n email addresses on this domain.\nNote that domains are hierarchical, so setting +b on org will\nprevent operations from quakenet.org, fish.quakenet.org, etc.\n"); - chanservaddcommand("info", QCMD_AUTHED, 2, csu_doinfo, "Shows or changes info line.", "Usage: INFO [] []\nShows or updates your current info line, which can be configured to be displayed\nwhen you join a channel. Where:\nchannel - channel to set info line on. If no channel is specified, your default\n info line will be used. If a channel is specified you must be known\n (+k) on the channel.\ninfo line - new info line to set. If not specified, the current info line will be\n displayed. If \"none\" is specified, the info line will be cleared.\n"); + chanservaddcommand("info", QCMD_AUTHED | QCMD_OPER, 2, csu_doinfo, "Shows or changes info line.", "Usage: INFO [] []\nShows or updates your current info line, which can be configured to be displayed\nwhen you join a channel. Where:\nchannel - channel to set info line on. If no channel is specified, your default\n info line will be used. If a channel is specified you must be known\n (+k) on the channel.\ninfo line - new info line to set. If not specified, the current info line will be\n displayed. If \"none\" is specified, the info line will be cleared.\n"); chanservaddcommand("language", QCMD_AUTHED | QCMD_OPER, 1, csu_dolanguage, "Shows or changes your current language.", "Usage: language []\nShows your currently selected language and a list of others\nby default, changes your language when you specify a language code.\n"); chanservaddcommand("listflags", QCMD_OPER, 1, csu_dolistflags, "List users with the specified user flags.", "Usage: listflags \nShows a list of all users with the specified user flags.\n"); chanservaddcommand("maillock", QCMD_OPER, 3, csu_domaillock, "Set/unset/list mail lock patterns", "Usage: maillock <-list|-add|-del> []\nManipulates the list of mail lock patterns.\nAny email address matching the pattern will be refused in HELLO/EMAIL.\nA reason is optional for -list, but recommended.\n"); diff --git a/chanserv/usercmds/info.c b/chanserv/usercmds/info.c index 02e1f306..ca959f61 100644 --- a/chanserv/usercmds/info.c +++ b/chanserv/usercmds/info.c @@ -2,7 +2,7 @@ * * * CMDNAME: info - * CMDLEVEL: QCMD_AUTHED + * CMDLEVEL: QCMD_AUTHED | QCMD_OPER * CMDARGS: 2 * CMDDESC: Shows or changes info line. * CMDFUNC: csu_doinfo diff --git a/chanserv/usercmds/userflags.c b/chanserv/usercmds/userflags.c index 9cc7a1cb..503dbe1a 100644 --- a/chanserv/usercmds/userflags.c +++ b/chanserv/usercmds/userflags.c @@ -56,7 +56,7 @@ int csu_douserflags(void *source, int cargc, char **cargv) { strcpy(flagbuf,printflags(target->flags, ruflags)); oldflags=target->flags; - changemask=QUFLAG_NOTICE | QUFLAG_INFO; + changemask=QUFLAG_NOTICE; if (target==rup) { /* If you're changing yourself, you can give up the "status" flags and add/remove notice */ diff --git a/chanserv/usercmds/whois.c b/chanserv/usercmds/whois.c index 9eedd2a6..4b6dbb15 100644 --- a/chanserv/usercmds/whois.c +++ b/chanserv/usercmds/whois.c @@ -129,7 +129,7 @@ int csu_dowhois(void *source, int cargc, char **cargv) { chanservstdmessage(sender, QM_WHOIS_EMAILSET, buf); } - if (target->info) { + if (target->info && *target->info->content) { chanservstdmessage(sender, QM_WHOIS_INFO, target->info->content); }