Changeset 2634:d60876d7e4e4

Timestamp:

01/20/14 12:44:06 (12 years ago)

Author:

Dsls

Branch:

2.6

Children:

2635:ad168cf3085a, 2636:1f8978ee39fc

Message:

Use JSON instead of serialization, see #1249

Files:

• inc/public/lib.urlhandlers.php (modified) (2 diffs)
• plugins/pages/_public.php (modified) (2 diffs)

inc/public/lib.urlhandlers.php

@@ -367 +367 @@
                          # Get passwords cookie
                          if (isset($_COOKIE['dc_passwd'])) {
-                              $pwd_cookie = unserialize($_COOKIE['dc_passwd']);
+                              $pwd_cookie = json_decode($_COOKIE['dc_passwd']);
+                              if ($pwd_cookie === NULL) {
+                                   $pwd_cookie = array();
+                              } else {
+                                   $pwd_cookie = (array) $pwd_cookie;
+                              }
                          } else {
                               $pwd_cookie = array();
@@ -377 +382 @@
                          {
                               $pwd_cookie[$post_id] = $post_password;
-                              setcookie('dc_passwd',serialize($pwd_cookie),0,'/');
+                              setcookie('dc_passwd',json_encode($pwd_cookie),0,'/');
                          }
                          else

plugins/pages/_public.php

@@ -68 +68 @@
                          # Get passwords cookie
                          if (isset($_COOKIE['dc_passwd'])) {
-                              $pwd_cookie = unserialize($_COOKIE['dc_passwd']);
+                              $pwd_cookie = json_decode($_COOKIE['dc_passwd']);
+                              if ($pwd_cookie === NULL) {
+                                   $pwd_cookie = array();
+                              } else {
+                                   $pwd_cookie = (array) $pwd_cookie;
+                              }
                          } else {
                               $pwd_cookie = array();
@@ -78 +83 @@
                          {
                               $pwd_cookie[$post_id] = $post_password;
-                              setcookie('dc_passwd',serialize($pwd_cookie),0,'/');
+                              setcookie('dc_passwd',json_encode($pwd_cookie),0,'/');
                          }
                          else