/*
- * $Id$
- *
* Displays and customizes the iconbar.
+ *
+ * Copyright (c) 1996-2011 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 as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "webcit.h"
#define IconbarIsEnabled(a, b) IconbarIsENABLED(a, sizeof(a) - 1, b)
-long IconbarIsENABLED(const char *key, size_t keylen, long defval)
+
+HashList *IB_Seeting_Order = NULL;
+typedef struct _dflt_IB_Setting {
+ int DefVal; /* default value for non-set users */
+ long n; /* counter for internal purposes */
+ const char *Key; /* Stringvalue */
+ long len; /* Length... */
+}dflt_IB_Setting;
+
+long nIBV = 0;
+dflt_IB_Setting IconbarDefaults[] = {
+ {0, 0, HKEY("unused")},
+ {0, 1, HKEY("ib_displayas")},
+ {0, 2, HKEY("ib_logo")},
+ {1, 3, HKEY("ib_summary")},
+ {1, 4, HKEY("ib_inbox")},
+ {1, 5, HKEY("ib_calendar")},
+ {1, 6, HKEY("ib_contacts")},
+ {1, 7, HKEY("ib_notes")},
+ {1, 8, HKEY("ib_tasks")},
+ {1, 9, HKEY("ib_rooms")},
+ {1, 10, HKEY("ib_users")},
+ {1, 11, HKEY("ib_chat")},
+ {1, 12, HKEY("ib_advanced")},
+ {1, 13, HKEY("ib_logoff")},
+ {1, 14, HKEY("ib_citadel")},
+ {0, 15, HKEY("")}
+};
+
+HashList *IBDfl = NULL;
+
+
+long IconbarIsENABLED(long val, const char *key, size_t keylen)
{
- void *Data;
+ void *vIBDfl = NULL;
wcsession *WCC = WC;
- if (WCC == NULL)
- return defval;
-
- if (GetHash(WCC->IconBarSettings,
- key,
- keylen,
- &Data) &&
- (Data != NULL))
- return (long) Data;
+ if ((WCC != NULL) &&
+ (WCC->IBSettingsVec != NULL) &&
+ (val < nIBV))
+ {
+ return WCC->IBSettingsVec[val];
+ }
+ if (GetHash(IBDfl, key, keylen, &vIBDfl)) {
+ dflt_IB_Setting *Set = (dflt_IB_Setting*)vIBDfl;
+ return Set->DefVal;
+ }
else
- return defval;
+ return 1;
}
#ifdef DBG_ICONBAR_HASH
}
#endif
-/* Produces a stylesheet which hides any iconbar icons the user does not want */
-void doUserIconStylesheet(void) {
- HashPos *pos;
- void *Data;
- long value;
- const char *key;
- long HKLen;
-
- output_custom_content_header("text/css");
+/*
hprintf("Cache-Control: private\r\n");
-
- begin_burst();
- wprintf("#global { left: 16%%; }\r\n");
- pos = GetNewHashPos(WC->IconBarSettings, 0);
- while(GetNextHashPos(WC->IconBarSettings, pos, &HKLen, &key, &Data)) {
- value = (long) Data;
- if (value == 0
- && strncasecmp("ib_displayas",key,12)
- && strncasecmp("ib_logoff", key, 9)) {
- /* Don't shoot me for this */
- wprintf("#%s { display: none !important; }\r\n",key);
- } else if (!strncasecmp("ib_users",key, 8) && value == 2) {
- wprintf("#online_users { display: block; !important } \r\n");
- }
- }
- DeleteHashPos(&pos);
- end_burst();
-}
+*/
+
int ConditionalIsActiveStylesheet(StrBuf *Target, WCTemplputParams *TP) {
- long testFor = TP->Tokens->Params[3]->lvalue;
- int ib_displayas = IconbarIsEnabled("ib_displayas",IB_PICTEXT);
+ long testFor;
+ long lookAt;
+ long ib_displayas;
+
+ lookAt = GetTemplateTokenNumber(Target, TP, 3, IB_PICTEXT);
+ testFor = GetTemplateTokenNumber(Target, TP, 2, IB_PICTEXT);
+
+
+
+ ib_displayas = IconbarIsENABLED(lookAt, TKEY(3));
+/*
+ printf ("%ld == %ld ? %s : %s\n",
+ testFor,
+ ib_displayas,
+ IconbarDefaults[lookAt ].Key,
+ ChrPtr(TP->Tokens->FlatToken));
+*/
+
return (testFor == ib_displayas);
}
void LoadIconSettings(StrBuf *iconbar, long lvalue)
{
+ void *vIBDfl;
+ dflt_IB_Setting *Set;
+ const char *pCh = NULL;
+
wcsession *WCC = WC;
StrBuf *buf;
StrBuf *key;
long val;
- int i, nTokens;
- buf = NewStrBuf();;
+ buf = NewStrBuf();
key = NewStrBuf();
- if (WCC->IconBarSettings == NULL)
- WCC->IconBarSettings = NewHash(1, NULL);
- /**
+ if (WCC->IBSettingsVec == NULL)
+ {
+ 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
* configuration somewhere.
*/
- nTokens = StrBufNum_tokens(iconbar, ',');
- for (i=0; i<nTokens; ++i) {
- StrBufExtract_token(buf, iconbar, i, ',');
+ while (StrBufExtract_NextToken(buf, iconbar, &pCh, ',') >= 0)
+ {
StrBufExtract_token(key, buf, 0, '=');
val = StrBufExtract_long(buf, 1, '=');
- Put(WCC->IconBarSettings,
- ChrPtr(key), StrLength(key),
- (void*)val, DontDeleteThis);
- }
+ if (!GetHash(IBDfl, SKEY(key), &vIBDfl))
+ continue;
+ Set = (dflt_IB_Setting*)vIBDfl;
+
+ WCC->IBSettingsVec[Set->n] = val;
+/* printf("%ld %s %s -> %ld \n", Set->n, Set->Key, IconbarDefaults[Set->n].Key, val);*/
+ }
#ifdef DBG_ICONBAR_HASH
dbg_PrintHash(WCC->IconBarSetttings, PrintInt, NULL);
#endif
FreeStrBuf(&buf);
}
-/*
- * display a customized version of the iconbar
- */
-void display_customize_iconbar(void) {
- int i;
- int bar = 0;
- long val;
-
- int ib_displayas;
-
- output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"banner\">");
- wprintf("<h1>");
- wprintf(_("Customize the icon bar"));
- wprintf("</h1></div>\n");
-
- wprintf("<div id=\"content\" class=\"service\">\n");
-
- wprintf("<div class=\"fix_scrollbar_bug\">");
-
- wprintf("<form method=\"post\" action=\"commit_iconbar\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-
- wprintf("<table class=\"altern\" >\n");
- wprintf("<tr><td></td><td colspan=\"2\"><b>");
- wprintf(_("Display icons as:"));
- wprintf("</b>");
- ib_displayas = IconbarIsEnabled("ib_displayas",IB_PICTEXT);
- for (i=0; i<=2; ++i) {
- wprintf("<input type=\"radio\" name=\"ib_displayas\" value=\"%d\"", i);
- if (ib_displayas == i) wprintf(" CHECKED");
- wprintf(">");
- if (i == IB_PICTEXT) wprintf(_("pictures and text"));
- if (i == IB_PICONLY) wprintf(_("pictures only"));
- if (i == IB_TEXTONLY) wprintf(_("text only"));
- wprintf("\n");
- }
- wprintf("<br />\n");
-
- wprintf(_("Select the icons you would like to see displayed "
- "in the 'icon bar' menu on the left side of the "
- "screen."));
- wprintf("</td></tr>\n");
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_logo", 0);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_logo\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_logo\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"image&name=hello\" width=\"48\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Site logo"),
- _("An icon describing this site")
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_summary", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_summary\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_summary\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"static/summscreen_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Summary"),
- _("Your summary page")
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_inbox", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_inbox\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_inbox\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"static/privatemess_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Mail (inbox)"),
- _("A shortcut to your email Inbox")
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_contacts", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_contacts\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_contacts\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"static/viewcontacts_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Contacts"),
- _("Your personal address book")
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_notes", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_notes\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_notes\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"static/storenotes_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Notes"),
- _("Your personal notes")
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_calendar", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_calendar\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_calendar\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"static/calarea_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Calendar"),
- _("A shortcut to your personal calendar")
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_tasks", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_tasks\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_tasks\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"static/taskmanag_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Tasks"),
- _("A shortcut to your personal task list")
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_rooms", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_rooms\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_rooms\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"static/chatrooms_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Rooms"),
- _("Clicking this icon displays a list of all accessible "
- "rooms (or folders) available.")
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_users", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_users\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_users\" value=\"no\" %s> %s <br />"
- "<input type=\"radio\" name=\"ib_users\" value=\"yeslist\" %s> %s"
- "</td><td>"
- "<img src=\"static/usermanag_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b>"
- "<br />%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- ((val > 1) ? "CHECKED" : ""),_("Yes with users list"),
- _("Who is online?"),
- _("Clicking this icon displays a list of all users "
- "currently logged in.")
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_chat", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_chat\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_chat\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"static/citadelchat_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Chat"),
- _("Clicking this icon enters real-time chat mode "
- "with other users in the same room.")
-
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_advanced", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_advanced\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_advanced\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img src=\"static/advanpage2_48x.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Advanced options"),
- _("Access to the complete menu of Citadel functions.")
-
- );
-
- bar = 1 - bar;
- val = IconbarIsEnabled("ib_citadel", 1);
- wprintf("<tr class=\"%s\"><td>"
- "<input type=\"radio\" name=\"ib_citadel\" value=\"yes\" %s> %s "
- "<input type=\"radio\" name=\"ib_citadel\" value=\"no\" %s> %s <br />"
- "</td><td>"
- "<img border=\"0\" width=\"48\" height=\"48\" "
- "src=\"static/citadel-logo.gif\" alt=\" \">"
- "</td><td>"
- "<b>%s</b><br />"
- "%s"
- "</td></tr>\n",
- (bar ? "even" : "odd"),
- (val ? "CHECKED" : ""),_("Yes"),
- (!val ? "CHECKED" : ""),_("No"),
- _("Citadel logo"),
- _("Displays the 'Powered by Citadel' icon")
- );
-
- wprintf("</table><br />\n"
- "<center>"
- "<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
- " "
- "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
- "</center>\n",
- _("Save changes"),
- _("Cancel")
- );
-
- wprintf("</form></div>\n");
- wDumpContent(2);
-}
/*
* save changes to iconbar settings
*/
void commit_iconbar(void) {
+ const StrBuf *MimeType;
StrBuf *iconbar;
StrBuf *buf;
int i;
- char *boxen[] = {
- "ib_logo",
- "ib_summary",
- "ib_inbox",
- "ib_calendar",
- "ib_contacts",
- "ib_notes",
- "ib_tasks",
- "ib_rooms",
- "ib_users",
- "ib_chat",
- "ib_advanced",
- "ib_logoff",
- "ib_citadel"
- };
if (!havebstr("ok_button")) {
display_main_menu();
iconbar = NewStrBuf();
buf = NewStrBuf();
StrBufPrintf(iconbar, "ib_displayas=%d", ibstr("ib_displayas"));
- for (i=0; i<(sizeof(boxen)/sizeof(char *)); ++i) {
+ for (i=0; i<(sizeof(IconbarDefaults)/sizeof(dflt_IB_Setting )); ++i) {
char *Val;
- if (!strcasecmp(BSTR(boxen[i]), "yes")) {
+ if (!strcasecmp(Bstr(IconbarDefaults[i].Key,
+ IconbarDefaults[i].len),
+ "yes"))
+ {
Val = "1";
}
- else if (!strcasecmp(BSTR(boxen[i]), "yeslist")) {
+ else if (!strcasecmp(Bstr(IconbarDefaults[i].Key,
+ IconbarDefaults[i].len),
+ "yeslist"))
+ {
Val = "2";
}
else {
Val = "0";
}
- StrBufPrintf(buf, ",%s=%s", boxen[i], Val);
+ StrBufPrintf(buf, ",%s=%s", IconbarDefaults[i].Key, Val);
StrBufAppendBuf(iconbar, buf, 0);
}
FreeStrBuf(&buf);
set_preference("iconbar", iconbar, 1);
- output_headers(1, 1, 2, 0, 0, 0);
- /* TODO: TEMPLATE */
- wprintf("<div id=\"banner\">\n");
- wprintf("<h1>");
- wprintf(_("Customize the icon bar"));
- wprintf("</h1></div>\n");
-
- wprintf("<div id=\"content\" class=\"service\">\n");
- wprintf(
- "<center><table border=1 bgcolor=\"#ffffff\"><tr><td>"
- "<img src=\"static/advanpage2_48x.gif\">"
- " ");
- wprintf(_("Your icon bar has been updated. Please select any of its "
- "choices to continue.<br/><span style=\"font-weight: bold;\">You may need to force refresh (SHIFT-F5) in order for changes to take effect</span>"));
- wprintf("</td></tr></table>\n");
- wDumpContent(2);
+
+ begin_burst();
+ MimeType = DoTemplate(HKEY("iconbar_save"), NULL, &NoCtx);
+ http_transmit_thing(ChrPtr(MimeType), 0);
#ifdef DBG_ICONBAR_HASH
dbg_PrintHash(WC->IconBarSetttings, PrintInt, NULL);
#endif
}
+/*
+ * Display the icon bar as long as we have an active session,
+ * and either the user is logged in or the server allows guest mode.
+ */
void tmplput_iconbar(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
- if ((WCC != NULL) && (WCC->logged_in)) {
- DoTemplate(HKEY("iconbar"), NULL, &NoCtx);
+ if ( (WCC != NULL)
+ && ( (WCC->logged_in)
+ || (WCC->serv_info->serv_supports_guest)
+ )
+ ) {
+ DoTemplate(HKEY("iconbar"), NULL, &NoCtx);
}
}
+
+void
+ServerShutdownModule_ICONBAR
+(void)
+{
+ DeleteHash(&IBDfl);
+}
+
+
+
+void
+ServerStartModule_ICONBAR
+(void)
+{
+ int i = 1;
+ IBDfl = NewHash(1, NULL);
+
+ while (IconbarDefaults[i].len != 0)
+ {
+ Put(IBDfl,
+ IconbarDefaults[i].Key,
+ IconbarDefaults[i].len,
+ &IconbarDefaults[i],
+ reference_free_handler);
+ i++;
+ }
+}
+
+
+int ConditionalWholistExpanded(StrBuf *Target, WCTemplputParams *TP)
+{
+ int r = 0;
+ if (WC) r = WC->ib_wholist_expanded;
+ syslog(LOG_DEBUG, "ConditionalWholistExpanded() returns %d", r);
+ return(r);
+}
+
+
+int ConditionalRoomlistExpanded(StrBuf *Target, WCTemplputParams *TP)
+{
+ if (WC) return(WC->ib_roomlist_expanded);
+ return(0);
+}
+
+
+
+/*
+ * 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
+ */
+void toggle_wholist_expanded_state(void) {
+ wcsession *WCC = WC;
+
+ if (!WCC) {
+ wc_printf("no session");
+ return;
+ }
+
+ WCC->ib_wholist_expanded = IBSTR("wstate");
+ wc_printf("%d", WCC->ib_wholist_expanded);
+ syslog(LOG_DEBUG, "ib_wholist_expanded set to %d", WCC->ib_wholist_expanded);
+}
+
+
void
InitModule_ICONBAR
(void)
{
- WebcitAddUrlHandler(HKEY("user_iconbar"), doUserIconStylesheet, 0);
- WebcitAddUrlHandler(HKEY("commit_iconbar"), commit_iconbar, 0);
+ long l;
+
+ /*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);
- WebcitAddUrlHandler(HKEY("display_customize_iconbar"), display_customize_iconbar, 0);
- RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar, 0);
+ RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar, NULL, CTX_NONE);
+ RegisterConditional(HKEY("COND:ICONBAR:WHOLISTEXPANDED"), 0, ConditionalWholistExpanded, CTX_NONE);
+ RegisterConditional(HKEY("COND:ICONBAR:ROOMLISTEXPANDED"), 0, ConditionalRoomlistExpanded, CTX_NONE);
RegisterPreference("iconbar", _("Iconbar Setting"), PRF_STRING, LoadIconSettings);
+ l = 1;
+ while (IconbarDefaults[l].len != 0)
+ {
+ RegisterTokenParamDefine(IconbarDefaults[l].Key,
+ IconbarDefaults[l].len, l);
+ l ++;
+ }
+ nIBV = l;
}
SessionDestroyModule_ICONBAR
(wcsession *sess)
{
- DeleteHash(&sess->IconBarSettings);
+ if (sess->IBSettingsVec != NULL)
+ free(sess->IBSettingsVec);
}
+
projects / citadel.git / blobdiff