X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ficonbar.c;h=e1ea9b0ec6cd3907d25f4031d314d6d639abe0a0;hb=HEAD;hp=8f83daa5d8b7ac2b01d28a5ba8e543402c687b5b;hpb=c6aec42f213ec284e34648f3d69bcf927dccddb1;p=citadel.git diff --git a/webcit/iconbar.c b/webcit/iconbar.c index 8f83daa5d..e1ea9b0ec 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -1,4 +1,3 @@ - /* * Displays and customizes the iconbar. * @@ -20,62 +19,66 @@ #define IB_PICONLY 1 /* just a picture */ #define IB_TEXTONLY 2 /* just text */ -void DontDeleteThis(void *Data) { -} +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; + 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("") } + {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) { +long IconbarIsENABLED(long val, const char *key, size_t keylen) +{ void *vIBDfl = NULL; wcsession *WCC = WC; - if ((WCC != NULL) && (WCC->IBSettingsVec != NULL) && (val < nIBV)) { + 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; + dflt_IB_Setting *Set = (dflt_IB_Setting*)vIBDfl; return Set->DefVal; } - else + else return 1; } #ifdef DBG_ICONBAR_HASH static char nbuf[32]; -inline const char *PrintInt(void *Prefstr) { - snprintf(nbuf, sizeof(nbuf), "%ld", (long) Prefstr); +inline const char *PrintInt(void *Prefstr) +{ + snprintf(nbuf, sizeof(nbuf), "%ld", (long)Prefstr); return nbuf; } #endif @@ -85,7 +88,7 @@ inline const char *PrintInt(void *Prefstr) { */ -int ConditionalIsActiveStylesheet(StrBuf * Target, WCTemplputParams * TP) { +int ConditionalIsActiveStylesheet(StrBuf *Target, WCTemplputParams *TP) { long testFor; long lookAt; long ib_displayas; @@ -96,7 +99,6 @@ int ConditionalIsActiveStylesheet(StrBuf * Target, WCTemplputParams * TP) { ib_displayas = IconbarIsENABLED(lookAt, TKEY(3)); - /* printf ("%ld == %ld ? %s : %s\n", testFor, @@ -108,7 +110,8 @@ int ConditionalIsActiveStylesheet(StrBuf * Target, WCTemplputParams * TP) { return (testFor == ib_displayas); } -void LoadIconSettings(StrBuf * iconbar, long lvalue) { +void LoadIconSettings(StrBuf *iconbar, long lvalue) +{ void *vIBDfl; dflt_IB_Setting *Set; const char *pCh = NULL; @@ -120,8 +123,9 @@ void LoadIconSettings(StrBuf * iconbar, long lvalue) { buf = NewStrBuf(); key = NewStrBuf(); - if (WCC->IBSettingsVec == NULL) { - WCC->IBSettingsVec = (long *) malloc(nIBV * sizeof(long)); + if (WCC->IBSettingsVec == NULL) + { + WCC->IBSettingsVec = (long*) malloc (nIBV * sizeof(long)); } /* * The initialized values of these variables also happen to @@ -130,16 +134,16 @@ void LoadIconSettings(StrBuf * iconbar, long lvalue) { * configuration somewhere. */ - while (StrBufExtract_NextToken(buf, iconbar, &pCh, ',') >= 0) { + while (StrBufExtract_NextToken(buf, iconbar, &pCh, ',') >= 0) + { StrBufExtract_token(key, buf, 0, '='); val = StrBufExtract_long(buf, 1, '='); - if (!GetHash(IBDfl, SKEY(key), &vIBDfl)) + if (!GetHash(IBDfl, SKEY(key), &vIBDfl)) continue; - Set = (dflt_IB_Setting *) vIBDfl; + 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 @@ -169,12 +173,18 @@ void commit_iconbar(void) { iconbar = NewStrBuf(); buf = NewStrBuf(); StrBufPrintf(iconbar, "ib_displayas=%d", ibstr("ib_displayas")); - for (i = 0; i < (sizeof(IconbarDefaults) / sizeof(dflt_IB_Setting)); ++i) { + for (i=0; i<(sizeof(IconbarDefaults)/sizeof(dflt_IB_Setting )); ++i) { char *Val; - if (!strcasecmp(Bstr(IconbarDefaults[i].Key, IconbarDefaults[i].len), "yes")) { + if (!strcasecmp(Bstr(IconbarDefaults[i].Key, + IconbarDefaults[i].len), + "yes")) + { Val = "1"; } - else if (!strcasecmp(Bstr(IconbarDefaults[i].Key, IconbarDefaults[i].len), "yeslist")) { + else if (!strcasecmp(Bstr(IconbarDefaults[i].Key, + IconbarDefaults[i].len), + "yeslist")) + { Val = "2"; } else { @@ -201,46 +211,62 @@ 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) { +void tmplput_iconbar(StrBuf *Target, WCTemplputParams *TP) +{ wcsession *WCC = WC; - - if ((WCC != NULL) && ((WCC->logged_in) || ((WCC->serv_info != NULL) && (WCC->serv_info->serv_supports_guest)) - )) { + + if ( (WCC != NULL) && + ((WCC->logged_in) || + ((WCC->serv_info != NULL) && + (WCC->serv_info->serv_supports_guest)) + ) ) + { DoTemplate(HKEY("iconbar"), NULL, &NoCtx); } } -void ServerShutdownModule_ICONBAR(void) { +void +ServerShutdownModule_ICONBAR +(void) +{ DeleteHash(&IBDfl); } -void ServerStartModule_ICONBAR(void) { +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); + 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 ConditionalWholistExpanded(StrBuf *Target, WCTemplputParams *TP) +{ int r = 0; - if (WC) - r = WC->ib_wholist_expanded; + if (WC) r = WC->ib_wholist_expanded; syslog(LOG_DEBUG, "ConditionalWholistExpanded() returns %d", r); - return (r); + return(r); } -int ConditionalRoomlistExpanded(StrBuf * Target, WCTemplputParams * TP) { - if (WC) - return (WC->ib_roomlist_expanded); - return (0); +int ConditionalRoomlistExpanded(StrBuf *Target, WCTemplputParams *TP) +{ + if (WC) return(WC->ib_roomlist_expanded); + return(0); } @@ -279,7 +305,10 @@ void toggle_wholist_expanded_state(void) { } -void InitModule_ICONBAR(void) { +void +InitModule_ICONBAR +(void) +{ long l; /*WebcitAddUrlHandler(HKEY("user_iconbar"), "", 0, doUserIconStylesheet, 0); */ @@ -293,16 +322,22 @@ void InitModule_ICONBAR(void) { RegisterPreference("iconbar", _("Iconbar Setting"), PRF_STRING, LoadIconSettings); l = 1; - while (IconbarDefaults[l].len != 0) { - RegisterTokenParamDefine(IconbarDefaults[l].Key, IconbarDefaults[l].len, l); - l++; + while (IconbarDefaults[l].len != 0) + { + RegisterTokenParamDefine(IconbarDefaults[l].Key, + IconbarDefaults[l].len, l); + l ++; } nIBV = l; } -void SessionDestroyModule_ICONBAR(wcsession * sess) { +void +SessionDestroyModule_ICONBAR +(wcsession *sess) +{ if (sess->IBSettingsVec != NULL) free(sess->IBSettingsVec); } +