X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fvcard%2Fserv_vcard.c;h=5133fce5449bb7d6382b0bd1b55f69ad496ca57e;hb=7b4383dd73b617754c1a495859ea134eabd196ca;hp=ff5c2ab4726a627fad3e81e400a7373f11d439a5;hpb=c0b28d0de9908667646a9ccbe7d9a5830285d733;p=citadel.git diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index ff5c2ab47..5133fce54 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -324,7 +324,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { #ifdef VCARD_SAVES_BY_AIDES_ONLY /* Prevent non-aides from performing registration changes */ - if (CC->user.axlevel < 6) { + if (CC->user.axlevel < AxAideU) { return(1); } #endif @@ -360,7 +360,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { if (v == NULL) return(0); /* no vCards were found in this message */ /* If users cannot create their own accounts, they cannot re-register either. */ - if ( (yes_my_citadel_config) && (config.c_disable_newu) && (CC->user.axlevel < 6) ) { + if ( (yes_my_citadel_config) && (config.c_disable_newu) && (CC->user.axlevel < AxAideU) ) { return(1); } @@ -552,7 +552,7 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { * But if the user was an Aide or was edited by an Aide then we can * Assume they don't need validating. */ - if (CC->user.axlevel >= 6) { + if (CC->user.axlevel >= AxAideU) { CtdlGetUserLock(&CC->user, CC->curr_user); CC->user.flags |= US_REGIS; CtdlPutUserLock(&CC->user); @@ -685,7 +685,7 @@ void cmd_regi(char *argbuf) { } /* If users cannot create their own accounts, they cannot re-register either. */ - if ( (config.c_disable_newu) && (CC->user.axlevel < 6) ) { + if ( (config.c_disable_newu) && (CC->user.axlevel < AxAideU) ) { cprintf("%d Self-service registration is not allowed here.\n", ERROR + HIGHER_ACCESS_REQUIRED); } @@ -748,7 +748,7 @@ void cmd_greg(char *argbuf) if (!strcasecmp(who,"_SELF_")) strcpy(who,CC->curr_user); - if ((CC->user.axlevel < 6) && (strcasecmp(who,CC->curr_user))) { + if ((CC->user.axlevel < AxAideU) && (strcasecmp(who,CC->curr_user))) { cprintf("%d Higher access required.\n", ERROR + HIGHER_ACCESS_REQUIRED); return;