X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fvcard_edit.c;h=5ec2799afcad92107e48e7f1a57aa93cac4a3470;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=c2741cea74aaf875f8ea9e50e3beb880633d11cc;hpb=6eaecb68f61e396011e47a968c1a826b5c51c5af;p=citadel.git

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index c2741cea7..5ec2799af 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,3 +1,14 @@
+/*
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 
 #include "webcit.h"
 #include "webserver.h"
@@ -235,7 +246,7 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
 			}
 		}
 		if (is_qp) {
-			// %ff can become 6 bytes in utf8 
+			/* %ff can become 6 bytes in utf8  */
 			*storename = malloc(len * 2 + 3); 
 			j = CtdlDecodeQuotedPrintable(
 				*storename, name,
@@ -243,7 +254,7 @@ void fetchname_parsed_vcard(struct vCard *v, char **storename) {
 			(*storename)[j] = 0;
 		}
 		else if (is_b64) {
-			// ff will become one byte..
+			/* ff will become one byte.. */
 			*storename = malloc(len + 50);
 			CtdlDecodeBase64(
 				*storename, name,
@@ -488,7 +499,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
 		if (pass == 1) {
 			StrBufAppendPrintf(Target, "<tr bgcolor=\"#aaaaaa\">"
       "<td colspan=2 bgcolor=\"#ffffff\">"
-      "<img align=\"center\" src=\"static/viewcontacts_48x.gif\">"
+      "<img align=\"center\" src=\"static/webcit_icons/essen/32x32/contact.png\">"
       "<font size=\"+1\"><b>");
 			StrEscAppend(Target, NULL, fullname, 0, 0);
 			StrBufAppendPrintf(Target, "</b></font>");
@@ -544,36 +555,31 @@ void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, int full, wc_mim
 	StrBuf *Swap = NULL;
 	int i, j;
 	char buf[SIZ];
-	char *name;
 	int is_qp = 0;
 	int is_b64 = 0;
 	StrBuf *thisname = NULL;
-	char *thisvalue = NULL;
 	char firsttoken[SIZ];
-	int pass;
-	long len;
 	void *V;
 
 	Swap = NewStrBuf ();
 	thisname = NewStrBuf();
 	for (i=0; i<(v->numprops); ++i) {
-		int len;
 		is_qp = 0;
 		is_b64 = 0;
 		StrBufPlain(thisname, v->prop[i].name, -1);
 		StrBufLowerCase(thisname);
 		
-		len = extract_token(firsttoken, thisname, 0, ';', sizeof firsttoken);
+		/*len = */extract_token(firsttoken, ChrPtr(thisname), 0, ';', sizeof firsttoken);
 		
-		for (j=0; j<num_tokens(thisname, ';'); ++j) {
-			extract_token(buf, thisname, j, ';', sizeof buf);
+		for (j=0; j<num_tokens(ChrPtr(thisname), ';'); ++j) {
+			extract_token(buf, ChrPtr(thisname), j, ';', sizeof buf);
 			if (!strcasecmp(buf, "encoding=quoted-printable")) {
 				is_qp = 1;
-				remove_token(thisname, j, ';');
+/*				remove_token(thisname, j, ';');*/
 			}
 			if (!strcasecmp(buf, "encoding=base64")) {
 				is_b64 = 1;
-				remove_token(thisname, j, ';');
+/*				remove_token(thisname, j, ';');*/
 			}
 		}
 		
@@ -593,7 +599,7 @@ void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, int full, wc_mim
 			StrBufDecodeBase64(Val);
 
 		}
-		lprintf(1, "%s [%s][%s]",
+		syslog(1, "%s [%s][%s]",
 			firsttoken,
 			ChrPtr(Val),
 			v->prop[i].value);
@@ -601,11 +607,11 @@ void parse_vcard(StrBuf *Target, struct vCard *v, HashList *VC, int full, wc_mim
 		{
 			eVC evc = (eVC) V;
 			Put(VC, IKEY(evc), Val, HFreeStrBuf);
-			lprintf(1, "[%ld]\n", evc);
+			syslog(1, "[%ul]\n", evc);
 			Val = NULL;
 		}
 		else
-			lprintf(1, "[]\n");
+			syslog(1, "[]\n");
 /*
 TODO: check for layer II
 		else 
@@ -1032,9 +1038,9 @@ void do_edit_vcard(long msgnum, char *partnum,
 	/* Display the form */
 	output_headers(1, 1, 1, 0, 0, 0);
 
-	do_template("beginbox_1", NULL);
+	do_template("box_begin_1");
 	StrBufAppendBufPlain(WC->WBuf, _("Edit contact information"), -1, 0);
-	do_template("beginbox_2", NULL);
+	do_template("box_begin_2");
 
 	wc_printf("<form method=\"POST\" action=\"submit_vcard\">\n");
 	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
@@ -1205,7 +1211,7 @@ void do_edit_vcard(long msgnum, char *partnum,
 	);
 	
 	wc_printf("</td></tr></table>\n");
-	do_template("endbox", NULL);
+	do_template("box_end");
 	wDumpContent(1);
 	if (Msg != NULL) {
 		DestroyMessageSummary(Msg);
@@ -1231,11 +1237,11 @@ void edit_vcard(void) {
  *  parse edited vcard from the browser
  */
 void submit_vcard(void) {
-	wcsession *WCC = WC;
 	struct vCard *v;
 	char *serialized_vcard;
 	char buf[SIZ];
 	StrBuf *Buf;
+	const StrBuf *ForceRoom;
 	int i;
 
 	if (!havebstr("ok_button")) { 
@@ -1244,19 +1250,13 @@ void submit_vcard(void) {
 	}
 
 	if (havebstr("force_room")) {
-		if (gotoroom(sbstr("force_room")) != 200) {
-			StrBufAppendBufPlain(WCC->ImportantMsg,
-					     _("Unable to enter the room to save your message"),
-					     -1, 0);
-			StrBufAppendBufPlain(WCC->ImportantMsg,
-					     HKEY(": "), 0);
-			StrBufAppendBuf(WCC->ImportantMsg, sbstr("force_room"), 0);
-			StrBufAppendBufPlain(WCC->ImportantMsg,
-					     HKEY("; "), 0);
-					       
-			StrBufAppendBufPlain(WCC->ImportantMsg,
-					     _("Aborting."),
-					     -1, 0);
+		ForceRoom = sbstr("force_room");
+		if (gotoroom(ForceRoom) != 200) {
+			AppendImportantMessage(_("Unable to enter the room to save your message"), -1);
+			AppendImportantMessage(HKEY(": "));
+			AppendImportantMessage(SKEY(ForceRoom));
+			AppendImportantMessage(HKEY("; "));
+			AppendImportantMessage(_("Aborting."), -1);
 
 			if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
 				select_user_to_edit(NULL);
@@ -1274,27 +1274,23 @@ void submit_vcard(void) {
 		}
 	}
 
-	sprintf(buf, "ENT0 1|||4||");
-	serv_puts(buf);
-	serv_getln(buf, sizeof buf);
-	if (buf[0] != '4') {
+	Buf = NewStrBuf();
+	serv_write(HKEY("ENT0 1|||4||||||1\n"));
+	if (!StrBuf_ServGetln(Buf) && (GetServerStatus(Buf, NULL) != 4))
+	{
 		edit_vcard();
 		return;
 	}
 
 	/* Make a vCard structure out of the data supplied in the form */
-	Buf = NewStrBuf();
 	StrBufPrintf(Buf, "begin:vcard\r\n%s\r\nend:vcard\r\n",
 		     bstr("extrafields")
 	);
 	v = VCardLoad(Buf);	/* Start with the extra fields */
-	FreeStrBuf(&Buf);
 	if (v == NULL) {
-		safestrncpy(WCC->ImportantMessage,
-			_("An error has occurred."),
-			sizeof WCC->ImportantMessage
-		);
+		AppendImportantMessage(_("An error has occurred."), -1);
 		edit_vcard();
+		FreeStrBuf(&Buf);
 		return;
 	}
 
@@ -1336,20 +1332,20 @@ void submit_vcard(void) {
 	serialized_vcard = vcard_serialize(v);
 	vcard_free(v);
 	if (serialized_vcard == NULL) {
-		safestrncpy(WCC->ImportantMessage,
-			_("An error has occurred."),
-			sizeof WCC->ImportantMessage
-		);
+		AppendImportantMessage(_("An error has occurred."), -1);
 		edit_vcard();
+		FreeStrBuf(&Buf);
 		return;
 	}
 
-	serv_puts("Content-type: text/x-vcard; charset=UTF-8");
-	serv_puts("");
+	serv_write(HKEY("Content-type: text/x-vcard; charset=UTF-8\n"));
+	serv_write(HKEY("\n"));
 	serv_printf("%s\r\n", serialized_vcard);
-	serv_puts("000");
+	serv_write(HKEY("000\n"));
 	free(serialized_vcard);
 
+	StrBuf_ServGetln(Buf);
+
 	if (!strcmp(bstr("return_to"), "select_user_to_edit")) {
 		select_user_to_edit(NULL);
 	}
@@ -1362,6 +1358,7 @@ void submit_vcard(void) {
 	else {
 		readloop(readnew, eUseDefault);
 	}
+	FreeStrBuf(&Buf);
 }
 
 
@@ -1414,7 +1411,9 @@ int vcard_GetParamsGetServerCall(SharedMessageStatus *Stat,
 				 void **ViewSpecific, 
 				 long oper, 
 				 char *cmd, 
-				 long len)
+				 long len,
+				 char *filter,
+				 long flen)
 {
 	vcardview_struct *VS;
 
@@ -1511,6 +1510,7 @@ InitModule_VCARD
 		VIEW_ADDRESSBOOK,
 		vcard_GetParamsGetServerCall,
 		NULL,
+		NULL,
 		NULL, 
 		vcard_LoadMsgFromServer,
 		vcard_RenderView_or_Tail,