[srvx-commits] CVS: services/src helpserv.c,1.41,1.42 helpserv.help,1.11,1.12

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv11466/src

Modified Files:
	helpserv.c helpserv.help 
Log Message:
change HelpServ "set" output to always show the real option name
add ReqOnJoin option to helpserv.help


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** helpserv.c	25 Oct 2002 13:04:16 -0000	1.41
--- helpserv.c	26 Oct 2002 16:15:15 -0000	1.42
***************
*** 146,155 ****
  #define HSMSG_QUEUE_OPTIONS      "HelpServ Queue Options:"
  #define HSMSG_STRING_VALUE       "$b%19s $b%s"
- #define HSMSG_PAGE_TARGET_VALUE  "$b%9s page dest $b%s"
- #define HSMSG_PAGE_TYPE_VALUE    "$b%9s page type $b%s"
  #define HSMSG_MESSAGE_VALUE      "$b%11s message $b%s"
- #define HSMSG_INTERVAL_VALUE     "$b%19s $b%s"
- #define HSMSG_PERSIST_VALUE      "$b%19s $b%s"
- #define HSMSG_BINARY_VALUE       "$b%19s $b%s"
  #define HSMSG_INTEGER_VALUE      "$b%19s $b%lu"
  #define HSMSG_INVALID_INTERVAL   "Sorry, %s must be %s %s."
--- 146,150 ----
***************
*** 2426,2429 ****
--- 2421,2426 ----
  static int opt_page_target(struct userNode *user, struct helpserv_bot *hs, int from_opserv, int argc, unsigned char *argv[], enum page_source idx) {
      int changed = 0;
+     char target_name[32];
+ 
      if (argc > 0) {
          if (!IsOper(user)) {
***************
*** 2442,2446 ****
          }
      }
!     helpserv_notice(user, HSMSG_PAGE_TARGET_VALUE, page_source_names[idx], hs->page_targets[idx] ? hs->page_targets[idx]->name : "None");
      return changed;
  }
--- 2439,2444 ----
          }
      }
!     sprintf(target_name, "%sPageTarget", (idx != PGSRC_COMMAND) ? page_source_names[idx] : "");
!     helpserv_notice(user, HSMSG_STRING_VALUE, target_name, hs->page_targets[idx] ? hs->page_targets[idx]->name : "None");
      return changed;
  }
***************
*** 2469,2472 ****
--- 2467,2471 ----
      enum page_type new_type;
      int changed=0;
+     char target_name[32];
  
      if (argc > 0) {
***************
*** 2479,2483 ****
          changed = 1;
      }
!     helpserv_notice(user, HSMSG_PAGE_TYPE_VALUE, page_source_names[idx], page_type_names[hs->page_types[idx]]);
      return changed;
  }
--- 2478,2483 ----
          changed = 1;
      }
!     sprintf(target_name, "%sPageDest", (idx != PGSRC_COMMAND) ? page_source_names[idx] : "");
!     helpserv_notice(user, HSMSG_STRING_VALUE, target_name, page_type_names[hs->page_types[idx]]);
      return changed;
  }
***************
*** 2504,2508 ****
          changed = 1;
      }
!     helpserv_notice(user, HSMSG_MESSAGE_VALUE, message_type_names[idx], hs->messages[idx] ? hs->messages[idx] : "None");
      return changed;
  }
--- 2504,2508 ----
          changed = 1;
      }
!     helpserv_notice(user, HSMSG_STRING_VALUE, message_type_names[idx], hs->messages[idx] ? hs->messages[idx] : "None");
      return changed;
  }
***************
*** 2512,2524 ****
  }
  
! static HELPSERV_OPTION(opt_openreq) {
      return opt_message(user, hs, from_opserv, argc, argv, MSGTYPE_REQ_OPENED);
  }
  
! static HELPSERV_OPTION(opt_assignreq) {
      return opt_message(user, hs, from_opserv, argc, argv, MSGTYPE_REQ_ASSIGNED);
  }
  
! static HELPSERV_OPTION(opt_closereq) {
      return opt_message(user, hs, from_opserv, argc, argv, MSGTYPE_REQ_CLOSED);
  }
--- 2512,2524 ----
  }
  
! static HELPSERV_OPTION(opt_req_opened) {
      return opt_message(user, hs, from_opserv, argc, argv, MSGTYPE_REQ_OPENED);
  }
  
! static HELPSERV_OPTION(opt_req_assigned) {
      return opt_message(user, hs, from_opserv, argc, argv, MSGTYPE_REQ_ASSIGNED);
  }
  
! static HELPSERV_OPTION(opt_req_closed) {
      return opt_message(user, hs, from_opserv, argc, argv, MSGTYPE_REQ_CLOSED);
  }
***************
*** 2543,2547 ****
      }
      intervalString(buf, hs->intervals[idx]);
!     helpserv_notice(user, HSMSG_INTERVAL_VALUE, interval_type_names[idx], hs->intervals[idx] ? buf : "0 (Disabled)");
      return changed;
  }
--- 2543,2547 ----
      }
      intervalString(buf, hs->intervals[idx]);
!     helpserv_notice(user, HSMSG_STRING_VALUE, interval_type_names[idx], hs->intervals[idx] ? buf : "0 (Disabled)");
      return changed;
  }
***************
*** 2609,2613 ****
          changed = 1;
      }
