X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fpreferences.c;h=b66a3bd383536baff970c2289aecc72a67ec49e0;hb=77ad06c3f4bf4d2a4e3a7ff82ec94fcdff343273;hp=f6e4bab1458695743eebb7633ebb3ab62486f670;hpb=c5d32a4b382cc366776eb0ec06c93ab15245c6da;p=citadel.git

diff --git a/webcit/preferences.c b/webcit/preferences.c
index f6e4bab14..b66a3bd38 100644
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -45,13 +45,51 @@ inline const char *PrintPref(void *Prefstr)
 }
 #endif
 
+
+void ParsePref(HashList **List, StrBuf *ReadBuf)
+{
+	StrBuf *Key;
+	StrBuf *Data = NULL;
+	StrBuf *LastData = NULL;
+				
+	Key = NewStrBuf();
+	while (StrBuf_ServGetln(ReadBuf), 
+	       strcmp(ChrPtr(ReadBuf), "000")) 
+	{
+		if ((ChrPtr(ReadBuf)[0] == ' ') &&
+		    (Data != NULL)) {
+			StrBufAppendBuf(Data, ReadBuf, 1);
+		}
+		else {
+			LastData = Data = NewStrBuf();
+			StrBufExtract_token(Key, ReadBuf, 0, '|');
+			StrBufExtract_token(Data, ReadBuf, 1, '|');
+			if (!IsEmptyStr(ChrPtr(Key)))
+			{
+				Put(*List, 
+				    ChrPtr(Key), StrLength(Key), 
+				    Data, 
+				    HFreeStrBuf);
+			}
+			else 
+			{
+				FreeStrBuf(&Data);
+				LastData = NULL;
+			}
+		}
+	}
+	FreeStrBuf(&Key);
+}
+
+
 /*
  * display preferences dialog
  */
-void load_preferences(void) {
+void load_preferences(void) 
+{
+	StrBuf *ReadBuf;
 	char buf[SIZ];
 	long msgnum = 0L;
-	StrBuf *ReadBuf;
 	
 	serv_printf("GOTO %s", USERCONFIGROOM);
 	serv_getln(buf, sizeof buf);
@@ -77,40 +115,10 @@ void load_preferences(void) {
 				strcmp(ChrPtr(ReadBuf), "000"))) {
 			}
 			if (!strcmp(ChrPtr(ReadBuf), "text")) {
-				StrBuf *Key;
-				StrBuf *Data = NULL;
-				StrBuf *LastData = NULL;
-				
-				Key = NewStrBuf();
-				while (StrBuf_ServGetln(ReadBuf), 
-				       strcmp(ChrPtr(ReadBuf), "000")) 
-				{
-					if ((ChrPtr(ReadBuf)[0] == ' ') &&
-					    (Data != NULL)) {
-						StrBufAppendBuf(Data, ReadBuf, 1);
-					}
-					else {
-						LastData = Data = NewStrBuf();
-						StrBufExtract_token(Key, ReadBuf, 0, '|');
-						StrBufExtract_token(Data, ReadBuf, 1, '|');
-						if (!IsEmptyStr(ChrPtr(Key)))
-						{
-							Put(WC->hash_prefs, 
-							    ChrPtr(Key), StrLength(Key), 
-							    Data, 
-							    HFreeStrBuf);
-						}
-						else 
-						{
-							FreeStrBuf(&Data);
-							LastData = NULL;
-						}
-					}
-				}
-				FreeStrBuf(&Key);
+				ParsePref(&WC->hash_prefs, ReadBuf);
 			}
-			FreeStrBuf(&ReadBuf);
 		}
+		FreeStrBuf(&ReadBuf);
 	}
 
 	/* Go back to the room we're supposed to be in */
@@ -137,6 +145,62 @@ int goto_config_room(void) {
 	return(0);
 }
 
