[srvx-commits] CVS: services/src chanserv.c,1.301,1.302
Brought to you by:
entrope
Menu
▾
▴
[srvx-commits] CVS: services/src chanserv.c,1.301,1.302
|
From: Entrope <en...@us...> - 2002-10-31 03:38:05
|
Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv7122/src
Modified Files:
chanserv.c
Log Message:
make default epithets options in srvx.conf
allow !wipeinfo self
MODCMD_REQUIRE_CHANNEL for op, deop, voice, devoice commands
Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.301
retrieving revision 1.302
diff -C2 -r1.301 -r1.302
*** chanserv.c 28 Oct 2002 02:27:49 -0000 1.301
--- chanserv.c 31 Oct 2002 03:38:01 -0000 1.302
***************
*** 49,54 ****
#define KEY_REFRESH_PERIOD "refresh_period"
#define KEY_CTCP_SHORT_BAN_DURATION "ctcp_short_ban_duration"
! #define KEY_CTCP_LONG_BAN_DURATION "ctcp_long_ban_duration"
! #define KEY_MAX_OWNED "max_owned"
/* ChanServ database */
--- 49,57 ----
#define KEY_REFRESH_PERIOD "refresh_period"
#define KEY_CTCP_SHORT_BAN_DURATION "ctcp_short_ban_duration"
! #define KEY_CTCP_LONG_BAN_DURATION "ctcp_long_ban_duration"
! #define KEY_MAX_OWNED "max_owned"
! #define KEY_IRC_OPERATOR_EPITHET "irc_operator_epithet"
! #define KEY_NETWORK_HELPER_EPITHET "network_helper_epithet"
! #define KEY_SUPPORT_HELPER_EPITHET "support_helper_epithet"
/* ChanServ database */
***************
*** 290,295 ****
#define CSMSG_HELPER_NO_ACCESS "%s lacks access to %s but has $bsecurity override$b enabled."
#define CSMSG_HELPER_HAS_ACCESS "%s is %s $b%s$b in %s and has $bsecurity override$b enabled."
! #define CSMSG_LAZY_SMURF_TARGET "%s is a megalomaniacal power hungry tyrant ($bIRCOp$b; not logged in)."
! #define CSMSG_LAZY_LAME_SMURF_TARGET "%s is an IRCOp (not logged in)."
#define CSMSG_SMURF_TARGET "%s is %s ($b%s$b)."
#define CSMSG_LAME_SMURF_TARGET "%s is %s %s."
--- 293,297 ----
#define CSMSG_HELPER_NO_ACCESS "%s lacks access to %s but has $bsecurity override$b enabled."
#define CSMSG_HELPER_HAS_ACCESS "%s is %s $b%s$b in %s and has $bsecurity override$b enabled."
! #define CSMSG_LAZY_SMURF_TARGET "%s is %s ($bIRCOp$b; not logged in)."
#define CSMSG_SMURF_TARGET "%s is %s ($b%s$b)."
#define CSMSG_LAME_SMURF_TARGET "%s is %s %s."
***************
*** 408,413 ****
static int eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, unsigned char *argv[], struct svccmd *cmd, int action);
- extern time_t boot_time;
-
struct userNode *chanserv;
dict_t note_types;
--- 410,413 ----
***************
*** 443,446 ****
--- 443,450 ----
const char *ctcp_short_ban_duration;
const char *ctcp_long_ban_duration;
+
+ const char *irc_operator_epithet;
+ const char *network_helper_epithet;
+ const char *support_helper_epithet;
} chanserv_conf;
***************
*** 3390,3394 ****
if(IsOper(target))
{
! chanserv_notice(user, CSMSG_LAZY_SMURF_TARGET, target->nick);
return 0;
}
--- 3394,3398 ----
if(IsOper(target))
{
! chanserv_notice(user, CSMSG_LAZY_SMURF_TARGET, chanserv_conf.irc_operator_epithet, target->nick);
return 0;
}
***************
*** 3407,3421 ****
if(IsOper(target))
{
! epithet = "a megalomaniacal power hungry tyrant";
type = "IRCOp";
}
else if(IsNetworkHelper(target))
{
! epithet = "a wannabe tyrant";
type = "network helper";
}
else if(IsSupportHelper(target))
{
! epithet = "a wannabe tyrant";
type = "support helper";
}
--- 3411,3425 ----
if(IsOper(target))
{
! epithet = chanserv_conf.irc_operator_epithet;
type = "IRCOp";
}
else if(IsNetworkHelper(target))
{
! epithet = chanserv_conf.network_helper_epithet;
type = "network helper";
}
else if(IsSupportHelper(target))
{
! epithet = chanserv_conf.support_helper_epithet;
type = "support helper";
}
***************
*** 4109,4112 ****
--- 4113,4117 ----
static CHANSERV_FUNC(cmd_netinfo)
{
+ extern time_t boot_time;
extern unsigned long burst_length;
char interval[INTERVALLEN];
***************
*** 4288,4292 ****
return 0;
}
! if(ud->access >= actor->access)
{
reply(MSG_USER_OUTRANKED, victim->handle);
--- 4293,4297 ----
return 0;
}
! if((ud->access >= actor->access) && (ud != actor))
{
reply(MSG_USER_OUTRANKED, victim->handle);
***************
*** 6429,6432 ****
--- 6434,6443 ----
str = database_get_data(conf_node, KEY_MAX_OWNED, RECDB_QSTRING);
chanserv_conf.max_owned = str ? atoi(str) : 5;
+ str = database_get_data(conf_node, KEY_IRC_OPERATOR_EPITHET, RECDB_QSTRING);
+ chanserv_conf.irc_operator_epithet = str ? str : "a megalomaniacal power hungry tyrant";
+ str = database_get_data(conf_node, KEY_NETWORK_HELPER_EPITHET, RECDB_QSTRING);
+ chanserv_conf.network_helper_epithet = str ? str : "a wannabe tyrant";
+ str = database_get_data(conf_node, KEY_SUPPORT_HELPER_EPITHET, RECDB_QSTRING);
+ chanserv_conf.support_helper_epithet = str ? str : "a wannabe tyrant";
free_string_list(chanserv_conf.set_shows);
strlist = database_get_data(conf_node, "set_shows", RECDB_STRING_LIST);
***************
*** 7135,7142 ****
DEFINE_COMMAND(upall, 1, MODCMD_REQUIRE_AUTHED, NULL);
DEFINE_COMMAND(downall, 1, MODCMD_REQUIRE_AUTHED, NULL);
! DEFINE_COMMAND(op, 2, 0, "access", "op", NULL);
! DEFINE_COMMAND(deop, 2, 0, "template", "op", NULL);
! DEFINE_COMMAND(voice, 2, 0, "template", "op", NULL);
! DEFINE_COMMAND(devoice, 2, 0, "template", "op", NULL);
DEFINE_COMMAND(kickban, 2, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
--- 7146,7153 ----
DEFINE_COMMAND(upall, 1, MODCMD_REQUIRE_AUTHED, NULL);
DEFINE_COMMAND(downall, 1, MODCMD_REQUIRE_AUTHED, NULL);
! DEFINE_COMMAND(op, 2, MODCMD_REQUIRE_CHANNEL, "access", "op", NULL);
! DEFINE_COMMAND(deop, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
! DEFINE_COMMAND(voice, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
! DEFINE_COMMAND(devoice, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
DEFINE_COMMAND(kickban, 2, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
|
