X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fpushemail.c;h=b899db1f4c46d815bfeee480ec88c19b291f30d3;hb=9c04876f6d40ba51a047c32bf250d625250f2312;hp=bc6a340dfc5a596102bf0a4b591fa108b9c11dd1;hpb=291f0e6f7015cd45affbfb97df99c9b26023a019;p=citadel.git

diff --git a/webcit/pushemail.c b/webcit/pushemail.c
index bc6a340df..b899db1f4 100644
--- a/webcit/pushemail.c
+++ b/webcit/pushemail.c
@@ -8,11 +8,15 @@ void display_pushemail(void)
 {
 	int Done = 0;
 	StrBuf *Buf;
-	int is_none = 0;
-	int is_pager = 0;
-	int is_funambol = 0;
+	long vector[8] = {8, 0, 0, 1, 2, 3, 4, 5};
+	WCTemplputParams SubTP;
 	char mobnum[20];
 
+	memset(&SubTP, 0, sizeof(WCTemplputParams));
+	SubTP.Filter.ContextType = CTX_LONGVECTOR;
+	SubTP.Context = &vector;
+	vector[0] = 16;
+
 	/* Find any existing settings*/
 	Buf = NewStrBuf();
 	if (goto_config_room(Buf) == 0) {
@@ -59,12 +63,14 @@ void display_pushemail(void)
 						break;
 					}
 					if (strncasecmp(ChrPtr(Buf), "none", 4) == 0) {
-						is_none = 1;
+						vector[1] = 0;
 					} else if (strncasecmp(ChrPtr(Buf), "textmessage", 11) == 0) {
-						is_pager = 1;
+						vector[1] = 1;
 						i++;
 					} else if (strncasecmp(ChrPtr(Buf), "funambol", 8) == 0) {
-						is_funambol = 1;
+						vector[1] = 2;
+					} else if (strncasecmp(ChrPtr(Buf), "httpmessage", 12) == 0) {
+						vector[1] = 3;
 					} else if (i == 1) {
 						strncpy(mobnum, ChrPtr(Buf), 20);
 						i++;
@@ -73,26 +79,13 @@ void display_pushemail(void)
 			}
 		}
 		}
-		/* 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));
 		StrBuf_ServGetln(Buf);
 		GetServerStatus(Buf, NULL);
 	}
 	output_headers(1, 1, 2, 0, 0, 0);
-	do_template("pushemail", NULL);
-/*do_template("endbox"); */
+	DoTemplate(HKEY("pushemail"), NULL, &SubTP);
 	wDumpContent(1);
 	FreeStrBuf(&Buf);
 }
@@ -121,6 +114,7 @@ void save_pushemail(void)
 		serv_puts("000");
 	} else {
 		printf("Junk in save_pushemail buffer!: %s\n", buf);
+		FreeStrBuf(&Buf);
 		return;
 	}
 
@@ -156,6 +150,7 @@ void save_pushemail(void)
 	StrBuf_ServGetln(Buf);
 	GetServerStatus(Buf, NULL);
 	http_redirect("display_pushemail");
+	FreeStrBuf(&Buf);
 }
 
 void