When we 503, do it in HTML

[citadel.git] / citadel / modules / wiki / serv_wiki.c

diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index 6ae8eda01337959fc060c2c4d9fffe3c2dbed9fe..5f1845757560a1604cad5596708e536d1915085e 100644 (file)
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Server-side module for Wiki rooms.  This handles things like version control. 
  * 
  * Copyright (c) 2009 by the citadel.org team
@@ -53,7 +51,6 @@
 #include "config.h"
 #include "control.h"
 #include "user_ops.h"
-#include "policy.h"
 #include "database.h"
 #include "msgbase.h"
 #include "euidindex.h"
@@ -108,8 +105,9 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        /* If this isn't a MIME message, don't bother. */
        if (msg->cm_format_type != 4) return(0);
 
-       /* If there's no EUID we can't do this. */
-       if (msg->cm_fields['E'] == NULL) return(0);
+       /* If there's no EUID we can't do this.  Reject the post. */
+       if (msg->cm_fields['E'] == NULL) return(1);
+
        snprintf(history_page, sizeof history_page, "%s_HISTORY_", msg->cm_fields['E']);
 
        /* Make sure we're saving a real wiki page rather than a wiki history page.
@@ -132,7 +130,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        msg->cm_fields['U'] = strdup(msg->cm_fields['E']);
 
        /* See if we can retrieve the previous version. */
-       old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CCC->room);
+       old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CCC->room);
        if (old_msgnum > 0L) {
                old_msg = CtdlFetchMessage(old_msgnum, 1);
        }
@@ -203,7 +201,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
 
        /* Now look for the existing edit history */
 
-       history_msgnum = locate_message_by_euid(history_page, &CCC->room);
+       history_msgnum = CtdlLocateMessageByEuid(history_page, &CCC->room);
        history_msg = NULL;
        if (history_msgnum > 0L) {
                history_msg = CtdlFetchMessage(history_msgnum, 1);
@@ -365,7 +363,7 @@ void wiki_history(char *pagename) {
        }
 
        snprintf(history_page_name, sizeof history_page_name, "%s_HISTORY_", pagename);
-       msgnum = locate_message_by_euid(history_page_name, &CC->room);
+       msgnum = CtdlLocateMessageByEuid(history_page_name, &CC->room);
        if (msgnum > 0L) {
                msg = CtdlFetchMessage(msgnum, 1);
        }
@@ -424,7 +422,8 @@ void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp,
        CtdlLogPrintf(CTDL_DEBUG, "callback found rev: %s\n", this_rev);
 
        /* Perform the patch */
-       fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>/dev/null", "w");
+       //fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>/dev/null", "w");
+       fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>>/tmp/patcherr.txt", "w");
        if (fp) {
                /* Replace the filenames in the patch with the tempfilename we're actually tweaking */
                fprintf(fp, "--- %s\n", hecbd->tempfilename);
@@ -443,7 +442,7 @@ void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp,
                                        fprintf(fp, "%s\n", buf);
                                }
                        }
-               } while ((*ptr != 0) && ((int)ptr < ((int)content + length)));
+               } while ((*ptr != 0) && (ptr < ((char*)content + length)));
                if (pclose(fp) != 0) {
                        CtdlLogPrintf(CTDL_ERR, "pclose() returned an error - patch failed\n");
                }
@@ -489,7 +488,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
        /* Begin by fetching the current version of the page.  We're going to patch
         * backwards through the diffs until we get the one we want.
         */
-       msgnum = locate_message_by_euid(pagename, &CC->room);
+       msgnum = CtdlLocateMessageByEuid(pagename, &CC->room);
        if (msgnum > 0L) {
                msg = CtdlFetchMessage(msgnum, 1);
        }
@@ -523,7 +522,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
        /* Get the revision history */
 
        snprintf(history_page_name, sizeof history_page_name, "%s_HISTORY_", pagename);
-       msgnum = locate_message_by_euid(history_page_name, &CC->room);
+       msgnum = CtdlLocateMessageByEuid(history_page_name, &CC->room);
        if (msgnum > 0L) {
                msg = CtdlFetchMessage(msgnum, 1);
        }
@@ -574,7 +573,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
                        fseek(fp, 0L, SEEK_SET);
                        msg->cm_fields['M'] = malloc(len + 1);
                        rv = fread(msg->cm_fields['M'], len, 1, fp);
-                       CtdlLogPrintf(CTDL_DEBUG, "\033[32mdid %d blocks of %d bytes\033[0m\n", rv, len);
+                       CtdlLogPrintf(CTDL_DEBUG, "did %d blocks of %ld bytes\n", rv, len);
                        msg->cm_fields['M'][len] = 0;
                        fclose(fp);
                }
@@ -662,5 +661,5 @@ CTDL_MODULE_INIT(wiki)
        }
 
        /* return our Subversion id for the Log */
-       return "$Id$";
+       return "wiki";
 }