Wiki revs now work again - replaced --global-reject-file with -r

[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 f5c7ebbe2cc175561c7987e6206d29a6409feb9e..0399124b396e44949fccfdc29af3070d37fbbf89 100644 (file)
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -1,21 +1,21 @@
 /*
  * Server-side module for Wiki rooms.  This handles things like version control. 
  * 
- * Copyright (c) 2009 by the citadel.org team
+ * Copyright (c) 2009-2011 by the citadel.org team
  *
- *  This program is free 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 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.
+ * 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
+ * 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 "sysdep.h"
@@ -116,7 +116,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
        if (    (strlen(msg->cm_fields['E']) >= 9)
                && (!strcasecmp(&msg->cm_fields['E'][strlen(msg->cm_fields['E'])-9], "_HISTORY_"))
        ) {
-               CtdlLogPrintf(CTDL_DEBUG, "History page not being historied\n");
+               syslog(LOG_DEBUG, "History page not being historied\n");
                return(0);
        }
 
@@ -182,10 +182,10 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
                } while (nbytes == 1024);
                diffbuf[diffbuf_len] = 0;
                if (pclose(fp) != 0) {
-                       CtdlLogPrintf(CTDL_ERR, "pclose() returned an error - diff failed\n");
+                       syslog(LOG_ERR, "pclose() returned an error - diff failed\n");
                }
        }
-       CtdlLogPrintf(CTDL_DEBUG, "diff length is %d bytes\n", diffbuf_len);
+       syslog(LOG_DEBUG, "diff length is %d bytes\n", diffbuf_len);
 
        unlink(diff_old_filename);
        unlink(diff_new_filename);
@@ -315,7 +315,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
                CtdlSubmitMsg(history_msg, NULL, "", 0);
        }
        else {
-               CtdlLogPrintf(CTDL_ALERT, "Empty boundary string in history message.  No history!\n");
+               syslog(LOG_ALERT, "Empty boundary string in history message.  No history!\n");
        }
 
        free(diffbuf);
@@ -419,7 +419,7 @@ void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp,
 
        CtdlDecodeBase64(memo, filename, strlen(filename));
        extract_token(this_rev, memo, 0, '|', sizeof this_rev);
-       CtdlLogPrintf(CTDL_DEBUG, "callback found rev: %s\n", this_rev);
+       syslog(LOG_DEBUG, "callback found rev: %s\n", this_rev);
 
        /* Perform the patch */
        fp = popen("patch -f -s -p0 -r /dev/null >/dev/null 2>/dev/null", "w");
@@ -443,13 +443,13 @@ void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp,
                        }
                } while ((*ptr != 0) && (ptr < ((char*)content + length)));
                if (pclose(fp) != 0) {
-                       CtdlLogPrintf(CTDL_ERR, "pclose() returned an error - patch failed\n");
+                       syslog(LOG_ERR, "pclose() returned an error - patch failed\n");
                }
        }
 
        if (!strcasecmp(this_rev, hecbd->stop_when)) {
                /* Found our target rev.  Tell any subsequent callbacks to suppress processing. */
-               CtdlLogPrintf(CTDL_DEBUG, "Target revision has been reached -- stop patching.\n");
+               syslog(LOG_DEBUG, "Target revision has been reached -- stop patching.\n");
                hecbd->done = 1;
        }
 }
@@ -484,6 +484,14 @@ void wiki_rev(char *pagename, char *rev, char *operation)
                return;
        }
 
+       if (!strcasecmp(operation, "revert")) {
+               r = CtdlDoIHavePermissionToPostInThisRoom(temp, sizeof temp, NULL, POST_LOGGED_IN, 0);
+               if (r != 0) {
+                       cprintf("%d %s\n", r, temp);
+                       return;
+               }
+       }
+
        /* 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.
         */
@@ -514,7 +522,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
                fclose(fp);
        }
        else {
-               CtdlLogPrintf(CTDL_ALERT, "Cannot open %s: %s\n", temp, strerror(errno));
+               syslog(LOG_ALERT, "Cannot open %s: %s\n", temp, strerror(errno));
        }
        CtdlFreeMessage(msg);
 
@@ -572,7 +580,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, "did %d blocks of %ld bytes\n", rv, len);
+                       syslog(LOG_DEBUG, "did %d blocks of %ld bytes\n", rv, len);
                        msg->cm_fields['M'][len] = 0;
                        fclose(fp);
                }