!     helpserv_notice(user, HSMSG_PERSIST_VALUE, persistence_type_names[idx], persistence_length_names[hs->persist_types[idx]]);
      return changed;
  }
--- 2609,2613 ----
          changed = 1;
      }
!     helpserv_notice(user, HSMSG_STRING_VALUE, persistence_type_names[idx], persistence_length_names[hs->persist_types[idx]]);
      return changed;
  }
***************
*** 2674,2678 ****
          } \
      } \
!     helpserv_notice(user, HSMSG_BINARY_VALUE, (name), (var) ? "Enabled" : "Disabled"); \
      return changed; \
  } while (0);
--- 2674,2678 ----
          } \
      } \
!     helpserv_notice(user, HSMSG_STRING_VALUE, (name), (var) ? "Enabled" : "Disabled"); \
      return changed; \
  } while (0);
***************
*** 2680,2688 ****
  
  static HELPSERV_OPTION(opt_privmsg_only) {
!     OPTION_BINARY(hs->privmsg_only, "Privmsg Only");
  }
  
  static HELPSERV_OPTION(opt_req_on_join) {
!     OPTION_BINARY(hs->req_on_join, "Join opens request");
  }
  
--- 2680,2688 ----
  
  static HELPSERV_OPTION(opt_privmsg_only) {
!     OPTION_BINARY(hs->privmsg_only, "PrivmsgOnly");
  }
  
  static HELPSERV_OPTION(opt_req_on_join) {
!     OPTION_BINARY(hs->req_on_join, "ReqOnJoin");
  }
  
***************
*** 2695,2699 ****
              opt_pagetarget_command, opt_pagetarget_alert, opt_pagetarget_status,
              opt_pagetype, opt_alert_page_type, opt_status_page_type,
!             opt_greeting, opt_openreq, opt_assignreq, opt_closereq,
              opt_idle_delay, opt_whine_delay, opt_whine_interval,
              opt_empty_interval, opt_stale_delay, opt_request_persistence,
--- 2695,2699 ----
              opt_pagetarget_command, opt_pagetarget_alert, opt_pagetarget_status,
              opt_pagetype, opt_alert_page_type, opt_status_page_type,
!             opt_greeting, opt_req_opened, opt_req_assigned, opt_req_closed,
              opt_idle_delay, opt_whine_delay, opt_whine_interval,
              opt_empty_interval, opt_stale_delay, opt_request_persistence,
***************
*** 3873,3879 ****
      helpserv_define_option("STATUSPAGETYPE", opt_status_page_type);
      helpserv_define_option("GREETING", opt_greeting);
!     helpserv_define_option("OPENREQ", opt_openreq);
!     helpserv_define_option("ASSIGNREQ", opt_assignreq);
!     helpserv_define_option("CLOSEREQ", opt_closereq);
      helpserv_define_option("IDLEDELAY", opt_idle_delay);
      helpserv_define_option("WHINEDELAY", opt_whine_delay);
--- 3873,3879 ----
      helpserv_define_option("STATUSPAGETYPE", opt_status_page_type);
      helpserv_define_option("GREETING", opt_greeting);
!     helpserv_define_option("REQOPENED", opt_req_opened);
!     helpserv_define_option("REQASSIGNED", opt_req_assigned);
!     helpserv_define_option("REQCLOSED", opt_req_closed);
      helpserv_define_option("IDLEDELAY", opt_idle_delay);
      helpserv_define_option("WHINEDELAY", opt_whine_delay);

Index: helpserv.help
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.help,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** helpserv.help	29 Sep 2002 00:06:00 -0000	1.11
--- helpserv.help	26 Oct 2002 16:15:16 -0000	1.12
***************
*** 119,127 ****
          "/msg $S SET [<option> [new-value]]",
          "Change service options.  If no option is specified, show all options.  If no value is specified, show current value of option.",
!         "PageTarget       Send command pages to this channel (this can only be set by an oper)",
          "PageType         Delivery type for command pages (sent by the PAGE command)",
!         "AlertPageTarget  Send alert pages to this channel (this can only be set by an oper)",
!         "AlertPageType    Delivery type for alert pages (to gain the helpers' attention)",
!         "StatusPageTarget Send status pages to this channel (this can only be set by an oper)",
          "StatusPageType   Delivery type for status pages (less urgent information, such as requests being opened/assigned/closed)",
          "Greeting         Message sent to users joining channel",
--- 119,127 ----
          "/msg $S SET [<option> [new-value]]",
          "Change service options.  If no option is specified, show all options.  If no value is specified, show current value of option.",
!         "PageTarget       Send command pages to this channel",
          "PageType         Delivery type for command pages (sent by the PAGE command)",
!         "AlertPageTarget  Send alert pages to this channel",
!         "AlertPageType    Delivery type for alert pages (to gain helpers' attention)",
!         "StatusPageTarget Send status pages to this channel",
          "StatusPageType   Delivery type for status pages (less urgent information, such as requests being opened/assigned/closed)",
          "Greeting         Message sent to users joining channel",
***************
*** 138,141 ****
--- 138,142 ----
          "Notification     Notification to helpers of events concerning their requests",
          "PrivmsgOnly      Messages to users are sent as privmsg (overriding account preference)",
+         "ReqOnJoin        Automatically opens a request for a user who joins the channel",
          "$uSee also:$u set <option-name>");
  "SET PAGETARGET" ("$bSET PAGETARGET$b",