* fix COND:PREFS

* add NONCE replacer to contextloop; please re-bootstrap so that the initializer does its job
* added selectboxes to the config dialog templates
* added COND:SERVCFG:SUBST for the TZ dropdown

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index e505b5465d00606e231372d2e7433c9ded6a035b..4cf0b5bfee7ee265d8444d283bec75d3e1ec5b79 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -553,3 +553,17 @@ void context_loop(int *sock)
        
        
 }
+
+void tmpl_nonce(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+       struct wcsession *WCC = WC;
+       StrBufAppendPrintf(Target, "%ld",
+                          (WCC != NULL)? WCC->nonce:0);                   
+}
+
+void 
+InitModule_CONTEXT
+(void)
+{
+       RegisterNamespace("NONCE", 0, 0, tmpl_nonce);
+}

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 49f430b733583ab13353550a07328adc04fb8d56..28aac7dfef72640d99d7a947c414e9d1de725504 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -690,24 +690,30 @@ void tmplput_CFG_Descr(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *
 }
 
 
-void CfgZoneTempl(StrBuf *TemplBuffer, void *Context)
+void CfgZoneTempl(StrBuf *TemplBuffer, void *vContext)
 {
+       StrBuf *Zone = (StrBuf*) vContext;
 
+       SVPutBuf("ZONENAME", Zone, 1);
 }
 
 int ConditionalPreference(WCTemplateToken *Token, void *Context)
 {
+       StrBuf *Pref;
 
-       void *hash_value;
-
-       if (!GetHash(PreferenceHooks, 
-                    Token->Params[2]->Start,
-                    Token->Params[2]->len,
-                    &hash_value))
+       if (!get_PREFERENCE(Token->Params[2]->Start,
+                           Token->Params[2]->len,
+                           &Pref)) 
                return 0;
-
-       Prefs *Newpref = (Prefs*) hash_value;
-       return (strcmp(Token->Params[3]->Start, Newpref->PrefStr) == 0);
+       
+       if (Token->nParameters == 3) {
+               return 1;
+       }
+       else if (Token->Params[3]->Type == TYPE_STR)
+               return ((Token->Params[3]->len == StrLength(Pref)) &&
+                       (strcmp(Token->Params[3]->Start, ChrPtr(Pref)) == 0));
+       else 
+               return (StrTol(Pref) == Token->Params[3]->lvalue);
 }
 
 

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index bfcdc81d45d47fd77bec9ca1371b3f2bab869fe5..bde63a706dec9eddf6cdc5bf990fc062c3ea51d5 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -18,21 +18,18 @@ void LoadZoneFiles(void)
        icalarray *zones;
        int z;
        long len;
-       char this_zone[128];
-       char *ZName;
+       const char *this_zone;
+       StrBuf *ZName;
        
        ZoneHash = NewHash(1, NULL);
-       len = sizeof("UTC") + 1;
-       ZName = malloc(len + 1);
-       memcpy(ZName, "UTC", len + 1);
-       Put(ZoneHash, ZName, len, ZName, NULL);
+       ZName = NewStrBufPlain(HKEY("UTC"));
+       Put(ZoneHash, HKEY("UTC"), ZName, HFreeStrBuf);
        zones = icaltimezone_get_builtin_timezones();
        for (z = 0; z < zones->num_elements; ++z) {
-               strcpy(this_zone, icaltimezone_get_location(icalarray_element_at(zones, z)));
+               this_zone = icaltimezone_get_location(icalarray_element_at(zones, z));
                len = strlen(this_zone);
-               ZName = (char*)malloc(len +1);
-               memcpy(ZName, this_zone, len + 1);
-               Put(ZoneHash, ZName, len, ZName, NULL);
+               ZName = NewStrBufPlain(this_zone, len);
+               Put(ZoneHash, this_zone, len, ZName, HFreeStrBuf);
        }
        SortByHashKey(ZoneHash, 0);
 }
