X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fpushemail.c;h=92fd026b13d5f45fb9975252db923598f4f428d8;hb=HEAD;hp=5c55ddc390224c2ae53f7cf32b01acd04f28ab5e;hpb=d7069aa427060cf5f4e3a6eb919f0a36cdda86c1;p=citadel.git

diff --git a/webcit/pushemail.c b/webcit/pushemail.c
index 5c55ddc39..92fd026b1 100644
--- a/webcit/pushemail.c
+++ b/webcit/pushemail.c
@@ -4,103 +4,145 @@
  */
 #include "webcit.h"
 
-void display_pushemail(void) {
-	char buf[SIZ];
-	int is_none = 0;
-	int is_pager = 0;
-	int is_funambol = 0;
+void display_pushemail(void) 
+{
+	folder Room;
+	int Done = 0;
+	StrBuf *Buf;
+	long vector[8] = {8, 0, 0, 1, 2, 3, 4, 5};
+	WCTemplputParams SubTP;
 	char mobnum[20];
 
+	StackContext(NULL, &SubTP, &vector, CTX_LONGVECTOR, 0, NULL);
+	vector[0] = 16;
+
 	/* Find any existing settings*/
-	if (goto_config_room() == 0) {
+	Buf = NewStrBuf();
+	memset(&Room, 0, sizeof(folder));
+	if (goto_config_room(Buf, &Room) == 0) {
 		int msgnum = 0;
 		serv_puts("MSGS ALL|0|1");
-		serv_getln(buf, sizeof(buf));
-		if (buf[0] == '8') {
+		StrBuf_ServGetln(Buf);
+		if (GetServerStatus(Buf, NULL) == 8) {
 			serv_puts("subj|__ Push email settings __");
 			serv_puts("000");
-			while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-				msgnum = atol(buf);
+			while (!Done &&
+			       StrBuf_ServGetln(Buf) >= 0) {
+				if ( (StrLength(Buf)==3) && 
+				     !strcmp(ChrPtr(Buf), "000")) {
+					Done = 1;
+					break;
+				}
+				msgnum = StrTol(Buf);
 			}
-			
 		}
 		if (msgnum > 0L) {
 		serv_printf("MSG0 %d", msgnum);
-		serv_getln(buf, sizeof buf);
-		if (buf[0] == '1') {
+		StrBuf_ServGetln(Buf);
+		if (GetServerStatus(Buf, NULL) == 1) {
 			int i =0;
-			while (serv_getln(buf, sizeof buf),
-				(strcmp(buf, "text") && strcmp(buf, "000"))) {
+			Done = 0;
+			while (!Done &&
+			       StrBuf_ServGetln(Buf) >= 0) {
+				if (( (StrLength(Buf)==3) && 
+				      !strcmp(ChrPtr(Buf), "000"))||
+				    ((StrLength(Buf)==4) && 
+				     !strcmp(ChrPtr(Buf), "text")))
+				{
+					Done = 1;
+					break;
+				}
 			}
-			if (!strcmp(buf, "text")) {
-				while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { 
-					if (strncasecmp(buf, "none", 4) == 0) {
-						is_none = 1;
-					} else if (strncasecmp(buf, "textmessage", 11) == 0) {
-						is_pager = 1;
+			if (!strcmp(ChrPtr(Buf), "text")) {
+				Done = 0;
+				while (!Done &&
+				       StrBuf_ServGetln(Buf) >= 0) {
+					if ( (StrLength(Buf)==3) && 
+					     !strcmp(ChrPtr(Buf), "000")) {
+						Done = 1;
+						break;
+					}
+					if (strncasecmp(ChrPtr(Buf), "none", 4) == 0) {
+						vector[1] = 0;
+					} else if (strncasecmp(ChrPtr(Buf), "textmessage", 11) == 0) {
+						vector[1] = 1;
 						i++;
-					} else if (strncasecmp(buf, "funambol", 8) == 0) {
-						is_funambol = 1;
+					} else if (strncasecmp(ChrPtr(Buf), "funambol", 8) == 0) {
+						vector[1] = 2;
+					} else if (strncasecmp(ChrPtr(Buf), "httpmessage", 12) == 0) {
+						vector[1] = 3;
 					} else if (i == 1) {
-						strncpy(mobnum, buf, 20);
+						strncpy(mobnum, ChrPtr(Buf), 20);
 						i++;
 					}
 				}	
 			}
 		}
 		}
-		// TODO: do in a saner fashion. 
-		svput("PUSH_NONE", WCS_STRING, " "); // defaults
-		svput("PUSH_TEXT", WCS_STRING, " ");
-		svput("PUSH_FNBL", WCS_STRING, " ");
-		svput("SMSNUM", WCS_STRING, " ");
-	if (is_none) {
-		svput("PUSH_NONE", WCS_STRING, "checked=\"checked\"");
-	} else if (is_pager) {
-		svput("PUSH_TEXT", WCS_STRING, "checked=\"checked\"");
-		svprintf(HKEY("SMSNUM"), WCS_STRING, "value=\"%s\"", mobnum);
-	} else if (is_funambol) {
-		svput("PUSH_FNBL", WCS_STRING, "checked=\"checked\"");
-	}
-	serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
-	serv_getln(buf, sizeof  buf);
+		serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
+		StrBuf_ServGetln(Buf);
+		GetServerStatus(Buf, NULL);
 	}
-	output_headers(1, 1, 2, 0, 0, 0);
-	do_template("pushemail", NULL);
-/*do_template("endbox"); */
+	FlushFolder(&Room);
+	output_headers(1, 1, 1, 0, 0, 0);
+	DoTemplate(HKEY("prefs_pushemail"), NULL, &SubTP);
 	wDumpContent(1);
+	UnStackContext(&SubTP);
+	FreeStrBuf(&Buf);
 }
 
-void save_pushemail(void) {
+void save_pushemail(void) 
+{
+	folder Room;
+	int Done = 0;
+	StrBuf *Buf;
 	char buf[SIZ];
 	int msgnum = 0;
 	char *pushsetting = bstr("pushsetting");
 	char *sms = NULL;
+
 	if (strncasecmp(pushsetting, "textmessage", 11) == 0) {
 		sms = bstr("user_sms_number");
 	}
-	if (goto_config_room() != 0) return;	/* oh well. */
+	Buf = NewStrBuf();
+	memset(&Room, 0, sizeof(folder));
+	if (goto_config_room(Buf, &Room) != 0) {
+		FreeStrBuf(&Buf);
+		FlushFolder(&Room);
+		return;	/* oh well. */
+	}
+	FlushFolder(&Room);
+
 	serv_puts("MSGS ALL|0|1");
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '8') {
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) == 8) {
 		serv_puts("subj|__ Push email settings __");
 		serv_puts("000");
 	} else {
 		printf("Junk in save_pushemail buffer!: %s\n", buf);
+		FreeStrBuf(&Buf);
 		return;
 	}
-	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-		msgnum = atol(buf);
+
+	while (!Done &&
+	       StrBuf_ServGetln(Buf) >= 0) {
+		if ( (StrLength(Buf)==3) && 
+		     !strcmp(ChrPtr(Buf), "000")) {
+			Done = 1;
+			break;
+		}
+		msgnum = StrTol(Buf);
 	}
 
 	if (msgnum > 0L) {
 		serv_printf("DELE %d", msgnum);
-		serv_getln(buf, sizeof buf);
+		StrBuf_ServGetln(Buf);
+		GetServerStatus(Buf, NULL);
 	}
 
 	serv_printf("ENT0 1||0|1|__ Push email settings __|");
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '4') {
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) == 4) {
 		serv_puts(pushsetting);
 		if (sms != NULL) {
 		serv_puts(sms);
@@ -110,15 +152,17 @@ void save_pushemail(void) {
 	}
 
 	/** Go back to the room we're supposed to be in */
-	serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
-	serv_getln(buf, sizeof buf);
+	serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
+	StrBuf_ServGetln(Buf);
+	GetServerStatus(Buf, NULL);
 	http_redirect("display_pushemail");
+	FreeStrBuf(&Buf);
 }
 
 void 
 InitModule_PUSHMAIL
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_pushemail"), display_pushemail, 0);
-	WebcitAddUrlHandler(HKEY("save_pushemail"), save_pushemail, 0);
+	WebcitAddUrlHandler(HKEY("display_pushemail"), "", 0, display_pushemail, 0);
+	WebcitAddUrlHandler(HKEY("save_pushemail"), "", 0, save_pushemail, 0);
 }