* Removed USERENTRY_BOTFL

  Still need to remove it from the flags


svn: 958

src/flags.c

@@ -367,8 +367,6 @@ void set_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chn
       shareout(NULL, "a %s %s\n", u->handle, buffer);
     }
   }
-  if ((oldflags & FR_BOT) && (u->flags & USER_BOT))
-    set_user(&USERENTRY_BOTFL, u, (void *) fr->bot);
   /* Don't share bot attrs */
   if ((oldflags & FR_CHAN) && chname) {
     for (cr = u->chanrec; cr; cr = cr->next)
@@ -409,10 +407,7 @@ void get_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chn
   } else {
     fr->global = 0;
   }
-  if (fr->match & FR_BOT) {
-    fr->bot = (long) get_user(&USERENTRY_BOTFL, u);
-  } else
-    fr->bot = 0;
+  fr->bot = 0;
   if (fr->match & FR_CHAN) {
     if (fr->match & FR_ANYWH) {
       fr->chan = u->flags;
@@ -437,73 +432,6 @@ void get_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chn
   }
 }
 
-static int botfl_unpack(struct userrec *u, struct user_entry *e)
-{
-  struct flag_record fr = {FR_BOT, 0, 0, 0};
-
-  break_down_flags(e->u.list->extra, &fr, NULL);
-  list_type_kill(e->u.list);
-  e->u.ulong = fr.bot;
-  return 1;
-}
-
-static int botfl_kill(struct user_entry *e)
-{
-  free(e);
-  return 1;
-}
-
-#ifdef HUB
-static int botfl_write_userfile(FILE *f, struct userrec *u, struct user_entry *e)
-{
-  char x[100] = "";
-  struct flag_record fr = {FR_BOT, 0, 0, 0};
-
-  fr.bot = e->u.ulong;
-  build_flags(x, &fr, NULL);
-  if (lfprintf(f, "--%s %s\n", e->type->name, x) == EOF)
-    return 0;
-  return 1;
-}
-#endif /* HUB */
-
-static int botfl_set(struct userrec *u, struct user_entry *e, void *buf)
-{
-  register long atr = ((long) buf & BOT_VALID);
-
-  if (!(u->flags & USER_BOT))
-    return 1;			/* Don't even bother trying to set the
-				   flags for a non-bot */
-
-  e->u.ulong = atr;
-  return 1;
-}
-
-static void botfl_display(int idx, struct user_entry *e, struct userrec *u)
-{
-  struct flag_record fr = {FR_BOT, 0, 0, 0};
-  char x[100] = "";
-
-  fr.bot = e->u.ulong;
-  build_flags(x, &fr, NULL);
-  dprintf(idx, "  BOT FLAGS: %s\n", x);
-}
-
-struct user_entry_type USERENTRY_BOTFL =
-{
-  0,				/* always 0 ;) */
-  0,
-  botfl_unpack,
-#ifdef HUB
-  botfl_write_userfile,
-#endif /* HUB */
-  botfl_kill,
-  def_get,
-  botfl_set,
-  botfl_display,
-  "BOTFL"
-};
-
 /* private returns 0 if user has access, and 1 if they dont because of +private
  * This function does not check if the user has "op" access, it only checks if the user is
  * restricted by +private for the channel

src/mod/share.mod/share.c

@@ -270,7 +270,7 @@ share_chattr(int idx, char *par)
           shareout_but(cst, idx, "a %s %s %s\n", hand, atr, par);
         noshare = 1;
         if (par[0] && cst) {
-          fr.match = (FR_CHAN | FR_BOT);
+          fr.match = (FR_CHAN);
           get_user_flagrec(dcc[idx].user, &fr, par);
           fr.match = FR_CHAN;
           fr2.match = FR_CHAN;
@@ -327,8 +327,6 @@ share_pls_chrec(int idx, char *par)
     user = newsplit(&par);
     if ((u = get_user_by_handle(userlist, user))) {
       chan = findchan_by_dname(par);
-      fr.match = (FR_CHAN | FR_BOT);
-      get_user_flagrec(dcc[idx].user, &fr, par);
       noshare = 1;
       shareout_but(chan, idx, "+cr %s %s\n", user, par);
       if (!get_chanrec(u, par)) {
@@ -351,8 +349,6 @@ share_mns_chrec(int idx, char *par)
     user = newsplit(&par);
     if ((u = get_user_by_handle(userlist, user))) {
       chan = findchan_by_dname(par);
-      fr.match = (FR_CHAN | FR_BOT);
-      get_user_flagrec(dcc[idx].user, &fr, par);
       noshare = 1;
       del_chanrec(u, par);
       shareout_but(chan, idx, "-cr %s %s\n", user, par);
@@ -549,8 +545,6 @@ share_chchinfo(int idx, char *par)
     if ((u = get_user_by_handle(userlist, hand))) {
       chan = newsplit(&par);
       cst = findchan_by_dname(chan);
-      fr.match = (FR_CHAN | FR_BOT);
-      get_user_flagrec(dcc[idx].user, &fr, chan);
       shareout_but(cst, idx, "chchinfo %s %s %s\n", hand, chan, par);
       noshare = 1;
       set_handle_chaninfo(userlist, hand, chan, par);
@@ -629,8 +623,6 @@ share_mns_banchan(int idx, char *par)
   if (dcc[idx].status & STAT_SHARE) {
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    fr.match = (FR_CHAN | FR_BOT);
-    get_user_flagrec(dcc[idx].user, &fr, chname);
     shareout_but(chan, idx, "-bc %s %s\n", chname, par);
     putlog(LOG_CMDS, "@", "%s: cancel ban %s on %s", dcc[idx].nick, par, chname);
     str_unescape(par, '\\');
@@ -655,8 +647,6 @@ share_mns_exemptchan(int idx, char *par)
   if (dcc[idx].status & STAT_SHARE) {
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    fr.match = (FR_CHAN | FR_BOT);
-    get_user_flagrec(dcc[idx].user, &fr, chname);
     shareout_but(chan, idx, "-ec %s %s\n", chname, par);
     putlog(LOG_CMDS, "@", "%s: cancel exempt %s on %s", dcc[idx].nick, par, chname);
     str_unescape(par, '\\');
@@ -682,8 +672,6 @@ share_mns_invitechan(int idx, char *par)
   if (dcc[idx].status & STAT_SHARE) {
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    fr.match = (FR_CHAN | FR_BOT);
-    get_user_flagrec(dcc[idx].user, &fr, chname);
     shareout_but(chan, idx, "-invc %s %s\n", chname, par);
     putlog(LOG_CMDS, "@", "%s: cancel invite %s on %s", dcc[idx].nick, par, chname);
     str_unescape(par, '\\');
@@ -761,8 +749,6 @@ share_pls_banchan(int idx, char *par)
     tm = newsplit(&par);
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    fr.match = (FR_CHAN | FR_BOT);
-    get_user_flagrec(dcc[idx].user, &fr, chname);
     shareout_but(chan, idx, "+bc %s %s %s %s\n", ban, tm, chname, par);
     str_unescape(ban, '\\');
     from = newsplit(&par);
@@ -829,8 +815,6 @@ share_pls_exemptchan(int idx, char *par)
     tm = newsplit(&par);
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    fr.match = (FR_CHAN | FR_BOT);
-    get_user_flagrec(dcc[idx].user, &fr, chname);
     shareout_but(chan, idx, "+ec %s %s %s %s\n", exempt, tm, chname, par);
     str_unescape(exempt, '\\');
     from = newsplit(&par);
@@ -894,8 +878,6 @@ share_pls_invitechan(int idx, char *par)
     tm = newsplit(&par);
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    fr.match = (FR_CHAN | FR_BOT);
-    get_user_flagrec(dcc[idx].user, &fr, chname);
     shareout_but(chan, idx, "+invc %s %s %s %s\n", invite, tm, chname, par);
     str_unescape(invite, '\\');
     from = newsplit(&par);
@@ -1189,10 +1171,6 @@ shareout(struct chanset_t *chan, ...)
     s[2 + (l = 509)] = 0;
   for (i = 0; i < dcc_total; i++)
     if ((dcc[i].type->flags & DCT_BOT) && (dcc[i].status & STAT_SHARE) && !(dcc[i].status & (STAT_GETTING | STAT_SENDING))) {
-      if (chan) {
-        fr.match = (FR_CHAN | FR_BOT);
-        get_user_flagrec(dcc[i].user, &fr, chan->dname);
-      }
       tputs(dcc[i].sock, s, l + 2);
     }
   va_end(va);
@@ -1215,10 +1193,6 @@ shareout_but(struct chanset_t *chan, ...)
   for (i = 0; i < dcc_total; i++)
     if ((dcc[i].type->flags & DCT_BOT) && (i != x) &&
         (dcc[i].status & STAT_SHARE) && (!(dcc[i].status & STAT_GETTING)) && (!(dcc[i].status & STAT_SENDING))) {
-      if (chan) {
-        fr.match = (FR_CHAN | FR_BOT);
-        get_user_flagrec(dcc[i].user, &fr, chan->dname);
-      }
       tputs(dcc[i].sock, s, l + 2);
     }
   va_end(va);
@@ -1333,7 +1307,6 @@ finish_share(int idx)
    */
 
   noshare = 1;