@@ -932,6 +929,7 @@ void load_siteconfig(void)
  */
 void siteconfig(void)
 {
+       struct wcsession *WCC = WC;
        int i;
        char buf[256];
 
@@ -942,13 +940,12 @@ void siteconfig(void)
        serv_printf("CONF set");
        serv_getln(buf, sizeof buf);
        if (buf[0] != '4') {
-               safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
+               safestrncpy(WCC->ImportantMessage, &buf[4], sizeof WCC->ImportantMessage);
                display_aide_menu();
                return;
        }
 
-       i = sizeof(ServerConfig);
-       for (i=0; i < sizeof(ServerConfig); i ++)
+       for (i=0; i < (sizeof(ServerConfig) / sizeof(CfgMapping)); i ++)
        {
                switch (ServerConfig[i].type) {
                default:
@@ -967,6 +964,7 @@ void siteconfig(void)
                        break;
                }
        }
+        serv_puts("000");
 
        serv_printf("SPEX site|%d|%d", ibstr("sitepolicy"), ibstr("sitevalue"));
        serv_getln(buf, sizeof buf);
@@ -975,8 +973,9 @@ void siteconfig(void)
 
        strcpy(serv_info.serv_default_cal_zone, bstr("c_default_cal_zone"));
 
-       safestrncpy(WC->ImportantMessage, _("Your system configuration has been updated."),
-               sizeof WC->ImportantMessage);
+       safestrncpy(WCC->ImportantMessage, _("Your system configuration has been updated."),
+               sizeof WCC->ImportantMessage);
+       DeleteHash(&WCC->ServCfg);
        display_aide_menu();
 }
 
@@ -1023,6 +1022,27 @@ int ConditionalServCfg(WCTemplateToken *Tokens, void *Context)
        else return 0;
 }
 
+int ConditionalServCfgSubst(WCTemplateToken *Tokens, void *Context)
+{
+       struct wcsession *WCC = WC;
+       void *vBuf;
+       StrBuf *Buf;
+
+       if (WCC->is_aide) {
+               if (WCC->ServCfg == NULL)
+                       load_siteconfig();
+               GetHash(WCC->ServCfg, 
+                       Tokens->Params[2]->Start,
+                       Tokens->Params[2]->len, 
+                       &vBuf);
+               if (vBuf == NULL) return 0;
+               Buf = (StrBuf*) vBuf;
+
+               return CompareSubstToStrBuf(Buf, Tokens->Params[3]);
+       }
+       else return 0;
+}
+
 void 
 InitModule_SITECONFIG
 (void)
@@ -1032,5 +1052,6 @@ InitModule_SITECONFIG
 
        RegisterNamespace("SERV:CFG", 1, 1, tmplput_servcfg);
        RegisterConditional(HKEY("COND:SERVCFG"), 3, ConditionalServCfg);
+       RegisterConditional(HKEY("COND:SERVCFG:SUBST"), 4, ConditionalServCfgSubst);
 }
 /*@}*/

diff --git a/webcit/static/t/aide_global_config.html b/webcit/static/t/aide_global_config.html
index c202fe9a115c195e9c2c6292299e6d1fc176c331..7247b0d3ef4a11afe7003dda3b754bcfce8c0344 100644 (file)
--- a/webcit/static/t/aide_global_config.html
+++ b/webcit/static/t/aide_global_config.html
@@ -1,5 +1,5 @@
 <ul class="adminitems">
-<li><a href="display_siteconfig"><?_("Edit site-wide configuration")></a></li>
+<li><a href="do_template?template=display_sitewide_config"><?_("Edit site-wide configuration")></a></li>
 <li><a href="display_inetconf"><?_("Domain names and Internet mail configuration")></a></li>
 <li><a href="display_netconf"><?_("Configure replication with other Citadel servers")></a></li>
 <li><a href="display_smtpqueue"><?_("View the outbound SMTP queue")></a></li>

