More license declaration changes which omit the bit about getting in touch with confi...

[citadel.git] / webcit / preferences.c

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 9ed1f830cb7ce2e72371b3a462bf896d5c2629fb..bf7bacbe59767c6f01f609f4faad3791a8ef683c 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -1,10 +1,27 @@
 /*
  * Manage user preferences with a little help from the Citadel server.
+ *
+ * Copyright (c) 1996-2012 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, version 3.
+ * 
+ * 
+ *
+ * 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.
+ *
+ * 
+ * 
+ * 
  */
 
+
 #include "webcit.h"
 #include "webserver.h"
-#include "groupdav.h"
+#include "dav.h"
 
 HashList *PreferenceHooks;
 extern HashList *HandlerHash;
@@ -843,9 +860,7 @@ void GetPreferences(HashList *Setting)
 void set_preferences(void)
 {      
        if (!havebstr("change_button")) {
-               safestrncpy(WC->ImportantMessage, 
-                           _("Cancelled.  No settings were changed."),
-                           sizeof WC->ImportantMessage);
+               AppendImportantMessage(_("Cancelled.  No settings were changed."), -1);
                display_main_menu();
                return;
        }
@@ -1068,7 +1083,6 @@ void offer_start_page(StrBuf *Target, WCTemplputParams *TP)
  */
 void change_start_page(void) 
 {
-       wcsession *WCC = WC;
        const char *pch;
        void *vHandler;
        int ProhibitSave = 0;
@@ -1096,13 +1110,9 @@ void change_start_page(void)
                                       1, 
                                       NULL);
                if (ProhibitSave == 1)
-                       StrBufAppendBufPlain(WCC->ImportantMsg,
-                                            _("This isn't allowed to become the start page."),
-                                            -1, 0);
+                       AppendImportantMessage(_("This isn't allowed to become the start page."), -1);
                else
-                       StrBufAppendBufPlain(WCC->ImportantMsg,
-                                            _("You no longer have a start page selected."),
-                                            -1, 0);
+                       AppendImportantMessage(_("You no longer have a start page selected."), -1);
                display_main_menu();
                return;
        }
@@ -1117,7 +1127,7 @@ void change_start_page(void)
                               NULL);
 
        output_headers(1, 1, 0, 0, 0, 0);
-       do_template("newstartpage", NULL);
+       do_template("newstartpage");
        wDumpContent(1);
 }