[X2serv-cvs] [CVS] Module x2: Change committed

[Reed L. <r3...@us...>]

Committer  : Reed Loden <r3...@us...>
CVSROOT    : /cvsroot/x2serv
Module     : x2
Commit time: 2003-10-26 21:17:46 UTC

Modified files:
     conf/x2.news source/commands.c

Log message:

Fix .Services stuff.

---------------------- diff included ----------------------
Index: x2/conf/x2.news
diff -u x2/conf/x2.news:1.1 x2/conf/x2.news:1.2
--- x2/conf/x2.news:1.1	Sat Apr 29 18:41:34 2000
+++ x2/conf/x2.news	Sun Oct 26 13:17:36 2003
@@ -1,7 +1,7 @@
   A note from The X2 Author:
 --------------------------------
 Your network has recently upgraded
-to X2 version 5.0! Congratulations!
+to X2 version 5.2! Congratulations!
 This news file is displayed once to 
 every manager, owner, or coowner in 
 every channel.  It can be used to 
@@ -11,7 +11,7 @@
 the NEWS command. 
 Please let your X2 operator know they
 can change this news file by editing
-x2.news in the main X2 5.0 directory.
+x2.news in the main X2 5.2 directory.
 Thanks,
 	-Rubin (ru...@af...)
                X2 author/maintainer
Index: x2/source/commands.c
diff -u x2/source/commands.c:1.175 x2/source/commands.c:1.176
--- x2/source/commands.c:1.175	Sat Jun 14 13:24:18 2003
+++ x2/source/commands.c	Sun Oct 26 13:17:36 2003
@@ -2128,12 +2128,12 @@
     buff = (char *) mysep(&rest, "\0");
     if(!buff || !*buff)
         buff = "";
-    sprintf(reason, "(added by %s) We do not allow advertizing on AfterNET! (%s)\002", uptr->Nick, target->Nick);
+    sprintf(reason, "<%s> We do not allow advertising on AfterNET! (%s)", uptr->Nick, target->Nick);
     if((target = FindNick(nick, UsersN)))
     {
         if (IsModeK(target))
         {
-            send_to_user(uptr, "\002Cannot spamsassanate a service!\002");
+            send_to_user(uptr, "\002Cannot spamassassinate a service!\002");
             return(FALSE);
         }
         IP = unsigned32ToDotQuad(target->IP);
@@ -3153,7 +3153,7 @@
 
   if((ServPtr = GetServer(Name)))
   {
-    if (!strstr(ServPtr->Name, ".Services"))
+    if (0 != strcmp(".Services", (ServPtr->Name)+strlen(ServPtr->Name)-1-strlen(".Services")))
     {
       if (ServPtr->NumOfUsers != 1)
 	send_to_user(uptr, "%s%s-\002%s\002 [%d users]", pre, arrowchar, Name, ServPtr->NumOfUsers);
@@ -3278,7 +3278,8 @@
     ServPtr = Servers->Table[i];
     while (ServPtr)
     {
-      if(!strstr(ServPtr->Name, ".Services") || (strstr(rest, "DEBUG") ))	/* filter out Services */
+      if((0 != strcmp(".Services", (ServPtr->Name)+strlen(ServPtr->Name)-1-strlen(".Services")))
+	 || (strstr(rest, "DEBUG") )) /* filter out Services */
 	send_to_user(uptr, "\002 %s\002(%d) has %d user(s) <-> \002%s\002", ServPtr->Name, 
 			base64toint(ServPtr->numnick), ServPtr->NumOfUsers, ServPtr->LinkName);
       ServPtr = ServPtr->NextA;
@@ -4162,7 +4163,8 @@
     ListPtr = UsersN->Table[i];
     while (ListPtr)
     {
-      if ((!strstr(".Services", ListPtr->Serv)) && ((UMODEo & ListPtr->Modes) != 0))
+      if ((0 != strcmp(".Services", (ServPtr->Name)+strlen(ServPtr->Name)-1-strlen(".Services")))
+	  && ((UMODEo & ListPtr->Modes) != 0))
       {
         if(!(ListPtr->Modes & UMODEk))
         {
----------------------- End of diff -----------------------