diff --git a/webcit/static/t/tab_siteconfig_access.html b/webcit/static/t/tab_siteconfig_access.html
index 8ae89d65738dd9d941dd946ecff09383fbdc4e27..e3f2bb5cc9fa8bbaea45d4035b0efd98a6045f68 100644 (file)
--- a/webcit/static/t/tab_siteconfig_access.html
+++ b/webcit/static/t/tab_siteconfig_access.html
@@ -6,14 +6,13 @@
 
 <tr><td><?_("Initial access level for new users")></td><td>
 <select name="c_initax" size="1">
-<!--
-                       for (j=0; j<=6; ++j) {
-                               sprintf(&access[strlen(access)], "<option %s value="%d">%d - %s</option>",
-                                       ((atoi(buf) == j) ? "selected" : ""),
-                                       j, j, axdefs[j]
-                               );
-                       }
--->
+       <option <?%("COND:SERVCFG", 1, "c_initax", 1, 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 1, 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 1, 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 1, 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 1, 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 1, 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 1, 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
 </select></td></tr>
 
 <tr><td><?_("Require registration for new users")></td><td>
@@ -33,14 +32,13 @@
 
 <tr><td><?_("Access level required to create rooms")></td><td>
 <select name="c_createax" size="1">
-<!--
-                       for (j=0; j<=6; ++j) {
-                               sprintf(&access[strlen(access)], "<option %s value="%d">%d - %s</option>",
-                                       ((atoi(buf) == j) ? "selected" : ""),
-                                       j, j, axdefs[j]
-                               );
-                       }
--->
+       <option <?%("COND:SERVCFG", 1, "c_createax", 1, 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 1, 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 1, 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 1, 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 1, 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 1, 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 1, 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
 </select></td></tr>
 
 <tr><td><?_("Allow aides to zap (forget) rooms")></td><td>
@@ -66,4 +64,3 @@
 <input type="password" NAME="c_master_pass" MAXLENGTH="31" VALUE='<?SERV:CFG("c_master_pass")>'></td></tr>
 
 </table>
-               

diff --git a/webcit/static/t/tab_siteconfig_autopurger.html b/webcit/static/t/tab_siteconfig_autopurger.html
index f49152f6f5be58b0456ffd7fce5ce2f55db5dac6..999b2379110e0318c017ae8807d87d0872de2a9e 100644 (file)
--- a/webcit/static/t/tab_siteconfig_autopurger.html
+++ b/webcit/static/t/tab_siteconfig_autopurger.html
@@ -6,16 +6,58 @@
 
 <tr><td><?_("Hour to run database auto-purge")></td><td>
 <select NAME="c_purge_hour" SIZE="1">
-<!--
-                       for (j=0; j<=23; ++j) {
-                               sprintf(&purger[strlen(purger)], "<OPTION %s VALUE="%d">%d:00%s</OPTION>\n",
-                                       ((atoi(buf) == j) ? "SELECTED" : ""),
-                                       j,
-                                       (get_time_format_cached() == WC_TIMEFORMAT_24) ? j : ((j == 0) ? 12 : ((j>12) ? j-12 : j)),
-                                       (get_time_format_cached() == WC_TIMEFORMAT_24) ? "" : ((j >= 12) ? "pm" : "am")
-                               );
-                       }
--->
+<?!("COND:PREF", 1, "calhourformat", 24)>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 0,  'selected="selected"', "")> VALUE='00'> 0:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 1,  'selected="selected"', "")> VALUE='01'> 1:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 2,  'selected="selected"', "")> VALUE='02'> 2:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 3,  'selected="selected"', "")> VALUE='03'> 3:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 4,  'selected="selected"', "")> VALUE='04'> 4:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 5,  'selected="selected"', "")> VALUE='05'> 5:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 6,  'selected="selected"', "")> VALUE='06'> 6:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 7,  'selected="selected"', "")> VALUE='07'> 7:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 8,  'selected="selected"', "")> VALUE='08'> 8:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 9,  'selected="selected"', "")> VALUE='09'> 9:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 10, 'selected="selected"', "")> VALUE='10'>10:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 11, 'selected="selected"', "")> VALUE='11'>11:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 12, 'selected="selected"', "")> VALUE='12'>12:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 13, 'selected="selected"', "")> VALUE='13'>13:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 14, 'selected="selected"', "")> VALUE='14'>14:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 15, 'selected="selected"', "")> VALUE='15'>15:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 16, 'selected="selected"', "")> VALUE='16'>16:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 17, 'selected="selected"', "")> VALUE='17'>17:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 18, 'selected="selected"', "")> VALUE='18'>18:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 19, 'selected="selected"', "")> VALUE='19'>19:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 20, 'selected="selected"', "")> VALUE='20'>20:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 21, 'selected="selected"', "")> VALUE='21'>21:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 22, 'selected="selected"', "")> VALUE='22'>22:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 23, 'selected="selected"', "")> VALUE='23'>23:00</OPTION>
+<?!("X", 1)>
+<??("COND:PREF", 2, "calhourformat", 24)>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 0,  'selected="selected"', "")> VALUE='00'>12:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 1,  'selected="selected"', "")> VALUE='01'> 1:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 2,  'selected="selected"', "")> VALUE='02'> 2:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 3,  'selected="selected"', "")> VALUE='03'> 3:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 4,  'selected="selected"', "")> VALUE='04'> 4:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 5,  'selected="selected"', "")> VALUE='05'> 5:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 6,  'selected="selected"', "")> VALUE='06'> 6:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 7,  'selected="selected"', "")> VALUE='07'> 7:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 8,  'selected="selected"', "")> VALUE='08'> 8:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 9,  'selected="selected"', "")> VALUE='08'> 9:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 10, 'selected="selected"', "")> VALUE='10'>10:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 11, 'selected="selected"', "")> VALUE='11'>11:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 12, 'selected="selected"', "")> VALUE='12'>12:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 13, 'selected="selected"', "")> VALUE='13'> 1:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 14, 'selected="selected"', "")> VALUE='14'> 2:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 15, 'selected="selected"', "")> VALUE='15'> 3:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 16, 'selected="selected"', "")> VALUE='16'> 4:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 17, 'selected="selected"', "")> VALUE='17'> 5:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 18, 'selected="selected"', "")> VALUE='18'> 6:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 19, 'selected="selected"', "")> VALUE='19'> 7:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 20, 'selected="selected"', "")> VALUE='20'> 8:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 21, 'selected="selected"', "")> VALUE='21'> 9:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 22, 'selected="selected"', "")> VALUE='22'>10:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "calhourformat", 23, 'selected="selected"', "")> VALUE='23'>11:00 pm</OPTION>
+<??("X", 2)>
 </select></td></tr>
 
 <tr><td COLSPAN=2>

