X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=session_messages.php;h=75897810e3f975f3a688603bafd45b363571a894;hp=d2e57b628825843c0469e4a4ecc89074feef8bcd;hb=HEAD;hpb=571c58fff7b139f590b5c4862761092bc1045436

diff --git a/session_messages.php b/session_messages.php
index d2e57b6..7589781 100644
--- a/session_messages.php
+++ b/session_messages.php
@@ -1,19 +1,9 @@
 <?php
 
-#  Copyright (C) 2007 Jason Woofenden
-#
-#  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 program is in the public domain within the United States. Additionally,
+# we waive copyright and related rights in the work worldwide through the CC0
+# 1.0 Universal public domain dedication, which can be found at
+# http://creativecommons.org/publicdomain/zero/1.0/
 
 
 # require_once() this file instead of messages.php if you'd like to store
@@ -23,9 +13,8 @@
 
 # see messages.php for documentation on how to use it.
 
-require_once(__DIR__ . '/session.php');
-require_once(__DIR__ . '/string_array.php');
-require_once(__DIR__ . '/messages.php');
+require_once(__DIR__.'/'.'session.php');
+require_once(__DIR__.'/'.'messages.php');
 
 function session_save_messages() {
 	if(!isset($GLOBALS['wfpl_messages'])) {
@@ -34,9 +23,12 @@ function session_save_messages() {
 	if(!is_array($GLOBALS['wfpl_messages'])) {
 		return;
 	}
+	if(!count($GLOBALS['wfpl_messages'])) {
+		return;
+	}
 
 	init_session();
-	session_set('wfpl_messages', array_to_string($GLOBALS['wfpl_messages']));
+	session_set('wfpl_messages', json_encode($GLOBALS['wfpl_messages']));
 }
 
 function session_restore_messages() {
@@ -44,7 +36,10 @@ function session_restore_messages() {
 		$messages = session_get('wfpl_messages');
 		if($messages !== false) {
 			session_clear('wfpl_messages');
-			return string_to_array($messages);
+			$messages = json_decode($messages, true);
+			if ($messages !== null) {
+				return $messages;
+			}
 		}
 	}
 	return array();