Browse Source

Switch from serialize to json_encode for SiteOptions

Note that this requires a minor database migration of SiteOptions in
users_info and Paranoia in users_main
spaghetti 8 years ago
parent
commit
fe1ed7e61e
2 changed files with 4 additions and 5 deletions
  1. 2
    3
      sections/user/edit.php
  2. 2
    2
      sections/user/take_edit.php

+ 2
- 3
sections/user/edit.php View File

35
   error(403);
35
   error(403);
36
 }
36
 }
37
 
37
 
38
-$Paranoia = unserialize($Paranoia);
38
+$Paranoia = json_decode($Paranoia, true);
39
 if (!is_array($Paranoia)) {
39
 if (!is_array($Paranoia)) {
40
   $Paranoia = array();
40
   $Paranoia = array();
41
 }
41
 }
57
 }
57
 }
58
 
58
 
59
 if ($SiteOptions) {
59
 if ($SiteOptions) {
60
-  $SiteOptions = unserialize($SiteOptions);
60
+  $SiteOptions = json_decode($SiteOptions, true);
61
 } else {
61
 } else {
62
   $SiteOptions = array();
62
   $SiteOptions = array();
63
 }
63
 }
65
 View::show_header("$Username > Settings", 'user,password_validate,validate,cssgallery,preview_paranoia,bbcode,user_settings,donor_titles');
65
 View::show_header("$Username > Settings", 'user,password_validate,validate,cssgallery,preview_paranoia,bbcode,user_settings,donor_titles');
66
 
66
 
67
 
67
 
68
-var_dump($SiteOptions);
69
 
68
 
70
 $DonorRank = Donations::get_rank($UserID);
69
 $DonorRank = Donations::get_rank($UserID);
71
 $DonorIsVisible = Donations::is_visible($UserID);
70
 $DonorIsVisible = Donations::is_visible($UserID);

+ 2
- 2
sections/user/take_edit.php View File

356
     i.StyleID = '".db_string($_POST['stylesheet'])."',
356
     i.StyleID = '".db_string($_POST['stylesheet'])."',
357
     i.StyleURL = '".db_string($_POST['styleurl'])."',
357
     i.StyleURL = '".db_string($_POST['styleurl'])."',
358
     i.Avatar = '".db_string($_POST['avatar'])."',
358
     i.Avatar = '".db_string($_POST['avatar'])."',
359
-    i.SiteOptions = '".db_string(serialize($Options))."',
359
+    i.SiteOptions = '".db_string(json_encode($Options))."',
360
     i.NotifyOnQuote = '".db_string($Options['NotifyOnQuote'])."',
360
     i.NotifyOnQuote = '".db_string($Options['NotifyOnQuote'])."',
361
     i.Info = '".db_string($_POST['info'])."',
361
     i.Info = '".db_string($_POST['info'])."',
362
     i.InfoTitle = '".db_string($_POST['profile_title'])."',
362
     i.InfoTitle = '".db_string($_POST['profile_title'])."',
364
     i.UnseededAlerts = '$UnseededAlerts',
364
     i.UnseededAlerts = '$UnseededAlerts',
365
     m.Email = '".DBCrypt::encrypt($_POST['email'])."',
365
     m.Email = '".DBCrypt::encrypt($_POST['email'])."',
366
     m.IRCKey = '".db_string($_POST['irckey'])."',
366
     m.IRCKey = '".db_string($_POST['irckey'])."',
367
-    m.Paranoia = '".db_string(serialize($Paranoia))."'";
367
+    m.Paranoia = '".db_string(json_encode($Paranoia))."'";
368
 
368
 
369
 if ($ResetPassword) {
369
 if ($ResetPassword) {
370
   $ChangerIP = db_string(DBCrypt::encrypt($LoggedUser['IP']));
370
   $ChangerIP = db_string(DBCrypt::encrypt($LoggedUser['IP']));

Loading…
Cancel
Save