Fix db_get_value after mysql->mysqli upgrade

[wfpl.git] / session_messages.php

diff --git a/session_messages.php b/session_messages.php
index 481b87a..7589781 100644 (file)
--- 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('code/wfpl/session.php');
-require_once('code/wfpl/string_array.php');
-require_once('code/wfpl/messages.php');
+require_once(__DIR__.'/'.'session.php');
+require_once(__DIR__.'/'.'messages.php');
 
 function session_save_messages() {
        if(!isset($GLOBALS['wfpl_messages'])) {
@@ -34,24 +23,24 @@ 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() {
-       if(!session_exists()) {
-               return false;
-       }
-       $messages = session_get('wfpl_messages');
-       if($messages !== false) {
-               $messages = string_to_array($messages);
-               if(!(isset($GLOBALS['wfpl_messages']) && is_array($GLOBALS['wfpl_messages']))) {
-                       $GLOBALS['wfpl_messages'] = array();
+       if(session_exists()) {
+               $messages = session_get('wfpl_messages');
+               if($messages !== false) {
+                       session_clear('wfpl_messages');
+                       $messages = json_decode($messages, true);
+                       if ($messages !== null) {
+                               return $messages;
+                       }
                }
-               # messages from the previous run happened first
-               $GLOBALS['wfpl_messages'] = array_merge($messages, $GLOBALS['wfpl_messages']);
-
        }
-       session_clear('wfpl_messages');
+       return array();
 }