* migrated SUBST stuff to hash

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index a4067e104ee99bc739a4b6460829cc2e89e41504..4b036e03fab68237dd857983f48ac650fff0eb16 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -7,7 +7,6 @@
  */
 /*@{*/
 #include "webcit.h"
-#include "vcard.h"
 
 /**
  * \brief Edit the vCard component of a MIME message.  
@@ -188,7 +187,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to, char *force_room
        /** Display the form */
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svprintf("BOXTITLE", WCS_STRING, _("Edit contact information"));
+       svput("BOXTITLE", WCS_STRING, _("Edit contact information"));
        do_template("beginbox");
 
        wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
@@ -373,7 +372,7 @@ void edit_vcard(void) {
        long msgnum;
        char *partnum;
 
-       msgnum = atol(bstr("msgnum"));
+       msgnum = lbstr("msgnum");
        partnum = bstr("partnum");
        do_edit_vcard(msgnum, partnum, "", NULL);
 }
@@ -389,12 +388,12 @@ void submit_vcard(void) {
        char buf[SIZ];
        int i;
 
-       if (IsEmptyStr(bstr("ok_button"))) { 
+       if (!havebstr("ok_button")) { 
                readloop("readnew");
                return;
        }
 
-       if (!IsEmptyStr(bstr("force_room"))) {
+       if (havebstr("force_room")) {
                gotoroom(bstr("force_room"));
        }