UNTESTED: added session_messages.php (saves/restores message()s over redirects)

diff --git a/http.php b/http.php
index b183275..c7c457a 100644 (file)
--- a/http.php
+++ b/http.php
@@ -48,6 +48,9 @@ function this_url() {
 }
 
 function redirect($url, $status = '302 Moved Temporarily', $message = '') {
+       if(function_exists('session_save_messages')) {
+               session_save_messages();
+       }
        header("HTTP/1.0 $status");
        header("Location: $url");
        echo($message);

diff --git a/messages.php b/messages.php
index 326ed16..187f083 100644 (file)
--- a/messages.php
+++ b/messages.php
@@ -74,6 +74,10 @@ function display_messages($template = 0) {
                $template = &$template->ref;
        }
 
+       if(function_exists('session_restore_messages')) {
+               session_restore_messages();
+       }
+
        if($GLOBALS['wfpl_messages']) {
                foreach($GLOBALS['wfpl_messages'] as $msg) {
                        if($first) {

diff --git a/session_messages.php b/session_messages.php
new file mode 100644 (file)
index 0000000..358994c
--- /dev/null
+++ b/session_messages.php
@@ -0,0 +1,56 @@
+<?php
+
+#  Copyright (C) 2007 Jason Woofenden
+#
+#  This file is part of wfpl.
+#
+#  wfpl is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
+#
+#  wfpl 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 Lesser General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
+#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+# require_once() this file instead of messages.php if you'd like to store
+# save/restore messages in the session accross redirect()s. That's all you have
+# to do. These functions are called when needed (from redirect() and
+# display_messages()) if they are defined.
+
+# see messages.php for documentation on how to use it.
+
+require_once('code/wfpl/session.php');
+require_once('code/wfpl/string_array.php');
+require_once('code/wfpl/messages.php');
+
+function session_save_messages() {
+       if(!isset($GLOBALS['wfpl_messages'])) {
+               return;
+       }
+       if(!is_array($GLOBALS['wfpl_messages'])) {
+               return;
+       }
+
+       init_session();
+       session_set('wfpl_messages', array_to_string($GLOBALS['wfpl_messages']);
+}
+
+function session_restore_messages() {
+       if(!session()) {
+               return false;
+       }
+       $messages = session_get('wfpl_messages');
+       if($messages !== false) {
+               $messages = string_to_array($messages);
+               # messages from the previous run happened first
+               $GLOBALS['wfpl_messages'] = array_merge($messages, $GLOBALS['wfpl_messages']);
+       }
+       session_clear('wfpl_messages');
+}