All usermodes are now recognized and properly set internally on Insp 1.2.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2601 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 28 insertions, 28 deletions

diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index 42c065496..1f1b63290 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -177,21 +177,20 @@ unsigned long umodes[128] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, UMODE_A, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0,
-    0,
-    0,
-    0, 0, 0, 0, 0, 0, 0,
-    0,
-    0, 0, 0, 0, 0,
-    0, UMODE_a, 0, 0, 0, 0, 0,
-    UMODE_g,
-    UMODE_h, UMODE_i, 0, 0, 0, 0, 0, UMODE_o,
-    0,
-    0, UMODE_r, 0, 0, 0, 0, UMODE_w,
-    UMODE_x,
-    0,
-    0,
+    0, 
+    0, UMODE_B, 0, 0, 0,               /* A - E */
+    0, UMODE_G, UMODE_H, UMODE_I, 0,   /* F - J */
+    0, 0, 0, 0, 0,                     /* K - O */
+    0, UMODE_Q, UMODE_R, UMODE_S, 0,   /* P - T */
+    0, 0, UMODE_W, 0, 0,               /* U - Y */
+    0,                                 /* Z */
+    0, 0, 0, 0, 0, 0,
+    0, 0, UMODE_c, UMODE_d, 0,         /* a - e */
+    0, UMODE_g, UMODE_h, UMODE_i, 0,   /* f - j */
+    UMODE_k, 0, 0, 0, UMODE_o,         /* k - o */
+    0, 0, UMODE_r, UMODE_s, 0,         /* p - t */
+    0, 0, UMODE_w, UMODE_x, 0,         /* u - y */
+    0,                                 /* z */
     0, 0, 0, 0, 0
 };
 
@@ -467,15 +466,6 @@ void inspircd_set_umode(User *user, int ac, char **av)
                 opcnt--;
             }
             break;
-        case 'a':
-            if (UnRestrictSAdmin) {
-                break;
-            }
-            if (add && !is_services_admin(user)) {
-                common_svsmode(user, "-a", NULL);
-                user->mode &= ~UMODE_a;
-            }
-            break;
         case 'r':
             user->svid = (add ? user->timestamp : 0);
             if (burst && user == u_intro_regged)
diff --git a/src/protocol/inspircd12.h b/src/protocol/inspircd12.h
index b0b2314a2..3d7b9378f 100644
--- a/src/protocol/inspircd12.h
+++ b/src/protocol/inspircd12.h
@@ -18,15 +18,25 @@
 
 /*************************************************************************/
 
-#define UMODE_a 0x00000001
+#define UMODE_c 0x00000001
 #define UMODE_h 0x00000002
 #define UMODE_i 0x00000004
 #define UMODE_o 0x00000008
 #define UMODE_r 0x00000010
 #define UMODE_w 0x00000020
-#define UMODE_A 0x00000040
-#define UMODE_g 0x80000000
-#define UMODE_x 0x40000000
+#define UMODE_d 0x00000040
+#define UMODE_g 0x00000080
+#define UMODE_x 0x00000100
+#define UMODE_k 0x00000200
+#define UMODE_s 0x00000400
+#define UMODE_B 0x0000100
+#define UMODE_G 0x00002000
+#define UMODE_H 0x00004000
+#define UMODE_I 0x00008000
+#define UMODE_Q 0x00010000
+#define UMODE_R 0x00020000
+#define UMODE_S 0x00040000
+#define UMODE_W 0x00080000
 
 #define CMODE_i 0x00000001
 #define CMODE_m 0x00000002