* Remove the old beta-net code

svn: 3853

src/binary.c

@@ -268,8 +268,6 @@ features_find(const char *buffer)
     return FEATURE_NO_TAKE;
   else if (!egg_strcasecmp(buffer, STR("no_mdop")))
     return FEATURE_NO_MDOP;
-  else if (!egg_strcasecmp(buffer, STR("beta")))
-    return FEATURE_BETA;
   return 0;
 }
 

src/cmds.c

@@ -2670,11 +2670,6 @@ int exec_str(int idx, char *cmd) {
 static void cmd_exec(int idx, char *par) {
   putlog(LOG_CMDS, "*", "#%s# exec %s", dcc[idx].nick, par);
 
-  if (IS_BETA) {
-    dprintf(idx, "Sorry, this cmd is not available in the beta net.\n");
-    return;
-  }
-
   if (!conf.bot->hub && !isowner(dcc[idx].nick)) {
     putlog(LOG_WARN, "*", "%s attempted 'exec' %s", dcc[idx].nick, par);
     dprintf(idx, "exec is only available to permanent owners on leaf bots\n");
@@ -2689,11 +2684,6 @@ static void cmd_exec(int idx, char *par) {
 static void cmd_w(int idx, char *par) {
   putlog(LOG_CMDS, "*", "#%s# w", dcc[idx].nick);
 
-  if (IS_BETA) {
-    dprintf(idx, "Sorry, this cmd is not available in the beta net.\n");
-    return;
-  }
-
   if (!exec_str(idx, "w"))
     dprintf(idx, "Exec failed\n");
 }
@@ -2701,11 +2691,6 @@ static void cmd_w(int idx, char *par) {
 static void cmd_ps(int idx, char *par) {
   putlog(LOG_CMDS, "*", "#%s# ps %s", dcc[idx].nick, par);
 
-  if (IS_BETA) {
-    dprintf(idx, "Sorry, this cmd is not available in the beta net.\n");
-    return;
-  }
-
   if (strchr(par, '|') || strchr(par, '<') || strchr(par, ';') || strchr(par, '>') || strchr(par, '`') || strchr(par, '$')) {
     putlog(LOG_WARN, "*", "%s attempted 'ps' with pipe/semicolon in parameters: %s", dcc[idx].nick, par);
     dprintf(idx, "No.\n");
@@ -2729,11 +2714,6 @@ static void cmd_last(int idx, char *par) {
     return;
   }
 
-  if (IS_BETA) {
-    dprintf(idx, "Sorry, this cmd is not available in the beta net.\n");
-    return;
-  }
-
   char user[20] = "";
 
   if (par && par[0]) {
@@ -3975,11 +3955,6 @@ static void cmd_netw(int idx, char * par) {
 
   putlog(LOG_CMDS, "*", "#%s# netw", dcc[idx].nick);
 
-  if (IS_BETA) {
-    dprintf(idx, "Sorry, this cmd is not available in the beta net.\n");
-    return;
-  }
-
   strcpy(tmp, "exec w");
   botnet_send_cmd_broad(-1, conf.bot->nick, dcc[idx].nick, idx, tmp);
 }
@@ -3987,11 +3962,6 @@ static void cmd_netw(int idx, char * par) {
 static void cmd_netps(int idx, char * par) {
   putlog(LOG_CMDS, "*", "#%s# netps %s", dcc[idx].nick, par);
 
-  if (IS_BETA) {
-    dprintf(idx, "Sorry, this cmd is not available in the beta net.\n");
-    return;
-  }
-
   if (strchr(par, '|') || strchr(par, '<') || strchr(par, ';') || strchr(par, '>') || strchr(par, '`') || strchr(par, '$')) {
     putlog(LOG_WARN, "*", "%s attempted 'netps' with pipe/semicolon in parameters: %s", dcc[idx].nick, par);
     dprintf(idx, "No.\n");
@@ -4007,11 +3977,6 @@ static void cmd_netps(int idx, char * par) {
 static void cmd_netlast(int idx, char * par) {
   putlog(LOG_CMDS, "*", "#%s# netlast %s", dcc[idx].nick, par);
 
-  if (IS_BETA) {
-    dprintf(idx, "Sorry, this cmd is not available in the beta net.\n");
-    return;
-  }
-
   if (strchr(par, '|') || strchr(par, '<') || strchr(par, ';') || strchr(par, '>') || strchr(par, '`') || strchr(par, '$')) {
     putlog(LOG_WARN, "*", "%s attempted 'netlast' with pipe/semicolon in parameters: %s", dcc[idx].nick, par);
     dprintf(idx, "No.\n");
@@ -4036,11 +4001,6 @@ void crontab_show(struct userrec *u, int idx) {
 static void cmd_crontab(int idx, char *par) {
   putlog(LOG_CMDS, "*", "#%s# crontab %s", dcc[idx].nick, par);
 
-  if (IS_BETA) {
-    dprintf(idx, "Sorry, this cmd is not available in the beta net.\n");
-    return;
-  }
-
   if (!par[0]) {
     dprintf(idx, "Usage: crontab <status|delete|show|new> [interval]\n");
     return;
@@ -4129,11 +4089,6 @@ static void cmd_netcrontab(int idx, char * par)
 {
   putlog(LOG_CMDS, "*", "#%s# netcrontab %s", dcc[idx].nick, par);
 
-  if (IS_BETA) {
-    dprintf(idx, "Sorry, this cmd is not available in the beta net.\n");
-    return;
-  }
-
   char *cmd = newsplit(&par);
 
   if ((strcmp(cmd, "status") && strcmp(cmd, "show") && strcmp(cmd, "delete") && strcmp(cmd, "new"))) {
@@ -4287,10 +4242,6 @@ void gotremotecmd (char *forbot, char *frombot, char *fromhand, char *fromidx, c
   cmd = newsplit(&par);
 
   if (!strcmp(cmd, "exec")) {
-    if (IS_BETA) {
-      putlog(LOG_WARN, "*", "Received remote cmd '%s'; disabled on beta net.", cmd);
-      return;
-    }
     rcmd_exec(frombot, fromhand, fromidx, par);
   } else if (!strcmp(cmd, "curnick")) {
     rcmd_curnick(frombot, fromhand, fromidx);
@@ -4301,10 +4252,6 @@ void gotremotecmd (char *forbot, char *frombot, char *fromhand, char *fromidx, c
   } else if (!strcmp(cmd, "jump")) {
     rcmd_jump(frombot, fromhand, fromidx, par);
   } else if (!strcmp(cmd, "msg")) {
-    if (IS_BETA) {
-      putlog(LOG_WARN, "*", "Received remote cmd '%s'; disabled on beta net.", cmd);
-      return;
-    }
     rcmd_msg(forbot, frombot, fromhand, fromidx, par);
   } else if (!strcmp(cmd, "ver")) {
     rcmd_ver(frombot, fromhand, fromidx);

src/eggdrop.h

@@ -137,11 +137,9 @@ enum {		/* TAKE A GUESS */
 
 #define FEATURE_NO_TAKE		BIT0
 #define FEATURE_NO_MDOP		BIT1
-#define FEATURE_BETA		BIT2
 
 #define HAVE_TAKE	(!(conf.features & FEATURE_NO_TAKE))
 #define HAVE_MDOP	(!(conf.features & FEATURE_NO_MDOP))
-#define IS_BETA		(conf.features & FEATURE_BETA)
 
 
 #define HUB		BIT0