delete string_array.php (buggy, stupid)

diff --git a/session_messages.php b/session_messages.php
index cefe24f..269f7e0 100644 (file)
--- a/session_messages.php
+++ b/session_messages.php
@@ -24,7 +24,6 @@
 # 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');
 
 function session_save_messages() {
@@ -34,9 +33,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 +46,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();

diff --git a/string_array.php b/string_array.php
deleted file mode 100644 (file)
index 4f9081d..0000000
--- a/string_array.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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 file contains code to convert an array of strings into a string, and back again.
-
-function string_to_array($data) {
-       $pos = 0;
-       $max = strlen($data);
-       $out = array();
-       while($pos < $max) {
-               $sep = stripos($data, ' ', $pos);
-               if ($sep == -1 || $sep == $pos) {
-                       return $out;
-               }
-               $size = (int) substr($data, $pos, $sep - $pos);
-               $pos = $sep + 1;
-               $out[] = substr($data, $pos, $size);
-               $pos += $size;
-       }
-       return $out;
-}
-
-function array_to_string($array) {
-       $ret = '';
-       foreach($array as &$element) {
-               if (is_string($element)) {
-                       $ret .= strlen($element) . ' ';
-                       $ret .= $element;
-               }
-       } unset ($element);
-       return $ret;
-}
-
-?>