cleanup webcit.h; utils.c, remove unneeded stuff

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 8a3b4dfa4fe3f619d8d838e976bf95e78bf7e882..5029030bb9d231c5fa8398645f5824a0f933d504 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1,11 +1,26 @@
 /*
  * Lots of different room-related operations.
+ *
+ * Copyright (c) 1996-2011 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
 #include "webserver.h"
 
-
 ConstStr QRFlagList[] = {
        {HKEY(strof(QR_PERMANENT))},
        {HKEY(strof(QR_INUSE))},
@@ -58,7 +73,7 @@ void _DBG_QR(long QR)
                i = i << 1;
                j++;
        }
-       lprintf(9, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
+       syslog(9, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
        FreeStrBuf(&QRVec);
 }
 
@@ -81,7 +96,7 @@ void _DBG_QR2(long QR2)
                i = i << 1;
                j++;
        }
-       lprintf(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
+       syslog(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
        FreeStrBuf(&QR2Vec);
 }
 
@@ -98,6 +113,11 @@ void _DBG_QR2(long QR2)
 /*******************************************************************************
  ***************************** Goto Commands ***********************************
  ******************************************************************************/
+
+void dotskip(void) {
+       smart_goto(sbstr("room"));
+}
+
 void dotgoto(void) {
        if (!havebstr("room")) {
                readloop(readnew, eUseDefault);
@@ -117,8 +137,8 @@ void smart_goto(const StrBuf *next_room) {
        readloop(readnew, eUseDefault);
 }
 
-/**
- * \brief goto a private room
+/*
+ * goto a private room
  */
 void goto_private(void)
 {
@@ -653,7 +673,7 @@ void toggle_self_service(void) {
 
        SetCurrentRoomFlags (&WCC->CurRoom);
        
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 }
 
 
@@ -676,7 +696,7 @@ void editroom(void)
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                       _("Cancelled.  Changes were not saved."));
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
        if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
@@ -804,7 +824,7 @@ void editroom(void)
        
        if (succ1 + succ2 == 0)
                AppendImportantMessage (_("Your changes have been saved."), -1);
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
        return;
 }
 
@@ -839,7 +859,8 @@ void do_invt_kick(void)
                        if ((StrLength(User) > 0) && (Kick))
                        {
                                serv_printf("KICK %s", ChrPtr(User));
-                               StrBuf_ServGetln(Buf);
+                               if (StrBuf_ServGetln(Buf) < 0)
+                                       break;
                                if (GetServerStatus(Buf, NULL) != 2) {
                                        StrBufCutLeft(Buf, 4);
                                        AppendImportantMessage(SKEY(Buf));
@@ -855,7 +876,8 @@ void do_invt_kick(void)
                        else if ((StrLength(User) > 0) && (Invite))
                        {
                                serv_printf("INVT %s", ChrPtr(User));
-                               StrBuf_ServGetln(Buf);
+                               if (StrBuf_ServGetln(Buf) < 0)
+                                       break;
                                if (GetServerStatus(Buf, NULL) != 2) {
                                        StrBufCutLeft(Buf, 4);
                                        AppendImportantMessage(SKEY(Buf));
@@ -871,7 +893,7 @@ void do_invt_kick(void)
                 }
         }
 
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 }
 
 
@@ -933,7 +955,7 @@ void entroom(void)
        WCC->CurRoom.view = er_view;
 
        if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
        } else {
                smart_goto(WCC->CurRoom.name);
        }
@@ -944,8 +966,8 @@ void entroom(void)
 
 
 
-/**
- * \brief Change the view for this room
+/*
+ * Change the view for this room
  */
 void change_view(void) {
        int newview;
@@ -969,7 +991,7 @@ void set_room_policy(void) {
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                       _("Cancelled.  Changes were not saved."));
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
 
@@ -978,13 +1000,13 @@ void set_room_policy(void) {
        strcpy(WC->ImportantMessage, &buf[4]);
 
        if (WC->axlevel >= 6) {
-               strcat(WC->ImportantMessage, "<br />\n");
+               strcat(WC->ImportantMessage, "<br>\n");
                serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
                serv_getln(buf, sizeof buf);
                strcat(WC->ImportantMessage, &buf[4]);
        }
        ReloadCurrentRoom();
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 }
 
 
@@ -1024,14 +1046,14 @@ void netedit(void) {
                strcat(line, bstr("suffix"));
        }
        else {
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
 
 
        fp = tmpfile();
        if (fp == NULL) {
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
 
@@ -1042,7 +1064,7 @@ void netedit(void) {
                fclose(fp);
                AppendImportantMessage(SRV_STATUS_MSG(Line));   
                FreeStrBuf(&Line);
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                return;
        }
 
@@ -1074,7 +1096,7 @@ void netedit(void) {
        if  (GetServerStatus(Line, NULL) != 4) {
                fclose(fp);
                AppendImportantMessage(SRV_STATUS_MSG(Line));   
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
                FreeStrBuf(&Line);
                return;
        }
@@ -1108,34 +1130,18 @@ void netedit(void) {
        FlushIgnetCfgs(&WC->CurRoom);
        FreeStrBuf(&Line);
 
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
 }
 
-/**
- * \brief Do either a known rooms list or a folders list, depending on the
- * user's preference
+/*
+ * Known rooms list (box style)
  */
 void knrooms(void)
 {
-       StrBuf *ListView = NULL;
-
-       /** Determine whether the user is trying to change views */
-       if (havebstr("view")) {
-               ListView = NewStrBufDup(SBSTR("view"));
-               set_preference("roomlistview", ListView, 1);
-       }
-       /** Sanitize the input so its safe */
-       if ((get_preference("roomlistview", &ListView) == 0)||
-           (
-                   (strcasecmp(ChrPtr(ListView), "folders") != 0) &&
-                   (strcasecmp(ChrPtr(ListView), "rooms") != 0)
-                   )
-               )
-       {
-               ListView = NewStrBufPlain(HKEY("rooms"));
-               set_preference("roomlistview", ListView, 0);
-       }
-       url_do_template();
+       DeleteHash(&WC->Rooms);
+       output_headers(1, 1, 1, 0, 0, 0); 
+       do_template("knrooms");
+       wDumpContent(1);
 }
 
 
@@ -1184,7 +1190,7 @@ void delete_floor(void) {
        AppendImportantMessage (SKEY(Buf));
 
        FlushRoomlist();
-       http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("floors")), 0);
        FreeStrBuf(&Buf);
 }
 
@@ -1207,7 +1213,7 @@ void create_floor(void) {
        }
        AppendImportantMessage (SKEY(Buf));
        FlushRoomlist();
-       http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("floors")), 0);
        FreeStrBuf(&Buf);
 }
 
@@ -1227,7 +1233,7 @@ void rename_floor(void) {
        StrBufCutLeft(Buf, 4);
        AppendImportantMessage (SKEY(Buf));
 
-       http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("floors")), 0);
        FreeStrBuf(&Buf);
 }
 
@@ -1291,7 +1297,7 @@ InitModule_ROOMOPS
        WebcitAddUrlHandler(HKEY("rename_floor"), "", 0, rename_floor, 0);
        WebcitAddUrlHandler(HKEY("create_floor"), "", 0, create_floor, 0);
 
-       WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, 0);
+       WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, ANONYMOUS);
        WebcitAddUrlHandler(HKEY("dotgoto"), "", 0, dotgoto, NEED_URL);
        WebcitAddUrlHandler(HKEY("dotskip"), "", 0, dotskip, NEED_URL);
 
@@ -1400,5 +1406,3 @@ SessionDestroyModule_ROOMOPS
        _FlushRoomList (sess);
 }
 
-
-/*@}*/