X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=8ca86433efab0e537366a97b0ed2db9e0ddf4329;hb=3a93adc422924fc2d1aee100e1cc853138f46155;hp=5112aba61955429c55416588275b9fa99c34b6cc;hpb=9869171ccf8bbbbcee907fabfc1196be47517fce;p=citadel.git

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 5112aba61..8ca86433e 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -430,27 +430,6 @@ HashList *iterate_get_mailsumm_All(StrBuf *Target, WCTemplputParams *TP)
 {
 	return WC->summ;
 }
-int Conditional_ROOM_DISPLAY_MSG(StrBuf *Target, WCTemplputParams *TP) {
-	wcsession *WCC = WC;
-	IterateStruct *ITC = CCTX;
-	int num_inset = ITC->n;
-	if ((num_inset >= WC->startmsg) && (WCC->num_displayed <= WCC->maxmsgs)) {
-
-	WCC->num_displayed = WCC->num_displayed+1;
-	return 1; /* Pass GO, collect $200 */
-	} 
-	return 0;
-}
-int Conditional_MAIL_SUMM_LASTMSG(StrBuf *Target, WCTemplputParams *TP) {
-  IterateStruct *ITC = CCTX;
-	int is_last_n = ITC->LastN;
-/*
-	//GetHash(WC->vars, HKEY("ITERATE:N"), (void *)&n_dsubst);
-	//num_inset = n_dsubst->lvalue;
-	*/
-	/* Is the num_displayed higher than maxmsgs? OR last in iterator */
-	return ((WC->num_displayed > WC->maxmsgs) || (is_last_n == 1));
-}
 void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	Msg->date = StrTol(HdrLine);
@@ -1151,8 +1130,6 @@ InitModule_MSGRENDERERS
 	RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  CTX_MAILSUM);
 	RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  CTX_MAILSUM);
 	RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY,  CTX_NONE);
-	RegisterConditional(HKEY("COND:ROOM:DISPLAYMSG"), 0, Conditional_ROOM_DISPLAY_MSG, CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:SUMM:LASTMSG"), 0, Conditional_MAIL_SUMM_LASTMSG, CTX_MAILSUM);
 	RegisterConditional(HKEY("COND:MAIL:SUMM:RFCA"), 0, Conditional_MAIL_SUMM_RFCA,  CTX_MAILSUM);
 	RegisterConditional(HKEY("COND:MAIL:SUMM:CCCC"), 0, Conditional_MAIL_SUMM_CCCC,  CTX_MAILSUM);
 	RegisterConditional(HKEY("COND:MAIL:SUMM:UNREAD"), 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);