X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Ficonbar.c;h=7a6e39d1ac477d9da041872a5892a931e79d52a6;hp=74218c80967e3e18b50e1374c43bcf44a3b48139;hb=fc08ae6465b6da1d9008ce4b20b3cc2c2a5781af;hpb=ee7999db69633edf02c6a1ddbdaae23f6a395d91 diff --git a/webcit/iconbar.c b/webcit/iconbar.c index 74218c809..7a6e39d1a 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -1,7 +1,21 @@ /* - * $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" @@ -16,58 +30,54 @@ 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; - const char *Key; - long len; + 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, HKEY("ib_displayas")}, - {0, HKEY("ib_logo")}, - {1, HKEY("ib_summary")}, - {1, HKEY("ib_inbox")}, - {1, HKEY("ib_calendar")}, - {1, HKEY("ib_contacts")}, - {1, HKEY("ib_notes")}, - {1, HKEY("ib_tasks")}, - {1, HKEY("ib_rooms")}, - {1, HKEY("ib_users")}, - {1, HKEY("ib_chat")}, - {1, HKEY("ib_advanced")}, - {1, HKEY("ib_logoff")}, - {1, HKEY("ib_citadel")}, - {0, HKEY("")} + {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 IconbarGetDefault(const char *key, size_t keylen) + +long IconbarIsENABLED(long val, const char *key, size_t keylen) { - void *vIBDfl; + 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; } - return 0; -} -long IconbarIsENABLED(const char *key, size_t keylen, long defval) -{ - void *Data = NULL; - wcsession *WCC = WC; - - if (WCC == NULL) - return defval; - - if (GetHash(WCC->IconBarSettings, - key, - keylen, - &Data)) - return (long) Data; else - return defval; + return 1; } #ifdef DBG_ICONBAR_HASH @@ -79,73 +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; - - 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; - int ib_displayas; + 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)); +*/ - testFor = GetTemplateTokenNumber(Target, TP, 3, IB_PICTEXT); - ib_displayas = IconbarIsENABLED(TKEY(2),IconbarGetDefault(TKEY(2))); 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= 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 @@ -207,12 +213,20 @@ void commit_iconbar(void) { } +/* + * 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); } } @@ -230,7 +244,7 @@ void ServerStartModule_ICONBAR (void) { - int i = 0; + int i = 1; IBDfl = NewHash(1, NULL); while (IconbarDefaults[i].len != 0) @@ -244,16 +258,82 @@ ServerStartModule_ICONBAR } } + +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); - 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; } @@ -262,5 +342,7 @@ void SessionDestroyModule_ICONBAR (wcsession *sess) { - DeleteHash(&IBDfl); + if (sess->IBSettingsVec != NULL) + free(sess->IBSettingsVec); } +