+void WritePrefsToServer(HashList *Hash)
+{
+	long len;
+	HashPos *HashPos;
+	void *Value;
+	const char *Key;
+	StrBuf *Buf;
+	StrBuf *SubBuf = NULL;
+	
+	Hash = WC->hash_prefs;
+#ifdef DBG_PREFS_HASH
+	dbg_PrintHash(Hash, PrintPref, NULL);
+#endif
+	HashPos = GetNewHashPos(Hash, 0);
+	while (GetNextHashPos(Hash, HashPos, &len, &Key, &Value)!=0)
+	{
+		size_t nchars;
+		Buf = (StrBuf*) Value;
+		if (Buf == NULL)
+			continue;
+		nchars = StrLength(Buf);
+		if (nchars > 80){
+			int n = 0;
+			size_t offset, nchars;
+			if (SubBuf == NULL)
+				SubBuf = NewStrBuf();
+			nchars = 1;
+			offset = 0;
+			while (nchars > 0) {
+				if (n == 0)
+					nchars = 70;
+				else 
+					nchars = 80;
+				
+				nchars = StrBufSub(SubBuf, Buf, offset, nchars);
+				
+				if (n == 0)
+					serv_printf("%s|%s", Key, ChrPtr(SubBuf));
+				else
+					serv_printf(" %s", ChrPtr(SubBuf));
+				
+				offset += nchars;
+				nchars = StrLength(Buf) - offset;
+				n++;
+			}
+			
+		}
+		else
+			serv_printf("%s|%s", Key, ChrPtr(Buf));
+		
+	}
+	if (SubBuf != NULL)
+		FreeStrBuf(&SubBuf);
+	DeleteHashPos(&HashPos);
+}
+
 /**
  * \brief save the modifications
  */
@@ -163,61 +227,10 @@ void save_preferences(void) {
 	serv_printf("ENT0 1||0|1|__ WebCit Preferences __|");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '4') {
-		long len;
-		HashPos *HashPos;
-		HashList *Hash;
-		void *Value;
-		const char *Key;
-		StrBuf *Buf;
-		StrBuf *SubBuf = NULL;
-		
-		Hash = WC->hash_prefs;
-#ifdef DBG_PREFS_HASH
-		dbg_PrintHash(Hash, PrintPref, NULL);
-#endif
-		HashPos = GetNewHashPos();
-		while (GetNextHashPos(Hash, HashPos, &len, &Key, &Value)!=0)
-		{
-			size_t nchars;
-			Buf = (StrBuf*) Value;
-			if (Buf == NULL)
-				continue;
-			nchars = StrLength(Buf);
-			if (nchars > 80){
-				int n = 0;
-				size_t offset, nchars;
-				if (SubBuf == NULL)
-					SubBuf = NewStrBuf();
-				nchars = 1;
-				offset = 0;
-				while (nchars > 0) {
-					if (n == 0)
-						nchars = 70;
-					else 
-						nchars = 80;
-
-					nchars = StrBufSub(SubBuf, Buf, offset, nchars);
-					
-					if (n == 0)
-						serv_printf("%s|%s", Key, ChrPtr(SubBuf));
-					else
-						serv_printf(" %s", ChrPtr(SubBuf));
-
-					offset += nchars;
-					nchars = StrLength(Buf) - offset;
-					n++;
-				}
-				
-			}
-			else
-				serv_printf("%s|%s", Key, ChrPtr(Buf));
-			
-		}
-		if (SubBuf != NULL)
-			FreeStrBuf(&SubBuf);
+
+		WritePrefsToServer(WC->hash_prefs);
 		serv_puts("");
 		serv_puts("000");
-		DeleteHashPos(&HashPos);
 	}
 
 	/** Go back to the room we're supposed to be in */
@@ -344,279 +357,47 @@ void set_ROOM_PREFS(const char *key, size_t keylen, StrBuf *value, int save_to_s
 	FreeStrBuf(&pref_name);
 }
 
-/** 
- * \brief display form for changing your preferences and settings
+/*
+ * Offer to make any page the user's "start page."
  */
