[srvx-commits] CVS: services/src opserv.c,1.302,1.303

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19559/src

Modified Files:
	opserv.c 
Log Message:
fix ?join and ?part to not take a context channel


Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.302
retrieving revision 1.303
diff -C2 -r1.302 -r1.303
*** opserv.c	2 Jan 2003 23:11:56 -0000	1.302
--- opserv.c	3 Jan 2003 23:59:07 -0000	1.303
***************
*** 943,963 ****
  static OPSERV_FUNC(cmd_join)
  {
!     int announce_op = 1;
!     if (!channel) {
!         announce_op = 0;
! 	if (argc < 2) {
! 	    reply(MSG_MISSING_PARAMS, argv[0]);
! 	    OPSERV_SYNTAX();
! 	    return 0;
! 	}
!         if (!IsChannelName(argv[1])) {
!             reply(MSG_NOT_CHANNEL_NAME);
              return 0;
          }
! 	channel = AddChannel(argv[1], now, NULL, NULL);
!     }
!     if (GetUserMode(channel, opserv)) {
!         reply(OSMSG_ALREADY_JOINED, channel->name);
!         return 0;
      }
      AddChannelUser(opserv, channel);
--- 943,961 ----
  static OPSERV_FUNC(cmd_join)
  {
!     int announce_op;
!     OPSERV_MIN_PARMS(2, false);
!     if (!IsChannelName(argv[1])) {
!         reply(MSG_NOT_CHANNEL_NAME);
!         return 0;
!     }
!     if ((channel = GetChannel(argv[1]))) {
!         if (GetUserMode(channel, opserv)) {
!             reply(OSMSG_ALREADY_JOINED, channel->name);
              return 0;
          }
!         announce_op = 1;
!     } else {
!         channel = AddChannel(argv[1], now, NULL, NULL);
!         announce_op = 0;
      }
      AddChannelUser(opserv, channel);
***************
*** 2017,2032 ****
      const char *chanName;
  
!     OPSERV_MIN_PARMS(1, false);
!     if (channel) {
!         chanName = channel->name;
!     } else if ((argc > 1) && IsChannelName(argv[1])) {
          chanName = argv[1];
      } else {
!         opserv_notice(user, MSG_MISSING_PARAMS, argv[0]);
          OPSERV_SYNTAX();
          return 0;
      }
      dict_insert(opserv_exempt_channels, strdup(chanName), NULL);
!     opserv_notice(user, OSMSG_ADDED_EXEMPTION, chanName);
      return 1;
  }
--- 2015,2028 ----
      const char *chanName;
  
!     OPSERV_MIN_PARMS(2, false);
!     if ((argc > 1) && IsChannelName(argv[1])) {
          chanName = argv[1];
      } else {
!         reply(MSG_NOT_CHANNEL_NAME);
          OPSERV_SYNTAX();
          return 0;
      }
      dict_insert(opserv_exempt_channels, strdup(chanName), NULL);
!     reply(OSMSG_ADDED_EXEMPTION, chanName);
      return 1;
  }
***************
*** 2036,2046 ****
      const char *chanName;
  
!     OPSERV_MIN_PARMS(1, false);
!     if (channel) {
!         chanName = channel->name;
!     } else if ((argc > 1) && IsChannelName(argv[1])) {
          chanName = argv[1];
      } else {
!         opserv_notice(user, MSG_MISSING_PARAMS, argv[0]);
          OPSERV_SYNTAX();
          return 0;
--- 2032,2040 ----
      const char *chanName;
  
!     OPSERV_MIN_PARMS(2, false);
!     if ((argc > 1) && IsChannelName(argv[1])) {
          chanName = argv[1];
      } else {
!         reply(MSG_NOT_CHANNEL_NAME);
          OPSERV_SYNTAX();
          return 0;
***************
*** 2050,2054 ****
          return 0;
      }
!     opserv_notice(user, OSMSG_REMOVED_EXEMPTION, chanName);
      return 1;
  }
--- 2044,2048 ----
          return 0;
      }
!     reply(OSMSG_REMOVED_EXEMPTION, chanName);
      return 1;
  }
***************
*** 4042,4046 ****
      opserv_define_func("GTRACE PRINT", NULL, 0, 0);
      opserv_define_func("INVITEME", cmd_inviteme, 100, 0);
!     opserv_define_func("JOIN", cmd_join, 601, 1);
      opserv_define_func("JUMP", cmd_jump, 900, 0);
      opserv_define_func("JUPE", cmd_jupe, 900, 0);
--- 4036,4040 ----
      opserv_define_func("GTRACE PRINT", NULL, 0, 0);
      opserv_define_func("INVITEME", cmd_inviteme, 100, 0);
!     opserv_define_func("JOIN", cmd_join, 601, 0);
      opserv_define_func("JUMP", cmd_jump, 900, 0);
      opserv_define_func("JUPE", cmd_jupe, 900, 0);
***************
*** 4056,4060 ****
      opserv_define_func("OP", cmd_op, 100, 2);
      opserv_define_func("OPALL", cmd_opall, 400, 2);
!     opserv_define_func("PART", cmd_part, 601, 2);
      opserv_define_func("QUERY", cmd_query, 0, 0);
      opserv_define_func("RAW", cmd_raw, 999, 0);
--- 4050,4054 ----
      opserv_define_func("OP", cmd_op, 100, 2);
      opserv_define_func("OPALL", cmd_opall, 400, 2);
!     opserv_define_func("PART", cmd_part, 601, 0);
      opserv_define_func("QUERY", cmd_query, 0, 0);
      opserv_define_func("RAW", cmd_raw, 999, 0);