X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Ficonbar.c;h=7a6e39d1ac477d9da041872a5892a931e79d52a6;hp=cf14021835adebe2205a8a07f3f821ee1e21f89e;hb=fc08ae6465b6da1d9008ce4b20b3cc2c2a5781af;hpb=430f92bb28a5a9b501525ebdbf5d2b3ea3e909cc diff --git a/webcit/iconbar.c b/webcit/iconbar.c index cf1402183..7a6e39d1a 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -1,650 +1,348 @@ /* - * $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 ... 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) + + +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 *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 1; +} -/* Values for ib_displayas */ -#define IB_PICTEXT 0 -#define IB_PICONLY 1 -#define IB_TEXTONLY 2 +#ifdef DBG_ICONBAR_HASH +static char nbuf[32]; +inline const char *PrintInt(void *Prefstr) +{ + snprintf(nbuf, sizeof(nbuf), "%ld", (long)Prefstr); + return nbuf; +} +#endif -void do_iconbar(void) { - char iconbar[SIZ]; - char buf[SIZ]; - char key[SIZ], value[SIZ]; - int i; +/* + hprintf("Cache-Control: private\r\n"); +*/ + + +int ConditionalIsActiveStylesheet(StrBuf *Target, WCTemplputParams *TP) { + long testFor; + long lookAt; + long ib_displayas; + + lookAt = GetTemplateTokenNumber(Target, TP, 3, IB_PICTEXT); + testFor = GetTemplateTokenNumber(Target, TP, 2, IB_PICTEXT); - /* The initialized values of these variables also happen to + + + 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; + + buf = NewStrBuf(); + key = NewStrBuf(); + 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. */ - int ib_displayas = 0; /* pictures and text, pictures, text */ - int ib_logo = 0; /* Site logo */ - int ib_summary = 1; /* Summary page icon */ - int ib_inbox = 1; /* Inbox icon */ - int ib_calendar = 1; /* Calendar icon */ - int ib_contacts = 1; /* Contacts icon */ - int ib_notes = 1; /* Notes icon */ - int ib_tasks = 1; /* Tasks icon */ - int ib_rooms = 1; /* Rooms icon */ - int ib_users = 1; /* Users icon */ - int ib_chat = 1; /* Chat icon */ - int ib_advanced = 1; /* Advanced Options icon */ - int ib_citadel = 1; /* 'Powered by Citadel' logo */ - /* - */ - get_preference("iconbar", iconbar, sizeof iconbar); - for (i=0; i= 0) + { + StrBufExtract_token(key, buf, 0, '='); + val = StrBufExtract_long(buf, 1, '='); - wprintf("
\n" - "\n" - "
\n"); + +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); +} -void display_customize_iconbar(void) { - char iconbar[SIZ]; - char buf[SIZ]; - char key[SIZ], value[SIZ]; - int i; - int bar = 0; - /* 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. - */ - int ib_displayas = IB_PICTEXT; /* pictures and text, pictures, text */ - int ib_logo = 0; /* Site logo */ - int ib_summary = 1; /* Summary page icon */ - int ib_inbox = 1; /* Inbox icon */ - int ib_calendar = 1; /* Calendar icon */ - int ib_contacts = 1; /* Contacts icon */ - int ib_notes = 1; /* Notes icon */ - int ib_tasks = 1; /* Tasks icon */ - int ib_rooms = 1; /* Rooms icon */ - int ib_users = 1; /* Users icon */ - int ib_chat = 1; /* Chat icon */ - int ib_advanced = 1; /* Advanced Options icon */ - int ib_citadel = 1; /* 'Powered by Citadel' logo */ - /* - */ - get_preference("iconbar", iconbar, sizeof iconbar); - for (i=0; i\n" - "
" - ""); - wprintf(_("Customize the icon bar")); - wprintf("" - "
\n" - "\n
\n" - ); - - wprintf("
" - "
"); - - wprintf("
\n"); - - wprintf("
"); - wprintf(_("Display icons as:")); - wprintf(" "); - 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"); + if (!WCC) { + wc_printf("no session"); + return; } - 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("

\n"); - - wprintf("\n"); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_logo ? "CHECKED" : ""), - _("Site logo"), - _("An icon describing this site") - ); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_summary ? "CHECKED" : ""), - _("Summary"), - _("Your summary page") - ); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_inbox ? "CHECKED" : ""), - _("Mail (inbox)"), - _("A shortcut to your email Inbox") - ); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_contacts ? "CHECKED" : ""), - _("Contacts"), - _("Your personal address book") - ); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_notes ? "CHECKED" : ""), - _("Notes"), - _("Your personal notes") - ); - -#ifdef WEBCIT_WITH_CALENDAR_SERVICE - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_calendar ? "CHECKED" : ""), - _("Calendar"), - _("A shortcut to your personal calendar") - ); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_tasks ? "CHECKED" : ""), - _("Tasks"), - _("A shortcut to your personal task list") - ); -#endif /* WEBCIT_WITH_CALENDAR_SERVICE */ - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_rooms ? "CHECKED" : ""), - _("Rooms"), - _("Clicking this icon displays a list of all accesible " - "rooms (or folders) available.") - ); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_users ? "CHECKED" : ""), - _("Who is online?"), - _("Clicking this icon displays a list of all users " - "currently logged in.") - ); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_chat ? "CHECKED" : ""), - _("Chat"), - _("Clicking this icon enters real-time chat mode " - "with other users in the same room.") - - ); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_advanced ? "CHECKED" : ""), - _("Advanced options"), - _("Access to the complete menu of Citadel functions.") - - ); - - wprintf("\n", - ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")), - (ib_citadel ? "CHECKED" : ""), - _("Citadel logo"), - _("Displays the 'Powered by Citadel' icon") - ); - - 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" - "

\n" - "
" - "" - " " - "" - "
\n", - _("Save changes"), - _("Cancel") - ); - - wprintf("
\n"); - wDumpContent(2); + + 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); } -void commit_iconbar(void) { - char iconbar[SIZ]; - int i; +/* + * Toggle the wholist expanded state in session memory + */ +void toggle_wholist_expanded_state(void) { + wcsession *WCC = WC; - 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 (strlen(bstr("ok_button")) == 0) { - display_main_menu(); + if (!WCC) { + wc_printf("no session"); return; } - sprintf(iconbar, "ib_displayas=%d", atoi(bstr("ib_displayas"))); + 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); +} - for (i=0; i<(sizeof(boxen)/sizeof(char *)); ++i) { - sprintf(&iconbar[strlen(iconbar)], ",%s=", boxen[i]); - if (!strcasecmp(bstr(boxen[i]), "yes")) { - sprintf(&iconbar[strlen(iconbar)], "1"); - } - else { - sprintf(&iconbar[strlen(iconbar)], "0"); - } + +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; +} + - set_preference("iconbar", iconbar, 1); - output_headers(1, 1, 0, 0, 0, 0); - wprintf( - "
" - "" - " "); - wprintf(_("Your icon bar has been updated. Please select any of its " - "choices to continue.")); - wprintf("
\n"); - wDumpContent(2); +void +SessionDestroyModule_ICONBAR +(wcsession *sess) +{ + if (sess->IBSettingsVec != NULL) + free(sess->IBSettingsVec); } +