deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-13 01:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make NickServ registration configurable per-network

Browse Source 
Fixes #394
This commit is contained in:
Berke Viktor
2013-04-28 21:24:53 +02:00
parent 708c5a7347
commit 0a54efdd0c
5 changed files with 105 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/modes.c
View File

@@ -816,12 +816,6 @@ inbound_005 (server * serv, char *word[])
fe_set_channel (serv->server_session);
}
/* use /NICKSERV */
if (g_ascii_strcasecmp (word[w] + 8, "UniBG") == 0)
serv->nickservtype = 3;
else if (g_ascii_strcasecmp (word[w] + 8, "QuakeNet") == 0)
serv->nickservtype = 4;
} else if (strncmp (word[w], "CASEMAPPING=", 12) == 0)
{
if (strcmp (word[w] + 12, "ascii") == 0) /* bahamut */

1
src/common/server.c
View File

@@ -1877,7 +1877,6 @@ server_set_defaults (server *serv)
serv->nick_modes = strdup ("ohv");
serv->nickcount = 1;
serv->nickservtype = 0;
serv->end_of_motd = FALSE;
serv->is_away = FALSE;
serv->supports_watch = FALSE;

26
src/common/servlist.c
View File

@@ -625,6 +625,15 @@ servlist_connect (session *sess, ircnet *net, gboolean join)
}
}
if (net->nstype >= 1) /* once again, make sure gtk_combo_box_get_active() is not bugging us, just in case */
{
serv->nickservtype = net->nstype - 1; /* ircnet->nstype starts at 1, server->nickservtype starts at 0! */
}
else
{
serv->nickservtype = 1; /* use /NickServ by default */
}
serv->password[0] = 0;
serv->sasluser[0] = 0;
serv->saslpassword[0] = 0;
@@ -1128,6 +1137,9 @@ servlist_load (void)
case 'B':
net->nickserv = strdup (buf + 2);
break;
case 'T':
net->nstype = atoi (buf + 2);
break;
}
}
if (buf[0] == 'N')
@@ -1241,6 +1253,20 @@ servlist_save (void)
fprintf (fp, "J=%s\n", net->autojoin);
if (net->nickserv)
fprintf (fp, "B=%s\n", net->nickserv);
if (net->nstype)
{
if (net->nstype == -1) /* gtk_combo_box_get_active() returns -1 for invalid indices */
{
net->nstype = 0; /* avoid further crashes for the current session */
buf = g_strdup_printf (_("Warning: invalid NickServ type. Falling back to default type for network %s."), net->name);
fe_message (buf, FE_MSG_WARN);
g_free (buf);
}
else /* the selection was fine, save it */
{
fprintf (fp, "T=%d\n", net->nstype);
}
}
if (net->encoding && g_ascii_strcasecmp (net->encoding, "System") &&
g_ascii_strcasecmp (net->encoding, "System default"))
{

1
src/common/servlist.h
View File

@@ -37,6 +37,7 @@ typedef struct ircnet
char *autojoin;
char *command;
char *nickserv;
int nstype;
char *comment;
char *encoding;
GSList *servlist;