ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/modules/m_resv.c

Comparing ircd-hybrid/trunk/modules/m_resv.c (file contents):
Revision 1622 by michael, Thu Nov 1 13:16:37 2012 UTC vs.
Revision 1628 by michael, Thu Nov 1 21:08:56 2012 UTC

#	Line 233 | Line 233 | parse_resv(struct Client *source_p, char
233
234		resv_p = map_to_conf(conf);
235		resv_p->setat = CurrentTime;
236	+	SetConfDatabase(resv_p);
237
238		if (tkline_time != 0)
239		{
#	Line 251 | Line 252 | parse_resv(struct Client *source_p, char
252		source_p->name, (int)tkline_time/60,
253		conf->name, resv_p->reason);
254		resv_p->hold = CurrentTime + tkline_time;
254	–	add_temp_line(conf);
255		}
256		else
257		{
#	Line 264 | Line 264 | parse_resv(struct Client *source_p, char
264		get_oper_name(source_p),
265		(MyClient(source_p) ? "local" : "remote"),
266		resv_p->name, resv_p->reason);
267	–	write_conf_line(source_p, conf, NULL /* not used */, 0 /* not used */);
267		}
268		}
269		else
#	Line 295 | Line 294 | parse_resv(struct Client *source_p, char
294
295		resv_p = map_to_conf(conf);
296		resv_p->setat = CurrentTime;
297	+	SetConfDatabase(resv_p);
298
299		if (tkline_time != 0)
300		{
#	Line 314 | Line 314 | parse_resv(struct Client *source_p, char
314		source_p->name, (int)tkline_time/60,
315		conf->name, resv_p->reason);
316		resv_p->hold = CurrentTime + tkline_time;
317	–	add_temp_line(conf);
317		}
318		else
319		{
#	Line 328 | Line 327 | parse_resv(struct Client *source_p, char
327		get_oper_name(source_p),
328		(MyClient(source_p) ? "local" : "remote"),
329		conf->name, resv_p->reason);
331	–	write_conf_line(source_p, conf, NULL /* not used */, 0 /* not used */);
330		}
331		}
332		}
#	Line 351 | Line 349 | remove_resv(struct Client *source_p, con
349		return;
350		}
351
352	<	if (resv_p->conf)
352	>	if (!IsConfDatabase(resv_p))
353		{
354		sendto_one(source_p,
355		":%s NOTICE %s :The RESV for channel: %s is in ircd.conf and must be removed by hand.",
#	Line 360 | Line 358 | remove_resv(struct Client *source_p, con
358		}
359
360		delete_channel_resv(resv_p);
363	–	remove_conf_line(CRESV_TYPE, source_p, name, NULL);
364	–
361		sendto_one(source_p,
362		":%s NOTICE %s :The RESV has been removed on channel: %s",
363		me.name, source_p->name, name);
#	Line 382 | Line 378 | remove_resv(struct Client *source_p, con
378
379		resv_p = map_to_conf(conf);
380
381	<	if (resv_p->action)
381	>	if (IsConfDatabase(resv_p))
382		{
383		sendto_one(source_p,
384		":%s NOTICE %s :The RESV for nick: %s is in ircd.conf and must be removed by hand.",
#	Line 391 | Line 387 | remove_resv(struct Client *source_p, con
387		}
388
389		delete_conf_item(conf);
394	–	remove_conf_line(NRESV_TYPE, source_p, name, NULL);
395	–
390		sendto_one(source_p, ":%s NOTICE %s :The RESV has been removed on nick: %s",
391		me.name, source_p->name, name);
392		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)