X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Ficonbar.c;h=7a6e39d1ac477d9da041872a5892a931e79d52a6;hp=41e7e73e5b6ec402e5a10a4d0f39cf972ca4256e;hb=fc08ae6465b6da1d9008ce4b20b3cc2c2a5781af;hpb=a91d5e80ca1d7086fdf0c7d801ea32bd061b9c89 diff --git a/webcit/iconbar.c b/webcit/iconbar.c index 41e7e73e5..7a6e39d1a 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -1,29 +1,83 @@ /* - * $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" - -/** Values for ib_displayas */ -#define IB_PICTEXT 0 /**< picture and text */ -#define IB_PICONLY 1 /**< just a picture */ -#define IB_TEXTONLY 2 /**< just text */ +/* Values for ib_displayas ... don't change these or you will break the templates */ +#define IB_PICTEXT 0 /* picture and text */ +#define IB_PICONLY 1 /* just a picture */ +#define IB_TEXTONLY 2 /* just text */ void DontDeleteThis(void *Data){} #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; - if (GetHash(WC->IconBarSettings, key, keylen, - &Data)) - return (long) Data; + void *vIBDfl = NULL; + wcsession *WCC = WC; + + 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 @@ -35,72 +89,69 @@ inline const char *PrintInt(void *Prefstr) } #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; - - LoadIconSettings(); - output_custom_content_header("text/css"); - hprintf("Cache-Control: private\r\n"); - - begin_burst(); - 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: none; !important } \r\n"); - } - } - end_burst(); -} +/* + hprintf("Cache-Control: private\r\n"); +*/ + int ConditionalIsActiveStylesheet(StrBuf *Target, WCTemplputParams *TP) { - long testFor = TP->Tokens->Params[3]->lvalue; - int ib_displayas = IconbarIsEnabled("ib_displayas",IB_PICTEXT); - return (testFor == ib_displayas); + 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(void) +void LoadIconSettings(StrBuf *iconbar, long lvalue) { + void *vIBDfl; + dflt_IB_Setting *Set; + const char *pCh = NULL; + wcsession *WCC = WC; - StrBuf *iconbar = NULL; 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. */ - if (get_preference("iconbar", &iconbar)) { - nTokens = StrBufNum_tokens(iconbar, ','); - for (i=0; iIconBarSettings, - ChrPtr(key), StrLength(key), - (void*)val, DontDeleteThis); - } - } + while (StrBufExtract_NextToken(buf, iconbar, &pCh, ',') >= 0) + { + StrBufExtract_token(key, buf, 0, '='); + val = StrBufExtract_long(buf, 1, '='); + 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 @@ -109,313 +160,16 @@ void LoadIconSettings(void) FreeStrBuf(&buf); } -/** - * \brief display a customized version of the iconbar - */ -void display_customize_iconbar(void) { - int i; - int bar = 0; - long val; - - int ib_displayas; - LoadIconSettings(); - - output_headers(1, 1, 2, 0, 0, 0); - wprintf("
"); - wprintf("

"); - wprintf(_("Customize the icon bar")); - wprintf("

\n"); - - wprintf("
\n"); - - wprintf("
"); - - wprintf("
\n"); - wprintf("\n", WC->nonce); - - wprintf("\n"); - wprintf("\n"); - - bar = 1 - bar; - val = IconbarIsEnabled("ib_logo", 0); - wprintf("\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("\n", - (bar ? "even" : "odd"), - (val ? "CHECKED" : ""),_("Yes"), - (!val ? "CHECKED" : ""),_("No"), - _("Summary"), - _("Your summary page") - ); - - bar = 1 - bar; - val = IconbarIsEnabled("ib_inbox", 1); - wprintf("\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("\n", - (bar ? "even" : "odd"), - (val ? "CHECKED" : ""),_("Yes"), - (!val ? "CHECKED" : ""),_("No"), - _("Contacts"), - _("Your personal address book") - ); - - bar = 1 - bar; - val = IconbarIsEnabled("ib_notes", 1); - wprintf("\n", - (bar ? "even" : "odd"), - (val ? "CHECKED" : ""),_("Yes"), - (!val ? "CHECKED" : ""),_("No"), - _("Notes"), - _("Your personal notes") - ); - - bar = 1 - bar; - val = IconbarIsEnabled("ib_calendar", 1); - wprintf("\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("\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("\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("\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("\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("\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("\n", - (bar ? "even" : "odd"), - (val ? "CHECKED" : ""),_("Yes"), - (!val ? "CHECKED" : ""),_("No"), - _("Citadel logo"), - _("Displays the 'Powered by Citadel' icon") - ); - - wprintf("
"); - wprintf(_("Display icons as:")); - wprintf(""); - ib_displayas = IconbarIsEnabled("ib_displayas",IB_PICTEXT); - for (i=0; i<=2; ++i) { - 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("
\n"); - - wprintf(_("Select the icons you would like to see displayed " - "in the 'icon bar' menu on the left side of the " - "screen.")); - wprintf("
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - " %s" - "		" - "\" \"" - "" - "%s" - "
%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "
" - " %s    " - " %s
" - "		" - "\" \"" - "" - "%s
" - "%s" - "

\n" - "
" - "" - " " - "" - "
\n", - _("Save changes"), - _("Cancel") - ); - - wprintf("
\n"); - wDumpContent(2); -} - -/** - * \brief commit the changes of an edited iconbar ???? +/* + * 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(); @@ -425,66 +179,170 @@ void commit_iconbar(void) { 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("
\n"); - wprintf("

"); - wprintf(_("Customize the icon bar")); - wprintf("

\n"); - - wprintf("
\n"); - wprintf( - "
" - "" - " "); - wprintf(_("Your icon bar has been updated. Please select any of its " - "choices to continue.
You may need to force refresh (SHIFT-F5) in order for changes to take effect")); - wprintf("
\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 -InitModule_ICONBAR +ServerShutdownModule_ICONBAR (void) { - WebcitAddUrlHandler(HKEY("user_iconbar"), doUserIconStylesheet, 0); - WebcitAddUrlHandler(HKEY("commit_iconbar"), commit_iconbar, 0); - 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); + 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) +{ + 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); + 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; +} + + + +void +SessionDestroyModule_ICONBAR +(wcsession *sess) +{ + if (sess->IBSettingsVec != NULL) + free(sess->IBSettingsVec); +} +