Changes in [2633:e926dcfd2a59:2635:ad168cf3085a]

Files:

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

inc/admin/lib.moduleslist.php

@@ -502 +502 @@
      public static function sortModules($modules, $field, $asc=true)
      {
-          $sorter = array();
+          $origin = $sorter = array();
+
           foreach($modules as $id => $module) {
-               $sorter[$id] = isset($module[$field]) ? $module[$field] : $field;
-          }
-          array_multisort($sorter, $asc ? SORT_ASC : SORT_DESC, $modules);
-
-          return $modules;
+               $origin[] = $module;
+               $sorter[] = isset($module[$field]) ? $module[$field] : $field;
+          }
+
+          array_multisort($sorter, $asc ? SORT_ASC : SORT_DESC, $origin);
+
+          foreach($origin as $module) {
+               $final[$module['id']] = $module;
+          }
+
+          return $final;
      }
 

inc/public/lib.urlhandlers.php

@@ -374 +374 @@
                          # 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();
@@ -384 +389 @@
                          {
                               $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