-void display_preferences(void)
-{
-	output_headers(1, 1, 1, 0, 0, 0);
-	StrBuf *ebuf = NULL;
-	int i;
-	long DayEnd, DayStart, WeekStart;
-	int UseSig, ShowEmptyFloors;
-	int time_format;
-	time_t tt;
-	struct tm tm;
-	char daylabel[32];
-	StrBuf *Buf;
-	StrBuf *Signature;
-
-	time_format = get_time_format_cached ();
-
-        wprintf("<div class=\"box\">\n");
-        wprintf("<div class=\"boxlabel\">");
-        wprintf(_("Preferences and settings"));
-        wprintf("</div>");
-
-        wprintf("<div class=\"boxcontent\">");
-
-	/** begin form */
-	wprintf("<form name=\"prefform\" action=\"set_preferences\" "
-		"method=\"post\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-
-	/** begin table */
-        wprintf("<table class=\"altern\">\n");
-
-	/**
-	 * Room list view
-	 */
-	get_preference("roomlistview", &Buf);
-	wprintf("<tr class=\"even\"><td>");
-	wprintf(PrefGetLocalStr(HKEY("roomlistview")));
-	wprintf("</td><td>");
-
-	wprintf("<input type=\"radio\" name=\"roomlistview\" VALUE=\"folders\"");
-	if (!strcasecmp(ChrPtr(Buf), "folders")) wprintf(" checked");
-	wprintf(">");
-	wprintf(_("Tree (folders) view"));
-	wprintf("</input>&nbsp;&nbsp;&nbsp;");
-
-	wprintf("<input type=\"radio\" name=\"roomlistview\" VALUE=\"rooms\"");
-	if (IsEmptyStr(ChrPtr(Buf)) || !strcasecmp(ChrPtr(Buf), "rooms")) wprintf(" checked");
-	wprintf(">");
-	wprintf(_("Table (rooms) view"));
-	wprintf("</input>\n");
-
-	wprintf("</td></tr>\n");
-
-	/**
-	 * Time hour format
-	 */
-
-	wprintf("<tr class=\"odd\"><td>");
-	wprintf(PrefGetLocalStr(HKEY("calhourformat")));
-	wprintf("</td><td>");
-
-	wprintf("<input type=\"radio\" name=\"calhourformat\" VALUE=\"12\"");
-	if (time_format == WC_TIMEFORMAT_AMPM) 
-		wprintf(" checked");
-	wprintf(">");
-	wprintf(_("12 hour (am/pm)"));
-	wprintf("</input>&nbsp;&nbsp;&nbsp;");
-
-	wprintf("<input type=\"radio\" name=\"calhourformat\" VALUE=\"24\"");
-	if (time_format == WC_TIMEFORMAT_24)
-		wprintf(" checked");
-	wprintf(">");
-	wprintf(_("24 hour"));
-	wprintf("</input>\n");
-
-	wprintf("</td></tr>\n");
-
-	/**
-	 * Calendar day view -- day start time
-	 */
-	get_pref_long("daystart", &DayStart, 8);
-
-	wprintf("<tr class=\"even\"><td>");
-	wprintf(PrefGetLocalStr(HKEY("daystart")));
-	wprintf("</td><td>");
-
-	wprintf("<select name=\"daystart\" size=\"1\">\n");
-	for (i=0; i<=23; ++i) {
-
-		if (time_format == WC_TIMEFORMAT_24) {
-			wprintf("<option %s value=\"%d\">%d:00</option>\n",
-				((DayStart == i) ? "selected" : ""),
-				i, i
-			);
-		}
-		else {
-			wprintf("<option %s value=\"%d\">%s</option>\n",
-				((DayStart == i) ? "selected" : ""),
-				i, hourname[i]
-			);
-		}
+void offer_start_page(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType) {
+	wprintf("<a href=\"change_start_page?startpage=");
+	urlescputs(WC->this_page);
+	wprintf("\">");
+	wprintf(_("Make this my start page"));
+	wprintf("</a>");
+#ifdef TECH_PREVIEW
+	wprintf("<br/><a href=\"rss?room=");
+	urlescputs(WC->wc_roomname);
+	wprintf("\" title=\"RSS 2.0 feed for ");
+	escputs(WC->wc_roomname);
+	wprintf("\"><img alt=\"RSS\" border=\"0\" src=\"static/xml_button.gif\"/></a>\n");
+#endif
+}
 
-	}
-	wprintf("</select>\n");
-	wprintf("</td></tr>\n");
-
-	/**
-	 * Calendar day view -- day end time
-	 */
-	get_pref_long("dayend", &DayEnd, 17);
-
-	wprintf("<tr class=\"odd\"><td>");
-	wprintf(PrefGetLocalStr(HKEY("dayend")));
-	wprintf("</td><td>");
-
-	wprintf("<select name=\"dayend\" size=\"1\">\n");
-	for (i=0; i<=23; ++i) {
-
-		if (time_format == WC_TIMEFORMAT_24) {
-			wprintf("<option %s value=\"%d\">%d:00</option>\n",
-				((DayEnd == i) ? "selected" : ""),
-				i, i
-			);
-		}
-		else {
-			wprintf("<option %s value=\"%d\">%s</option>\n",
-				((DayEnd == i) ? "selected" : ""),
-				i, hourname[i]
-			);
-		}
 
-	}
-	wprintf("</select>\n");
-	wprintf("</td></tr>\n");
-
-	/**
-	 * Day of week to begin calendar month view
-	 */
-	get_pref_long("weekstart", &WeekStart, 17);
-	wprintf("<tr class=\"even\"><td>");
-	wprintf(PrefGetLocalStr(HKEY("weekstart")));
-	wprintf("</td><td>");
-
-	wprintf("<select name=\"weekstart\" size=\"1\">\n");
-
-	for (i=0; i<=1; ++i) {
-                tt = time(NULL);
-                localtime_r(&tt, &tm);
-		tm.tm_wday = i;
-                wc_strftime(daylabel, sizeof daylabel, "%A", &tm);
-
-		wprintf("<option %s value=\"%d\">%s</option>\n",
-			((WeekStart == i) ? "selected" : ""),
-			i, daylabel
-		);
-	}
+/*
+ * Change the user's start page
+ */
+void change_start_page(void) {
 
-	wprintf("</select>\n");
-	wprintf("</td></tr>\n");
-
-	/**
-	 * Signature
-	 */
-	get_pref_yesno("use_sig", &UseSig, 0);
-	wprintf("<tr class=\"odd\"><td>");
-	wprintf(_("Attach signature to email messages?"));
-	wprintf("</td><td>");
-
-	wprintf("	<script type=\"text/javascript\">					"
-		"	function show_or_hide_sigbox() {					"
-		"		if ( $F('yes_sig') ) {						"
-		"			$('signature_box').style.display = 'inline';		"
-		"		}								"
-		"		else {								"
-		"			$('signature_box').style.display = 'none';		"
-		"		}								"
-		"	}									"
-		"	</script>								"
-	);
-
-	wprintf(PrefGetLocalStr(HKEY("use_sig")));
-
-	wprintf("<input type=\"radio\" id=\"no_sig\" name=\"use_sig\" VALUE=\"no\"");
-	if (!UseSig) wprintf(" checked");
-	wprintf(" onChange=\"show_or_hide_sigbox();\" >");
-	wprintf(_("No signature"));
-	wprintf("</input>&nbsp,&nbsp;&nbsp;\n");
-
-	wprintf("<input type=\"radio\" id=\"yes_sig\" name=\"use_sig\" VALUE=\"yes\"");
-	if (UseSig) wprintf(" checked");
-	wprintf(" onChange=\"show_or_hide_sigbox();\" >");
-	wprintf(PrefGetLocalStr(HKEY("signature")));
-	wprintf("<div id=\"signature_box\">"
-		"<br><textarea name=\"signature\" cols=\"40\" rows=\"5\">"
-	);
-
-	get_preference("signature", &Signature);
-	ebuf = NewStrBuf();
-	StrBufEUid_unescapize(ebuf, Signature);
-	StrEscPuts(ebuf);
-	FreeStrBuf(&ebuf);
-	wprintf("</textarea>"
-		"</div>"
-	);
-
-	wprintf("</input>\n");
-
-	wprintf("</td></tr>\n");
-
-	wprintf("	<script type=\"text/javascript\">	"
-		"	show_or_hide_sigbox();			"
-		"	</script>				"
-	);
-
-	/** Character set to assume is in use for improperly encoded headers */
-	if (!get_preference("default_header_charset", &Buf)) {
-		Buf = NewStrBuf();
-		StrBufPrintf(Buf, "%s", "UTF-8");
-		set_preference("default_header_charset", Buf, 0);
+	if (bstr("startpage") == NULL) {
+		safestrncpy(WC->ImportantMessage,
+			_("You no longer have a start page selected."),
+			sizeof WC->ImportantMessage);
+		display_main_menu();
+		return;
 	}
-	wprintf("<tr class=\"even\"><td>");
-	wprintf(PrefGetLocalStr(HKEY("default_header_charset")));
-	wprintf("</td><td>");
-	wprintf("<input type=\"text\" NAME=\"default_header_charset\" MAXLENGTH=\"32\" VALUE=\"");
-	StrEscPuts(Buf); // here shouldn't be bad chars, so...
-	wprintf("\">");
-	wprintf("</td></tr>");
-
-	/**
-	 * Show empty floors?
-	 */
-
-	get_pref_yesno("emptyfloors", &ShowEmptyFloors, 0);
-	wprintf("<tr class=\"odd\"><td>");
-	wprintf(PrefGetLocalStr(HKEY("emptyfloors")));
-	wprintf("</td><td>");
-
-	wprintf("<input type=\"radio\" name=\"emptyfloors\" VALUE=\"yes\"");
-	if (ShowEmptyFloors) wprintf(" checked");
-	wprintf(">");
-	wprintf(_("Yes"));
-	wprintf("</input>&nbsp;&nbsp;&nbsp;");
-
-	wprintf("<input type=\"radio\" name=\"emptyfloors\" VALUE=\"no\"");
-	if (!ShowEmptyFloors) wprintf(" checked");
-	wprintf(">");
-	wprintf(_("No"));
-	wprintf("</input>\n");
-
-	wprintf("</td></tr>\n");
-
-	/** end table */
-	wprintf("</table>\n");
-
-	/** submit buttons */
-	wprintf("<div class=\"buttons\"> ");
-	wprintf("<input type=\"submit\" name=\"change_button\" value=\"%s\">"
-		"&nbsp;"
-		"<INPUT type=\"submit\" name=\"cancel_button\" value=\"%s\">\n",
-		_("Change"),
-		_("Cancel")
-	);
-	wprintf("</div>\n");
-
-	/** end form */
-	wprintf("</form>\n");
-	wprintf("</div>\n");
+
+	set_preference("startpage", NewStrBufPlain(bstr("startpage"), -1), 1);
+
+	output_headers(1, 1, 0, 0, 0, 0);
+	do_template("newstartpage", NULL);
 	wDumpContent(1);
 }
 
+
+
 /**
  * \brief Commit new preferences and settings
  */
@@ -626,34 +407,38 @@ void set_preferences(void)
 	StrBuf *buf, *encBuf;
 	int *time_format_cache;
 	
-	time_format_cache = &(WC->time_format_cache);
-
-	if (!havebstr("change_button")) {
-		safestrncpy(WC->ImportantMessage, 
-			_("Cancelled.  No settings were changed."),
-			sizeof WC->ImportantMessage);
-		display_main_menu();
-		return;
-	}
+	 time_format_cache = &(WC->time_format_cache);
+
+	 if (!havebstr("change_button")) {
+		 safestrncpy(WC->ImportantMessage, 
+			 _("Cancelled.  No settings were changed."),
+			 sizeof WC->ImportantMessage);
+		 display_main_menu();
+		 return;
+	 }
+
+	 /**
+	  * Set the last argument to 1 only for the final setting, so
+	  * we don't send the prefs file to the server repeatedly
+	  */
+	 set_preference("roomlistview", NewStrBufPlain(bstr("roomlistview"), -1), 0);
+	 fmt = lbstr("calhourformat");
+	 set_pref_long("calhourformat", fmt, 0);
+	 if (fmt == 24) 
+		 *time_format_cache = WC_TIMEFORMAT_24;
+	 else
+		 *time_format_cache = WC_TIMEFORMAT_AMPM;
+
+	 set_pref_long("weekstart", lbstr("weekstart"), 0);
+	 set_pref_yesno("use_sig", yesbstr("use_sig"), 0);
+	 set_pref_long("daystart", lbstr("daystart"), 0);
+	 set_pref_long("dayend", lbstr("dayend"), 0);
+	 set_preference("default_header_charset", NewStrBufPlain(bstr("default_header_charset"), -1), 0);
+	 set_preference("emptyfloors", NewStrBufPlain(bstr("emptyfloors"), -1), 0);
+	 set_preference("defaultfrom", NewStrBufDup(sbstr("defaultfrom")), 0);
+	 set_preference("defaultname", NewStrBufDup(sbstr("defaultname")), 0);
+	 set_preference("defaulthandle", NewStrBufDup(sbstr("defaulthandle")), 0);
 
-	/**
-	 * Set the last argument to 1 only for the final setting, so
-	 * we don't send the prefs file to the server repeatedly
-	 */
-	set_preference("roomlistview", NewStrBufPlain(bstr("roomlistview"), -1), 0);
-	fmt = lbstr("calhourformat");
-	set_pref_long("calhourformat", fmt, 0);
-	if (fmt == 24) 
-		*time_format_cache = WC_TIMEFORMAT_24;
-	else
-		*time_format_cache = WC_TIMEFORMAT_AMPM;
-
-	set_pref_long("weekstart", lbstr("weekstart"), 0);
-	set_pref_yesno("use_sig", yesbstr("use_sig"), 0);
-	set_pref_long("daystart", lbstr("daystart"), 0);
-	set_pref_long("dayend", lbstr("dayend"), 0);
-	set_preference("default_header_charset", NewStrBufPlain(bstr("default_header_charset"), -1), 0);
-	set_preference("emptyfloors", NewStrBufPlain(bstr("emptyfloors"), -1), 0);
 
 	buf = NewStrBufPlain(bstr("signature"), -1);
 	encBuf = NewStrBuf();
@@ -671,20 +456,17 @@ void set_preferences(void)
 #define PRF_YESNO 4
 
 
-void tmplput_CFG_Value(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+void tmplput_CFG_Value(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
 	StrBuf *Setting;
-	if (get_PREFERENCE(Token->Params[0]->Start,
-			   Token->Params[0]->len,
-			   &Setting))
-		StrBufAppendBuf(Target, Setting, 0);
+	if (get_PREFERENCE(TKEY(0), &Setting))
+	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Setting, 1);
 }
 
-void tmplput_CFG_Descr(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+void tmplput_CFG_Descr(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
 	const char *SettingStr;
-	SettingStr = PrefGetLocalStr(Token->Params[0]->Start,
-				     Token->Params[0]->len);
+	SettingStr = PrefGetLocalStr(TKEY(0));
 	if (SettingStr != NULL) 
 		StrBufAppendBufPlain(Target, SettingStr, -1, 0);
 }
@@ -697,23 +479,106 @@ void CfgZoneTempl(StrBuf *TemplBuffer, void *vContext, WCTemplateToken *Token)
 	SVPutBuf("ZONENAME", Zone, 1);
 }
 
-int ConditionalPreference(WCTemplateToken *Token, void *Context, int ContextType)
+int ConditionalPreference(WCTemplateToken *Tokens, void *Context, int ContextType)
 {
 	StrBuf *Pref;
 
-	if (!get_PREFERENCE(Token->Params[2]->Start,
-			    Token->Params[2]->len,
-			    &Pref)) 
+	if (!get_PREFERENCE(TKEY(2), &Pref)) 
 		return 0;
 	
-	if (Token->nParameters == 3) {
+	if (Tokens->nParameters == 3) {
 		return 1;
 	}
-	else if (Token->Params[3]->Type == TYPE_STR)
-		return ((Token->Params[3]->len == StrLength(Pref)) &&
-			(strcmp(Token->Params[3]->Start, ChrPtr(Pref)) == 0));
+	else if (Tokens->Params[3]->Type == TYPE_STR)
+		return ((Tokens->Params[3]->len == StrLength(Pref)) &&
+			(strcmp(Tokens->Params[3]->Start, ChrPtr(Pref)) == 0));
 	else 
-		return (StrTol(Pref) == Token->Params[3]->lvalue);
+		return (StrTol(Pref) == Tokens->Params[3]->lvalue);
+}
+
+int ConditionalHazePreference(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+	StrBuf *Pref;
+
+	if (!get_PREFERENCE(TKEY(2), &Pref) || 
+	    (Pref == NULL)) 
+		return 0;
+	else 
+		return 1;
+}
+
+HashList *GetGVEAHash(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+	StrBuf *Rcp;
+	HashList *List = NULL;
+	int Done = 0;
+	int i, n = 1;
+	char N[64];
+
+	Rcp = NewStrBuf();
+	serv_puts("GVEA");
+	StrBuf_ServGetln(Rcp);
+	if (ChrPtr(Rcp)[0] == '1') {
+		FlushStrBuf(Rcp);
+		List = NewHash(1, NULL);
+		while (!Done && (StrBuf_ServGetln(Rcp)>=0)) {
+			if ( (StrLength(Rcp)==3) && 
+			     !strcmp(ChrPtr(Rcp), "000")) 
+			{
+				Done = 1;
+			}
+			else {
+				i = snprintf(N, sizeof(N), "%d", n);
+				StrBufTrim(Rcp);
+				Put(List, N, i, Rcp, HFreeStrBuf);
+				Rcp = NewStrBuf();
+			}
+			n++;
+		}
+	}
+	FreeStrBuf(&Rcp);
+	return List;
+}
+void DeleteGVEAHash(HashList **KillMe)
+{
+	DeleteHash(KillMe);
+}
+
+HashList *GetGVSNHash(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+	StrBuf *Rcp;
+	HashList *List = NULL;
+	int Done = 0;
+	int i, n = 1;
+	char N[64];
+
+	Rcp = NewStrBuf();
+	serv_puts("GVSN");
+	StrBuf_ServGetln(Rcp);
+	if (ChrPtr(Rcp)[0] == '1') {
+		FlushStrBuf(Rcp);
+		List = NewHash(1, NULL);
+		while (!Done && (StrBuf_ServGetln(Rcp)>=0)) {
+			if ( (StrLength(Rcp)==3) && 
+			     !strcmp(ChrPtr(Rcp), "000")) 
+			{
+				Done = 1;
+			}
+			else {
+				i = snprintf(N, sizeof(N), "%d", n);
+				StrBufTrim(Rcp);
+				Put(List, N, i, Rcp, HFreeStrBuf);
+				Rcp = NewStrBuf();
+			}
+			n++;
+		}
+	}
+	FreeStrBuf(&Rcp);
+	return List;
+}
+void DeleteGVSNHash(HashList **KillMe)
+{
+	DeleteHash(KillMe);
 }
 
 
@@ -721,8 +586,8 @@ void
 InitModule_PREFERENCES
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_preferences"), display_preferences, 0);
 	WebcitAddUrlHandler(HKEY("set_preferences"), set_preferences, 0);
+	WebcitAddUrlHandler(HKEY("change_start_page"), change_start_page, 0);
 
 	RegisterPreference("roomlistview",_("Room list view"),PRF_STRING);
 	RegisterPreference("calhourformat",_("Time format"), PRF_INT);
@@ -734,11 +599,22 @@ InitModule_PREFERENCES
 	RegisterPreference("signature",_("Use this signature:"),PRF_QP_STRING);
 	RegisterPreference("default_header_charset", _("Default character set for email headers:") ,PRF_STRING);
 	RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO);
+	RegisterPreference("defaultfrom", _("Prefered Email Address"), PRF_STRING);
+	RegisterPreference("defaultname", _("Prefered Email Sendername"), PRF_STRING);
+	RegisterPreference("defaulthandle", _("Prefered Name for posting messages"), PRF_STRING);
+
 	
-	RegisterNamespace("PREF:VALUE", 1, 1, tmplput_CFG_Value, CTX_SESSION);
-	RegisterNamespace("PREF:DESCR", 1, 1, tmplput_CFG_Descr, CTX_SESSION);
+	RegisterNamespace("PREF:VALUE", 1, 2, tmplput_CFG_Value, CTX_NONE);
+	RegisterNamespace("PREF:DESCR", 1, 1, tmplput_CFG_Descr, CTX_NONE);
 	RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, CfgZoneTempl, NULL, CTX_PREF, CTX_NONE);
 
 	RegisterConditional(HKEY("COND:PREF"), 4, ConditionalPreference, CTX_NONE);
+	RegisterConditional(HKEY("COND:PREF:SET"), 4, ConditionalHazePreference, CTX_NONE);
+	
+	RegisterIterator("PREF:VALID:EMAIL:ADDR", 0, NULL, 
+			 GetGVEAHash, NULL, DeleteGVEAHash, CTX_STRBUF, CTX_NONE);
+	RegisterIterator("PREF:VALID:EMAIL:NAME", 0, NULL, 
+			 GetGVSNHash, NULL, DeleteGVSNHash, CTX_STRBUF, CTX_NONE);
+
 }
 /*@}*/