Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv8242/src
Modified Files:
channel.c
Log Message:
Code Cleanup
Index: channel.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** channel.c 1 Oct 2006 21:27:59 -0000 1.22
--- channel.c 9 Apr 2007 16:01:10 -0000 1.23
***************
*** 1091,1096 ****
if (chptr->mode.mode & MODE_OPERONLY)
*mbuf++ = 'O';
- if (chptr->mode.mode & MODE_ADMINONLY)
- *mbuf++ = 'A';
#ifdef HAVE_SSL
if (chptr->mode.mode & MODE_SSL)
--- 1091,1094 ----
***************
*** 1515,1519 ****
MODE_TOPICLIMIT, 't', MODE_REGONLY, 'R',
MODE_INVITEONLY, 'i', MODE_NOCTRL, 'c', MODE_OPERONLY, 'O',
! MODE_MODREG, 'M', MODE_NONICK, 'N', MODE_ADMINONLY, 'A',
#ifdef ENABLE_CHANNEL_MODE_D
--- 1513,1517 ----
MODE_TOPICLIMIT, 't', MODE_REGONLY, 'R',
MODE_INVITEONLY, 'i', MODE_NOCTRL, 'c', MODE_OPERONLY, 'O',
! MODE_MODREG, 'M', MODE_NONICK, 'N',
#ifdef ENABLE_CHANNEL_MODE_D
***************
*** 1627,1631 ****
* +D will prevent users who have been marke as unresolved clients, from joining the channel.
* This is one of my favorite modes. -Sheik June 05 2005.
! * This mode is not finished yet so don't enable it -Sheik
*/
--- 1625,1629 ----
* +D will prevent users who have been marke as unresolved clients, from joining the channel.
* This is one of my favorite modes. -Sheik June 05 2005.
! * This mode is not finished yet so don't enable it -Sheik
*/
***************
*** 1653,1677 ****
break;
#endif
- case 'A':
- if (!IsULine(sptr) && (level<2 || !IsAdmin(sptr)))
- {
- errors |= SM_ERR_NOTOPER;
- break;
- }
- else if (MyClient(sptr) && !IsAdmin(sptr))
- {
- errors |= SM_ERR_NOTOPER;
- break;
- }
- else
- {
- if (change=='+')
- chptr->mode.mode|=MODE_ADMINONLY;
- else
- chptr->mode.mode&=~MODE_ADMINONLY;
- *mbuf++ = *modes;
- nmodes++;
- }
- break;
case 'O':
--- 1651,1654 ----
***************
*** 2520,2528 ****
error = ERR_INVITEONLYCHAN;
}
- else if (chptr->mode.mode &MODE_ADMINONLY && !IsAdmin(sptr))
- {
- r = "+A";
- error = ERR_INVITEONLYCHAN;
- }
else if (chptr->mode.limit && chptr->users >= chptr->mode.limit)
{
--- 2497,2500 ----
***************
*** 2606,2611 ****
if (chptr->mode.mode & MODE_OPERONLY && !IsOper(sptr))
reasonbuf[rbufpos++] = 'O';
- if (chptr->mode.mode & MODE_ADMINONLY && !IsAdmin(sptr))
- reasonbuf[rbufpos++] = 'A';
if (*chptr->mode.key && (BadPtr(key) || mycmp(chptr->mode.key, key)))
reasonbuf[rbufpos++] = 'k';
--- 2578,2581 ----
***************
*** 4692,4696 ****
SJ_MODEADD('c', MODE_NOCTRL);
SJ_MODEADD('O', MODE_OPERONLY);
! SJ_MODEADD('A', MODE_ADMINONLY);
#ifdef HAVE_SSL
SJ_MODEADD('S', MODE_SSL);
--- 4662,4666 ----
SJ_MODEADD('c', MODE_NOCTRL);
SJ_MODEADD('O', MODE_OPERONLY);
!
#ifdef HAVE_SSL
SJ_MODEADD('S', MODE_SSL);
***************
*** 4860,4864 ****
SJ_MODEPLUS('c', MODE_NOCTRL);
SJ_MODEPLUS('O', MODE_OPERONLY);
! SJ_MODEPLUS('A', MODE_ADMINONLY);
#ifdef HAVE_SSL
SJ_MODEPLUS('S', MODE_SSL);
--- 4830,4834 ----
SJ_MODEPLUS('c', MODE_NOCTRL);
SJ_MODEPLUS('O', MODE_OPERONLY);
!
#ifdef HAVE_SSL
SJ_MODEPLUS('S', MODE_SSL);
***************
*** 4885,4889 ****
SJ_MODEMINUS('c', MODE_NOCTRL);
SJ_MODEMINUS('O', MODE_OPERONLY);
! SJ_MODEMINUS('A', MODE_ADMINONLY);
#ifdef HAVE_SSL
SJ_MODEMINUS('S', MODE_SSL);
--- 4855,4859 ----
SJ_MODEMINUS('c', MODE_NOCTRL);
SJ_MODEMINUS('O', MODE_OPERONLY);
!
#ifdef HAVE_SSL
SJ_MODEMINUS('S', MODE_SSL);
|
