final touches on dkim test harness

[citadel.git] / webcit / marchlist.c

diff --git a/webcit/marchlist.c b/webcit/marchlist.c
index 175f780e787fe41a29fa445075db7dcbedd1c7a2..8888c5d3c6057567843c824af10962d92d0538cb 100644 (file)
--- a/webcit/marchlist.c
+++ b/webcit/marchlist.c
@@ -1,5 +1,5 @@
 #include "webcit.h"
-#include "webserver.h"
+
 
 /*
  * Free a session's march list
@@ -57,8 +57,6 @@ void remove_march(const StrBuf *aaa)
 char *pop_march(int desired_floor)
 {
        static char TheRoom[128];
-       int TheFloor = 0;
-       int TheOrder = 32767;
        int TheWeight = 0;
        int weight;
        struct march *mptr = NULL;
@@ -80,8 +78,10 @@ char *pop_march(int desired_floor)
                if (weight > TheWeight) {
                        TheWeight = weight;
                        strcpy(TheRoom, mptr->march_name);
+/* TODOO: and now????
                        TheFloor = mptr->march_floor;
                        TheOrder = mptr->march_order;
+*/
                }
        }
        return (TheRoom);
@@ -169,6 +169,7 @@ void gotonext(void)
        }
        if (WC->march != NULL) {
                next_room = NewStrBufPlain(pop_march(-1), -1);/*TODO: migrate march to strbuf */
+               putlbstr("gotonext", 1);
        } else {
                next_room = NewStrBufPlain(HKEY("_BASEROOM_"));
        }
@@ -246,7 +247,7 @@ void
 InitModule_MARCHLIST
 (void)
 {
-       RegisterConditional(HKEY("COND:UNGOTO"), 0, ConditionalHaveUngoto, CTX_NONE);
+       RegisterConditional("COND:UNGOTO", 0, ConditionalHaveUngoto, CTX_NONE);
        RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, NULL, CTX_NONE);
 
        WebcitAddUrlHandler(HKEY("gotonext"), "", 0, _gotonext, NEED_URL);