Room links in iconbar roomlist now properly escaped with encodeURIcomponent()

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 60e421bd34fe635d4f4699b7e1de2d7d7893f95c..7a6e39d1ac477d9da041872a5892a931e79d52a6 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -133,7 +133,7 @@ void LoadIconSettings(StrBuf *iconbar, long lvalue)
        {
                WCC->IBSettingsVec = (long*) malloc (nIBV * sizeof(long));
        }
-       /**
+       /*
         * The initialized values of these variables also happen to
         * specify the default values for users who haven't customized
         * their iconbars.  These should probably be set in a master
@@ -276,6 +276,23 @@ int ConditionalRoomlistExpanded(StrBuf *Target, WCTemplputParams *TP)
 
 
 
+/*
+ * Toggle the roomlist expanded state in session memory
+ */
+void toggle_roomlist_expanded_state(void) {
+       wcsession *WCC = WC;
+
+       if (!WCC) {
+               wc_printf("no session");
+               return;
+       }
+
+       WCC->ib_roomlist_expanded = IBSTR("wstate");
+       wc_printf("%d", WCC->ib_roomlist_expanded);
+       syslog(LOG_DEBUG, "ib_roomlist_expanded set to %d", WCC->ib_roomlist_expanded);
+}
+
+
 /*
  * Toggle the wholist expanded state in session memory
  */
@@ -302,6 +319,7 @@ InitModule_ICONBAR
        /*WebcitAddUrlHandler(HKEY("user_iconbar"), "", 0, doUserIconStylesheet, 0); */
        WebcitAddUrlHandler(HKEY("commit_iconbar"), "", 0, commit_iconbar, 0);
        WebcitAddUrlHandler(HKEY("toggle_wholist_expanded_state"), "", 0, toggle_wholist_expanded_state, AJAX);
+       WebcitAddUrlHandler(HKEY("toggle_roomlist_expanded_state"), "", 0, toggle_roomlist_expanded_state, AJAX);
        RegisterConditional(HKEY("COND:ICONBAR:ACTIVE"), 3, ConditionalIsActiveStylesheet, CTX_NONE);
        RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar, NULL, CTX_NONE);
        RegisterConditional(HKEY("COND:ICONBAR:WHOLISTEXPANDED"), 0, ConditionalWholistExpanded, CTX_NONE);