[Solidircd-CVS] solidircd-stable/src channel.c, 1.20, 1.21 s_err.c, 1.2, 1.3 s_misc.c, 1.8, 1.9 s_user.c, 1.25, 1.26 whowas.c, 1.4, 1.5

[Gabriel B. <sh...@us...>]

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21566/src

Modified Files:
	channel.c s_err.c s_misc.c s_user.c whowas.c 
Log Message:
Review CHANGES file for more details

Index: channel.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** channel.c	26 Jun 2006 14:17:03 -0000	1.20
--- channel.c	1 Oct 2006 21:04:57 -0000	1.21
***************
*** 1091,1102 ****
--- 1091,1106 ----
      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)
          *mbuf++ = 'S';
  #endif
+ /* This mode is not finished yet so don't enable it. -Sheik */
  #ifdef ENABLE_CHANNEL_MODE_D
      if (chptr->mode.mode & MODE_RSL)
          *mbuf++ = 'D';
  #endif
+ /* End */
     if (chptr->mode.mode & MODE_NONICK)
  	*mbuf++ = 'N'; 
***************
*** 1511,1518 ****
          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			
! 	MODE_RSL,  'D',
  #endif
  
--- 1515,1522 ----
          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			
! 		MODE_RSL,  'D',
  #endif
  
***************
*** 1623,1626 ****
--- 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
              */
  
***************
*** 1648,1651 ****
--- 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':
***************
*** 1670,1673 ****
--- 1696,1700 ----
              }
              break;
+ 
            case 'o':
              if (check_level(level,2,chptr,sptr))
***************
*** 2438,2442 ****
  }
  
! /* This function allows Admins & IRCops to  walk bans etc... -Sheik 04/14/03 */
  
  static int can_walk(aClient *sptr, aChannel *chptr) {
--- 2465,2469 ----
  }
  
! /* This function allows Admins & IRCops to  walk bans etc... -Sheik 14/04/2006 */
  
  static int can_walk(aClient *sptr, aChannel *chptr) {
***************
*** 2574,2577 ****
--- 2601,2606 ----
      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';
***************
*** 4658,4661 ****
--- 4687,4691 ----
              SJ_MODEADD('c', MODE_NOCTRL);
              SJ_MODEADD('O', MODE_OPERONLY);
+ 			SJ_MODEADD('A', MODE_ADMINONLY);
  #ifdef HAVE_SSL
              SJ_MODEADD('S', MODE_SSL);
***************
*** 4825,4828 ****
--- 4855,4859 ----
          SJ_MODEPLUS('c', MODE_NOCTRL);
          SJ_MODEPLUS('O', MODE_OPERONLY);
+ 		SJ_MODEPLUS('A', MODE_ADMINONLY);
  #ifdef HAVE_SSL
          SJ_MODEPLUS('S', MODE_SSL);
***************
*** 4849,4852 ****
--- 4880,4884 ----
          SJ_MODEMINUS('c', MODE_NOCTRL);
          SJ_MODEMINUS('O', MODE_OPERONLY);
+ 		SJ_MODEMINUS('A', MODE_ADMINONLY);
  #ifdef HAVE_SSL
          SJ_MODEMINUS('S', MODE_SSL);

Index: s_misc.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_misc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** s_misc.c	1 Jan 2006 00:55:22 -0000	1.8
--- s_misc.c	1 Oct 2006 21:04:57 -0000	1.9
***************
*** 532,537 ****
      char splitname[HOSTLEN + HOSTLEN + 2];
  
! #ifdef HIDE_SPLIT_SERVERS
!     ircsprintf(splitname, "%s %s", HIDDEN_SERVER_NAME, HIDDEN_SERVER_NAME);
  #else
      ircsprintf(splitname, "%s %s", cptr->uplink->name, cptr->name);
--- 532,537 ----
      char splitname[HOSTLEN + HOSTLEN + 2];
  
! #ifdef HIDE_SPLIT_SERVERS   /* Is this correct? I can't remember I'll check it later -Sheik */
!     ircsprintf(splitname, "%s %s", HiddenServName, HiddenServName);
  #else
      ircsprintf(splitname, "%s %s", cptr->uplink->name, cptr->name);

Index: whowas.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/whowas.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** whowas.c	9 Jul 2005 01:22:50 -0000	1.4
--- whowas.c	1 Oct 2006 21:04:57 -0000	1.5
***************
*** 158,162 ****
  		    sendto_one(sptr, rpl_str(RPL_WHOISSERVER),
  			       me.name, parv[0], temp->name,
! 			      HIDDEN_SERVER_NAME, myctime(temp->logoff));
  		else
  		    sendto_one(sptr, rpl_str(RPL_WHOISSERVER),
--- 158,162 ----
  		    sendto_one(sptr, rpl_str(RPL_WHOISSERVER),
  			       me.name, parv[0], temp->name,
! 			      HiddenServName, myctime(temp->logoff));
  		else
  		    sendto_one(sptr, rpl_str(RPL_WHOISSERVER),

Index: s_user.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** s_user.c	25 Jun 2006 22:53:01 -0000	1.25
--- s_user.c	1 Oct 2006 21:04:57 -0000	1.26
***************
*** 2249,2252 ****
--- 2249,2254 ----
                  if (is_chan_op(acptr, chptr))
                      *(buf + len++) = '@';
+ 				 if (is_halfop(acptr, chptr))
+                  *(buf + len++) = '%';
                  else if (has_voice(acptr, chptr))
                      *(buf + len++) = '+';
***************
*** 2260,2263 ****
--- 2262,2266 ----
          }
  
+ 
          if (buf[0] != '\0')
              sendto_one(sptr, rpl_str(RPL_WHOISCHANNELS), me.name, 

Index: s_err.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_err.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** s_err.c	4 Dec 2005 08:43:13 -0000	1.2
--- s_err.c	1 Oct 2006 21:04:57 -0000	1.3
***************
*** 301,305 ****
      /* 273 */	                NULL,
      /* 274 */	                NULL,
!     /* 275 RPL_ISSSL */         ":%s 275 %s %s :is a \2Secure Connection\2 (SSL)",
      /* 276 RPL_ISRSL */	        ":%s 275 %s %s :is a \2Resolved Connection\2",
      /* 277 ISNOTRSL*/	        ":%s 275 %s %s :is a \2Unresolved Connection\2",
--- 301,305 ----
      /* 273 */	                NULL,
      /* 274 */	                NULL,
!     /* 275 RPL_ISSSL */         ":%s 275 %s %s :is using a \2Secure Connection\2 (SSL)",
      /* 276 RPL_ISRSL */	        ":%s 275 %s %s :is a \2Resolved Connection\2",
      /* 277 ISNOTRSL*/	        ":%s 275 %s %s :is a \2Unresolved Connection\2",