diff --git a/webcit/static/t/tab_siteconfig_general.html b/webcit/static/t/tab_siteconfig_general.html
index b7bd2f1a4463ef56ffd8f192e601f5c8979a6a4f..91ca472d736b41232cef096af088d9c53a6ab2b2 100644 (file)
--- a/webcit/static/t/tab_siteconfig_general.html
+++ b/webcit/static/t/tab_siteconfig_general.html
@@ -29,7 +29,7 @@
 
 <tr><td><?_("Default timezone for unzoned calendar items")></td><td>
 <select name="c_default_cal_zone" size="1">
-<option %s value="%s">%s</option> "selected"
+<?ITERATE("PREF:ZONE", "siteconfig_tzsection")>
 </select>
 </td></tr>
 

diff --git a/webcit/static/t/tab_siteconfig_indexing.html b/webcit/static/t/tab_siteconfig_indexing.html
index 6f75f28d1a7d192081f46dc87813c47899b8ce12..f54865bf9894abaabccb021b80cf226ceb52fa08 100644 (file)
--- a/webcit/static/t/tab_siteconfig_indexing.html
+++ b/webcit/static/t/tab_siteconfig_indexing.html
@@ -3,7 +3,6 @@
 <h2><?_("Warning: these facilities are resource intensive.")></h2>
 </center>
 <table border="0">
