X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=messages.php;h=2d065e32e16bca925ad8c33916b52d14548c5539;hb=c4575213df3077d1b9956dd12132f13ba7567970;hp=187f083ff620592ce5e2373aa48f9315eb11fef1;hpb=a11c234de210c655511de6e841eaf87d4787b3f5;p=wfpl.git

diff --git a/messages.php b/messages.php
index 187f083..2d065e3 100644
--- a/messages.php
+++ b/messages.php
@@ -2,94 +2,70 @@
 
 #  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
+#  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 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, see <http://www.gnu.org/licenses/>.
 
 
-
-# This file is useful for putting message boxe(s) on the screen.
+# This file is useful for putting message box(es) on the screen.
 #
 # Just call message("message here") whenever you have something to report.
 #
 # Once a template is loaded, call display_messages(). Your template should have
-# a <!--~message_box start~--> section with ~message_text.html~ tag in it.
+# a <!--~message?~--> section with a ~text:html~ tag in it.
 #
-# If you want a divider (any text between message boxes when there are multiple
-# boxes) provide a sub-template section named "message_divider" INSIDE
-# "message_box" at the begining of it.
+# If you want a divider (any text between message boxes when there are
+# multiple boxes) provide a sub-template section named "separator"
+# INSIDE "message" at the begining of it.
 #
 # If you'd like something around the group of all message boxes, you can put
-# the whole thing in a sub-template section called "message_container"
+# the whole thing in a sub-template section called "messages"
 
 # Simple example:
 #
-#    <!--~message_box start~-->
-#        <p>~message_text.html~</p>
-#    <!--~end~-->
+#    <!--~message?~-->
+#        <p>~text:html~</p>
+#    <!--~.~-->
 
 # Full-featured example:
 #
-#    <!--~message_container start~-->
+#    <!--~messages?~-->
 #         <div style="border: 2px solid red; background: #f88; padding: 5px">
-#         <!--~message_box start~-->
-#             <!--~message_divider start~-->
+#         <!--~message?~-->
+#             <!--~separator?~-->
 #                 <hr />
-#             <!--~end~-->
-#             <p style="font-size: 120%">~message_text.html~</p>
-#         <!--~end~-->
+#             <!--~separator.~-->
+#             <p style="font-size: 120%">~text:html~</p>
+#         <!--~message.~-->
 #         </div>
-#    <!--~end~-->
+#    <!--~messages.~-->
 
 require_once('code/wfpl/template.php');
 
 function message($msg) {
 	if(!isset($GLOBALS['wfpl_messages'])) {
-		$GLOBALS['wfpl_messages'] = array();
+		if(function_exists('session_restore_messages')) {
+			$GLOBALS['wfpl_messages'] = session_restore_messages();
+		} else $GLOBALS['wfpl_messages'] = array();
 	}
 
 	$GLOBALS['wfpl_messages'][] = $msg;
 }
 
-# if you want the messages in a template other than the default one, pass it like so:
-#
-# display_messages(ref($my_template));
-function display_messages($template = 0) {
-	$first = true;
-	if($template === 0) {
-		$template = &$GLOBALS['wfpl_template'];
-	} else {
-		$template = &$template->ref;
-	}
-
-	if(function_exists('session_restore_messages')) {
-		session_restore_messages();
-	}
-
-	if($GLOBALS['wfpl_messages']) {
-		foreach($GLOBALS['wfpl_messages'] as $msg) {
-			if($first) {
-				$first = false;
-			} else {
-				$template->sub('message_divider');
-			}
-			$template->set('message_text', $msg);
-			$template->sub('message_box');
-		}
-		$template->sub('message_container');
+function display_messages(&$tem = NULL) {
+	if(!$GLOBALS['wfpl_messages']) return;
+	foreach($GLOBALS['wfpl_messages'] as $msg) {
+		$sub = array('text' => $msg);
+		$GLOBALS['wfpl_tem_data']['message'][] = $sub;
+		$GLOBALS['wfpl_tem_data']['messages'] = TRUE;
 	}
 }
-
-?>