-  fr.match = (FR_CHAN | FR_BOT);
 
   while (global_bans)
     u_delmask('b', NULL, global_bans->mask, 1);

src/userent.c

@@ -28,7 +28,6 @@ void init_userent()
   add_entry_type(&USERENTRY_PASS);
   add_entry_type(&USERENTRY_SECPASS);
   add_entry_type(&USERENTRY_HOSTS);
-  add_entry_type(&USERENTRY_BOTFL);
   add_entry_type(&USERENTRY_STATS);
   add_entry_type(&USERENTRY_ADDED);
   add_entry_type(&USERENTRY_MODIFIED);

src/userrec.c

@@ -299,7 +299,7 @@ int write_user(struct userrec *u, FILE * f, int idx)
     cst = findchan_by_dname(ch->channel);
     if (cst) {
       if (idx >= 0) {
-	fr.match = (FR_CHAN | FR_BOT);
+	fr.match = FR_CHAN;
 	get_user_flagrec(dcc[idx].user, &fr, ch->channel);
       } 
       fr.match = FR_CHAN;

src/users.c

@@ -560,7 +560,7 @@ void tell_users_match(int idx, char *mtch, int start, int limit, int master, cha
   if (start > 1)
     dprintf(idx, "(%s %d)\n", MISC_SKIPPING, start - 1);
   if (strchr("+-&|", *mtch)) {
-    user.match = pls.match = FR_GLOBAL | FR_BOT | FR_CHAN;
+    user.match = pls.match = FR_GLOBAL | FR_CHAN;
     break_down_flags(mtch, &pls, &mns);
     mns.match = pls.match ^ (FR_AND | FR_OR);
     if (!mns.global && !mns.chan && !mns.bot) {

src/users.h

@@ -47,7 +47,7 @@ struct user_entry_type {
 
 extern struct user_entry_type USERENTRY_COMMENT, USERENTRY_LASTON,
  USERENTRY_INFO, USERENTRY_BOTADDR, USERENTRY_HOSTS,
- USERENTRY_PASS, USERENTRY_BOTFL,
+ USERENTRY_PASS, 
   USERENTRY_STATS,
   USERENTRY_ADDED,
   USERENTRY_MODIFIED,
@@ -99,9 +99,7 @@ struct user_entry *find_user_entry(struct user_entry_type *, struct userrec *);
 void *get_user(struct user_entry_type *, struct userrec *);
 int set_user(struct user_entry_type *, struct userrec *, void *);
 
-#define bot_flags(u)	((long)get_user(&USERENTRY_BOTFL, (u)))
 #define is_bot(u)	((u) && ((u)->flags & USER_BOT))
-#define is_owner(u)	((u) && ((u)->flags & USER_OWNER))
 
 /* Fake users used to store ignores and bans
  */