-                       
                
 <tr><td><?_("Enable full text index")></td><td>
 <input type="checkbox" NAME="c_enable_fulltext" VALUE="yes" <?%("COND:SERVCFG", 1, "c_enable_fulltext", 1, "CHECKED", "")>></td></tr>
@@ -18,6 +17,4 @@
 <tr><td><?_("Email destination of journalized messages")></td><td>
 <input type="text" NAME="c_journal_dest" MAXLENGTH="127" VALUE='<?SERV:CFG("c_journal_dest")>'></td></tr>
 
-
-
 </table>

diff --git a/webcit/static/t/whosection.html b/webcit/static/t/whosection.html
index c501b0ccd06d1b6578a282432a9b9ed672d51f00..a50e672d88c55632bc050ccf8cecaaef33c8ad8a 100644 (file)
--- a/webcit/static/t/whosection.html
+++ b/webcit/static/t/whosection.html
@@ -1,7 +1,7 @@
 <tr class="<?ITERATE:ODDEVEN>">
 <td class="edit_col">
 <??("COND:AIDE", 1)><??("COND:SUBST", 2, "WHO:ISME")>
- <a href="terminate_session?which_session=<?WHO:SESSION>&template=who" onClick="return ConfirmKill();"><?_("(kill)")</a>
+ <a href="terminate_session?which_session=<?WHO:SESSION>&template=who" onClick="return ConfirmKill();"><?_("(kill)")></a>
 <??("X", 2)><??("X", 1)>
 <?!("COND:SUBST", 3, "WHO:ISME")>   <a href="edit_me">(<?_("edit")>)</a>  <?!("X", 3)>
 </td>

diff --git a/webcit/subst.c b/webcit/subst.c
index 9d483ba177dea2b89840559574079b0b6964fc6e..1332146ec9b18b5c539b2710f7fd0f88d9b75e48 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -167,6 +167,7 @@ void FlushPayload(wcsubst *ptr, int reusestrbuf, int type)
        }
 }
 
+
 /**
  * \brief destructor; kill one entry.
  */
