* move some more vars from the session context to strbuf (the use of StrBufAppendTemp...

[citadel.git] / webcit / floors.c

diff --git a/webcit/floors.c b/webcit/floors.c
index 3ea670d8fc1f6730513874ecd565a59103682550..78227221b6f5353de6cd27b9ce667ae38894347c 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -19,7 +19,7 @@
  * will be displayed at the top of the screen.
  * \param prepend_html pagetitle to prepend
  */
-void display_floorconfig(char *prepend_html)
+void display_floorconfig(StrBuf *prepend_html)
 {
        char buf[SIZ];
 
@@ -28,18 +28,17 @@ void display_floorconfig(char *prepend_html)
        int refcount;
 
         output_headers(1, 1, 2, 0, 0, 0);
-        wprintf("<div id=\"banner\">\n"
-                "<TABLE class=\"floors_banner\"><TR><TD>"
-                "<SPAN CLASS=\"titlebar\">");
+        wprintf("<div id=\"banner\">\n");
+        wprintf("<h1>");
        wprintf(_("Add/change/delete floors"));
-       wprintf("</SPAN>"
-                "</TD></TR></TABLE>\n"
-                "</div>\n<div id=\"content\">\n"
-        );
+       wprintf("</h1>");
+        wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
                                                                                                                              
        if (prepend_html != NULL) {
                wprintf("<br /><b><i>");
-               client_write(prepend_html, strlen(prepend_html));
+               StrBufAppendBuf(WC->WBuf, prepend_html, 0);
                wprintf("</i></b><br /><br />\n");
        }
 
@@ -95,7 +94,7 @@ void display_floorconfig(char *prepend_html)
                        "<INPUT TYPE=\"text\" NAME=\"floorname\" "
                        "VALUE=\"%s\" MAXLENGTH=\"250\">\n",
                        floornum, floorname);
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
                        "VALUE=\"%s\">"
                        "</FORM></TD>", _("Change name"));
@@ -109,7 +108,7 @@ void display_floorconfig(char *prepend_html)
                        "<INPUT TYPE=\"text\" NAME=\"floorcss\" "
                        "VALUE=\"%s\" MAXLENGTH=\"250\">\n",
                        floornum, floorname);
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
                        "VALUE=\"%s\">"
                        "</FORM></TD>", _("Change CSS"));
@@ -119,7 +118,7 @@ void display_floorconfig(char *prepend_html)
 
        wprintf("<TR><TD>&nbsp;</TD>"
                "<TD><FORM METHOD=\"POST\" action=\"create_floor\">");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<INPUT TYPE=\"text\" NAME=\"floorname\" "
                "MAXLENGTH=\"250\">\n"
                "<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
@@ -137,65 +136,77 @@ void display_floorconfig(char *prepend_html)
  */
 void delete_floor(void) {
        int floornum;
-       char buf[SIZ];
-       char message[SIZ];
-
-       floornum = atoi(bstr("floornum"));
-
+       StrBuf *Buf;
+       const char *Err;
+               
+       floornum = ibstr("floornum");
+       Buf = NewStrBuf();
        serv_printf("KFLR %d|1", floornum);
-       serv_getln(buf, sizeof buf);
+       
+       StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err);
 
-       if (buf[0] == '2') {
-               sprintf(message, _("Floor has been deleted."));
+       if (GetServerStatus(Buf, NULL) == 2) {
+               StrBufPlain(Buf, _("Floor has been deleted."),-1);
        }
        else {
-               sprintf(message, "%s", &buf[4]);
+               StrBufCutLeft(Buf, 4);
        }
 
-       display_floorconfig(message);
+       display_floorconfig(Buf);
+       FreeStrBuf(&Buf);
 }
 
 /**
  * \brief tart creating a new floor
  */
 void create_floor(void) {
-       char buf[SIZ];
-       char message[SIZ];
-       char floorname[SIZ];
+       StrBuf *Buf;
+       const char *Err;
 
-       strcpy(floorname, bstr("floorname"));
-
-       serv_printf("CFLR %s|1", floorname);
-       serv_getln(buf, sizeof buf);
+       Buf = NewStrBuf();
+       serv_printf("CFLR %s|1", bstr("floorname"));
+       StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err);
 
-       if (buf[0] == '2') {
-               sprintf(message, _("New floor has been created."));
-       } else {
-               sprintf(message, "%s", &buf[4]);
+       if (GetServerStatus(Buf, NULL) == 2) {
+               StrBufPlain(Buf, _("New floor has been created."),-1);
+       }
+       else {
+               StrBufCutLeft(Buf, 4);
        }
 
-       display_floorconfig(message);
+       display_floorconfig(Buf);
+       FreeStrBuf(&Buf);
 }
 
+
 /**
  * \brief rename this floor
  */
 void rename_floor(void) {
-       int floornum;
-       char buf[SIZ];
-       char message[SIZ];
-       char floorname[SIZ];
+       StrBuf *Buf;
 
-       floornum = atoi(bstr("floornum"));
-       strcpy(floorname, bstr("floorname"));
+       Buf = NewStrBuf();
 
-       serv_printf("EFLR %d|%s", floornum, floorname);
-       serv_getln(buf, sizeof buf);
+       serv_printf("EFLR %d|%s", 
+                   ibstr("floornum"), 
+                   bstr("floorname"));
+       StrBuf_ServGetln(Buf);
 
-       sprintf(message, "%s", &buf[4]);
+       StrBufCutLeft(Buf, 4);
 
-       display_floorconfig(message);
+       display_floorconfig(Buf);
+       FreeStrBuf(&Buf);
 }
 
+void _display_floorconfig(void) {display_floorconfig(NULL);}
 
+void 
+InitModule_FLOORS
+(void)
+{
+       WebcitAddUrlHandler(HKEY("delete_floor"), delete_floor, 0);
+       WebcitAddUrlHandler(HKEY("rename_floor"), rename_floor, 0);
+       WebcitAddUrlHandler(HKEY("create_floor"), create_floor, 0);
+       WebcitAddUrlHandler(HKEY("display_floorconfig"), _display_floorconfig, 0);
+}
 /*@}*/