Просмотр исходного кода

Merge branch '58-ducch-flag-a-spam' into maint

* 58-ducch-flag-a-spam:
  Fix spelling of 'privilege'
  Update docs
  Warn when +a is used and suggest +O for auto-op instead
Bryan Drewery 13 лет назад
Родитель
Сommit
4d19d435c0
2 измененных файлов с 5 добавлено и 0 удалено
  1. 1 0
      doc/UPDATES
  2. 4 0
      src/cmds.c

+ 1 - 0
doc/UPDATES

@@ -5,6 +5,7 @@ maint
   * Show 'Do!' in 'chaninfo' for 'Voice-moderate' to be consistent with other flags.
   * Fix CALLERID not respecting ignores (#63)
   * When using msg OP, check for and allow '#chan PASS' as well as 'PASS #chan'
+  * Warn when using 'chattr +a' as some users may expect it to be auto-op (#58)
 
 1.4.1 - http://wraith.botpack.net/milestone/1.4.1
   * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.

+ 4 - 0
src/cmds.c

@@ -2671,6 +2671,10 @@ static void cmd_chattr(int idx, char *par)
       putlog(LOG_CMDS, "*", "#%s# chattr %s %s", dcc[idx].nick, hand, chg ? chg : "");
       update_mod(hand, dcc[idx].nick, "chattr", chg);
     }
+    if (chg && (pls.global & USER_ADMIN)) { // +a was used, warn that this is admin and not auto-op.
+      dprintf(idx, "WARNING: You have just used +a, which is an ADMIN privilege.\n");
+      dprintf(idx, "If you intended to use the AUTO-OP privilege, please use +O instead.\n");
+    }
   }
   /* Get current flags and display them */