* check_get() clang was indeed right, this ';' is a bug. dict_tcp syntax errors would...

[citadel.git] / citadel / modules / vcard / serv_vcard.c

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index a4e92d234f352af62d0d6d51e1df5ca232ae2fe9..da6418c5783d0243fe9ab3e77e3fcdec04bc7488 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -69,7 +69,6 @@
 #include "config.h"
 #include "control.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
@@ -324,7 +323,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 +359,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);
        }
 
@@ -379,7 +378,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                        memcpy(&usbuf, &CC->user, sizeof(struct ctdluser));
                }
                
-               else if (getuserbynumber(&usbuf, what_user) == 0) {
+               else if (CtdlGetUserByNumber(&usbuf, what_user) == 0) {
                        /* We fetched a valid user record */
                }
 
@@ -500,7 +499,7 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
        if ( (strlen(CC->room.QRname) >= 12) && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
                is_UserConf = 1;        /* It's someone's config room */
        }
-       MailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM);
+       CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM);
        if (!strcasecmp(CC->room.QRname, roomname)) {
                is_UserConf = 1;
                is_MY_UserConf = 1;     /* It's MY config room */
@@ -552,19 +551,19 @@ 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) {
-                               lgetuser(&CC->user, CC->curr_user);
+                       if (CC->user.axlevel >= AxAideU) {
+                               CtdlGetUserLock(&CC->user, CC->curr_user);
                                CC->user.flags |= US_REGIS;
-                               lputuser(&CC->user);
+                               CtdlPutUserLock(&CC->user);
                                return (0);
                        }
                        
                        set_mm_valid();
 
                        /* ...which also means we need to flag the user */
-                       lgetuser(&CC->user, CC->curr_user);
+                       CtdlGetUserLock(&CC->user, CC->curr_user);
                        CC->user.flags |= (US_REGIS|US_NEEDVALID);
-                       lputuser(&CC->user);
+                       CtdlPutUserLock(&CC->user);
 
                        return(0);
                }
@@ -601,7 +600,7 @@ struct vCard *vcard_get_user(struct ctdluser *u) {
        long VCmsgnum;
 
        strcpy(hold_rm, CC->room.QRname);       /* save current room */
-       MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
+       CtdlMailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
 
        if (CtdlGetRoom(&CC->room, config_rm) != 0) {
                CtdlGetRoom(&CC->room, hold_rm);
@@ -685,7 +684,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,13 +747,13 @@ 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;
        }
 
-       if (getuser(&usbuf, who) != 0) {
+       if (CtdlGetUser(&usbuf, who) != 0) {
                cprintf("%d '%s' not found.\n", ERROR + NO_SUCH_USER, who);
                return;
        }
@@ -1126,7 +1125,7 @@ void check_get(void) {
        CtdlLogPrintf(CTDL_INFO, ": %s\n", cmdbuf);
        while (strlen(cmdbuf) < 3) strcat(cmdbuf, " ");
 
-       if (strcasecmp(cmdbuf, "GET "));
+       if (strcasecmp(cmdbuf, "GET ")==0)
        {
                struct recptypes *rcpt;
                char *argbuf = &cmdbuf[4];