X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=df4d224d03b209908ee244c2ecef04f4f75b3f5a;hb=7b4383dd73b617754c1a495859ea134eabd196ca;hp=87641e3eef8a96e690bc72cd7982525b6f652b1c;hpb=c0b28d0de9908667646a9ccbe7d9a5830285d733;p=citadel.git

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 87641e3ee..df4d224d0 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2875,7 +2875,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 
 	/* If the user is a twit, move to the twit room for posting */
 	if (TWITDETECT) {
-		if (CCC->user.axlevel == 2) {
+		if (CCC->user.axlevel == AxProbU) {
 			strcpy(hold_rm, actual_rm);
 			strcpy(actual_rm, config.c_twitroom);
 			CtdlLogPrintf(CTDL_DEBUG, "Diverting to twit room\n");
@@ -3546,7 +3546,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf,
 
 	}
 
-	if ((CC->user.axlevel < 2)
+	if ((CC->user.axlevel < AxProbU)
 	    && ((CC->room.QRflags & QR_MAILBOX) == 0)) {
 		snprintf(errmsgbuf, n, "Need to be validated to enter "
 				"(except in %s> to sysop)", MAILROOM);
@@ -3571,7 +3571,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf,
 int CtdlCheckInternetMailPermission(struct ctdluser *who) {
 
 	/* Do not allow twits to send Internet mail */
-	if (who->axlevel <= 2) return(0);
+	if (who->axlevel <= AxProbU) return(0);
 
 	/* Globally enabled? */
 	if (config.c_restrict == 0) return(1);
@@ -3580,7 +3580,7 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) {
 	if (who->flags & US_INTERNET) return(2);
 
 	/* Aide level access? */
-	if (who->axlevel >= 6) return(3);
+	if (who->axlevel >= AxAideU) return(3);
 
 	/* No mail for you! */
 	return(0);
@@ -3932,7 +3932,7 @@ void cmd_ent0(char *entargs)
 	if (IsEmptyStr(newusername)) {
 		strcpy(newusername, CC->user.fullname);
 	}
-	if (  (CC->user.axlevel < 6)
+	if (  (CC->user.axlevel < AxAideU)
 	   && (strcasecmp(newusername, CC->user.fullname))
 	   && (strcasecmp(newusername, CC->cs_inet_fn))
 	) {	
@@ -3982,7 +3982,7 @@ void cmd_ent0(char *entargs)
 	if (  ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) )
 	   || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) )
 	) {
-		if (CC->user.axlevel < 2) {
+		if (CC->user.axlevel < AxProbU) {
 			strcpy(recp, "sysop");
 			strcpy(cc, "");
 			strcpy(bcc, "");
@@ -4034,7 +4034,7 @@ void cmd_ent0(char *entargs)
 		}
 
 		if ( ( (valid_to->num_internet + valid_to->num_ignet + valid_cc->num_internet + valid_cc->num_ignet + valid_bcc->num_internet + valid_bcc->num_ignet) > 0)
-		   && (CC->user.axlevel < 4) ) {
+		   && (CC->user.axlevel < AxNetU) ) {
 			cprintf("%d Higher access required for network mail.\n",
 				ERROR + HIGHER_ACCESS_REQUIRED);
 			free_recipients(valid_to);
@@ -4393,7 +4393,7 @@ void cmd_move(char *args)
 	permit = 0;
 
 	/* Aides can move/copy */
-	if (CC->user.axlevel >= 6) permit = 1;
+	if (CC->user.axlevel >= AxAideU) permit = 1;
 
 	/* Room aides can move/copy */
 	if (CC->user.usernum == CC->room.QRroomaide) permit = 1;