X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fvcard%2Fserv_vcard.c;h=99ed9026a6db0f55a5228aca77cdcbc93e95aaa6;hb=b425dda0a48b4a3e24a9f22d25e864d42679feee;hp=311b73dfeb347df9e3cfa1ae24608cf78071def1;hpb=8b8941a7c48dfcbec1f356150990da20093d6a16;p=citadel.git

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index 311b73dfe..99ed9026a 100644
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -404,7 +404,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 		sprintf(buf, "http://%s/%s.vfb",
 			config.c_fqdn,
 			usbuf.fullname);
-		for (i=0; i<strlen(buf); ++i) {
+		for (i=0; !IsEmptyStr(&buf[i]); ++i) {
 			if (buf[i] == ' ') buf[i] = '_';
 		}
 		vcard_set_prop(v, "FBURL;PREF", buf, 0);
@@ -675,7 +675,7 @@ void cmd_regi(char *argbuf) {
 		if (a==2) strcpy(tmpcity, buf);
 		if (a==3) strcpy(tmpstate, buf);
 		if (a==4) {
-			for (c=0; c<strlen(buf); ++c) {
+			for (c=0; !IsEmptyStr(&buf[c]); ++c) {
 				if ((buf[c]>='0') && (buf[c]<='9')) {
 					b = strlen(tmpzip);
 					tmpzip[b] = buf[c];
@@ -789,7 +789,7 @@ void vcard_newuser(struct ctdluser *usbuf) {
 	v = vcard_new();
 	if (v == NULL) return;
 	sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn);
-	for (i=0; i<strlen(buf); ++i) {
+	for (i=0; !IsEmptyStr(&buf[i]); ++i) {
 		if (buf[i] == ' ') buf[i] = '_';
 	}
 	vcard_add_prop(v, "fn", usbuf->fullname);
@@ -1178,7 +1178,7 @@ struct vCard *vcard_new_from_rfc822_addr(char *addr) {
 	vcard_set_prop(v, "email;internet", email, 0);
 
 	snprintf(uid, sizeof uid, "collected: %s %s@%s", name, user, node);
-	for (i=0; i<strlen(uid); ++i) {
+	for (i=0; !IsEmptyStr(&uid[i]); ++i) {
 		if (isspace(uid[i])) uid[i] = '_';
 		uid[i] = tolower(uid[i]);
 	}