@@ -432,7 +433,6 @@ void pvo_do_cmd(StrBuf *Target, StrBuf *servcmd) {
 void print_value_of(StrBuf *Target, const char *keyname, size_t keylen) {
        struct wcsession *WCC = WC;
        wcsubst *ptr;
-       void *fcn();
        void *vVar;
 
        /*if (WCC->vars != NULL) PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
@@ -469,6 +469,74 @@ void print_value_of(StrBuf *Target, const char *keyname, size_t keylen) {
        }
 }
 
+int CompareSubstToToken(TemplateParam *ParamToCompare, TemplateParam *ParamToLookup)
+{
+       struct wcsession *WCC = WC;
+       wcsubst *ptr;
+       void *vVar;
+
+       if ((WCC->vars!= NULL) && GetHash(WCC->vars, ParamToLookup->Start, 
+                                         ParamToLookup->len, &vVar)) {
+               ptr = (wcsubst*) vVar;
+               switch(ptr->wcs_type) {
+               case WCS_STRING:
+               case WCS_STRBUF:
+               case WCS_STRBUF_REF:
+                       if (ParamToCompare->Type == TYPE_STR)
+                               return ((ParamToCompare->len == StrLength(ptr->wcs_value)) &&
+                                       (strcmp(ParamToCompare->Start, ChrPtr(ptr->wcs_value)) == 0));
+                       else
+                               return ParamToCompare->lvalue == StrTol(ptr->wcs_value);
+                       break;
+               case WCS_SERVCMD:
+                       return 1; 
+                       break;
+               case WCS_FUNCTION:
+                       return 1;
+               case WCS_LONG:
+                       if (ParamToCompare->Type == TYPE_STR)
+                               return 0;
+                       else 
+                               return ParamToCompare->lvalue == ptr->lvalue;
+                       break;
+               default:
+                       lprintf(1,"WARNING: invalid value in SV-Hash at %s!", 
+                               ParamToLookup->Start);
+               }
+       }
+       return 0;
+}
+
+int CompareSubstToStrBuf(StrBuf *Compare, TemplateParam *ParamToLookup)
+{
+       struct wcsession *WCC = WC;
+       wcsubst *ptr;
+       void *vVar;
+
+       if ((WCC->vars!= NULL) && GetHash(WCC->vars, ParamToLookup->Start, 
+                                         ParamToLookup->len, &vVar)) {
+               ptr = (wcsubst*) vVar;
+               switch(ptr->wcs_type) {
+               case WCS_STRING:
+               case WCS_STRBUF:
+               case WCS_STRBUF_REF:
+                       return ((StrLength(Compare) == StrLength(ptr->wcs_value)) &&
+                               (strcmp(ChrPtr(Compare), ChrPtr(ptr->wcs_value)) == 0));
+               case WCS_SERVCMD:
+                       return 1; 
+                       break;
+               case WCS_FUNCTION:
+                       return 1;
+               case WCS_LONG:
+                       return StrTol(Compare) == ptr->lvalue;
+               default:
+                       lprintf(1,"WARNING: invalid value in SV-Hash at %s!", 
+                               ParamToLookup->Start);
+               }
+       }
+       return 0;
+}
+
 
 void PutNewToken(WCTemplate *Template, WCTemplateToken *NewToken)
 {
@@ -763,9 +831,13 @@ int EvaluateToken(StrBuf *Target, WCTemplateToken *Token, WCTemplate *pTmpl, voi
                        Handler = (HashHandler*) vVar;
                        if ((Token->nParameters < Handler->nMinArgs) || 
                            (Token->nParameters > Handler->nMaxArgs)) {
-                               lprintf(1, "Handler [%s] doesn't work with %ld params", 
+                               lprintf(1, "Handler [%s] (in '%s' line %ld); "
+                                       "doesn't work with %ld params [%s]", 
                                        Token->pName,
-                                       Token->nParameters);
+                                       ChrPtr(pTmpl->FileName),
+                                       Token->Line,
+                                       Token->nParameters, 
+                                       ChrPtr(Token->FlatToken));
                        }
                        else {
                                Handler->HandlerFunc(Target, 
@@ -1140,7 +1212,8 @@ void tmpl_iterate_subtmpl(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, vo
        }
        FreeStrBuf(&SubBuf);
        DeleteHashPos(&it);
-       It->Destructor(List);
+       if (It->Destructor != NULL)
+               It->Destructor(List);
 }
 
 int ConditionalVar(WCTemplateToken *Tokens, void *Context)

diff --git a/webcit/webcit.h b/webcit/webcit.h
index d91c24210892e0a0367674850fb54a644b76a43f..365c2e67f36b6727ce4c12ee064add24a3687c1b 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -683,6 +683,8 @@ void DoTemplate(const char *templatename, long len, void *Context, StrBuf *Targe
 #define do_template(a, b) DoTemplate(a, sizeof(a) -1, b, NULL);
 void url_do_template(void);
 
+int CompareSubstToToken(TemplateParam *ParamToCompare, TemplateParam *ParamToLookup);
+int CompareSubstToStrBuf(StrBuf *Compare, TemplateParam *ParamToLookup);
 
 int lingering_close(int fd);
 char *memreadline(char *start, char *buf, int maxlen);