Skip to content

Commit

Permalink
Replace all the unserialize with Util::unserialize
Browse files Browse the repository at this point in the history
  • Loading branch information
@emanuele45
emanuele45 committed Jul 11, 2016
1 parent c9bbb4a commit 3604f23
Show file tree
Hide file tree
Showing 35 changed files with 77 additions and 77 deletions.
6 changes: 3 additions & 3 deletions sources/Load.php
View file
Expand Up @@ -123,7 +123,7 @@ function reloadSettings()
// Integration is cool.
if (defined('ELK_INTEGRATION_SETTINGS'))
{
$integration_settings = unserialize(ELK_INTEGRATION_SETTINGS);
$integration_settings = Util::unserialize(ELK_INTEGRATION_SETTINGS);
foreach ($integration_settings as $hook => $function)
add_integration_function($hook, $function);
}
Expand Down Expand Up @@ -1099,7 +1099,7 @@ function loadMemberContext($user, $display_custom_fields = false)
if ($display_custom_fields && !empty($modSettings['displayFields']))
{
if (!isset($context['display_fields']))
$context['display_fields'] = unserialize($modSettings['displayFields']);
$context['display_fields'] = Util::unserialize($modSettings['displayFields']);

foreach ($context['display_fields'] as $custom)
{
Expand Down Expand Up @@ -3172,7 +3172,7 @@ function serializeToJson($variable, $save_callback = null)
// decoding failed, let's try with unserialize
if ($array_form === null)
{
$array_form = @unserialize($variable);
$array_form = Util::unserialize($variable);

// If unserialize fails as well, let's just store an empty array
if ($array_form === false)
Expand Down
8 changes: 4 additions & 4 deletions sources/Subs.php
View file
Expand Up @@ -3161,7 +3161,7 @@ function getAttachmentFilename($filename, $attachment_id, $dir = null, $new = fa
if (!empty($modSettings['currentAttachmentUploadDir']))
{
if (!is_array($modSettings['attachmentUploadDir']))
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
$path = isset($modSettings['attachmentUploadDir'][$dir]) ? $modSettings['attachmentUploadDir'][$dir] : $modSettings['basedirectory_for_attachments'];
}
else
Expand Down Expand Up @@ -4205,7 +4205,7 @@ function prepareSearchEngines()
$engines = array();
if (!empty($modSettings['additional_search_engines']))
{
$search_engines = unserialize($modSettings['additional_search_engines']);
$search_engines = Util::unserialize($modSettings['additional_search_engines']);
foreach ($search_engines as $engine)
$engines[strtolower(preg_replace('~[^A-Za-z0-9 ]~', '', $engine['name']))] = $engine;
}
Expand Down Expand Up @@ -4302,7 +4302,7 @@ function scheduleTaskImmediate($task)
if (!isset($modSettings['scheduleTaskImmediate']))
$scheduleTaskImmediate = array();
else
$scheduleTaskImmediate = unserialize($modSettings['scheduleTaskImmediate']);
$scheduleTaskImmediate = Util::unserialize($modSettings['scheduleTaskImmediate']);

// If it has not been scheduled, the do so now
if (!isset($scheduleTaskImmediate[$task]))
Expand Down Expand Up @@ -4335,7 +4335,7 @@ function removeScheduleTaskImmediate($task, $calculateNextTrigger = true)
if (!isset($modSettings['scheduleTaskImmediate']))
return;
else
$scheduleTaskImmediate = unserialize($modSettings['scheduleTaskImmediate']);
$scheduleTaskImmediate = Util::unserialize($modSettings['scheduleTaskImmediate']);

// Clear / remove the task if it was set
if (isset($scheduleTaskImmediate[$task]))
Expand Down
22 changes: 11 additions & 11 deletions sources/admin/ManageAttachments.controller.php
View file
Expand Up @@ -154,7 +154,7 @@ public function action_attachSettings_display()
if (!empty($_POST['use_subdirectories_for_attachments']) && !empty($modSettings['attachment_basedirectories']))
{
if (!is_array($modSettings['attachment_basedirectories']))
$modSettings['attachment_basedirectories'] = unserialize($modSettings['attachment_basedirectories']);
$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
}
else
$modSettings['attachment_basedirectories'] = array();
Expand Down Expand Up @@ -221,7 +221,7 @@ private function _settings()
require_once(SUBSDIR . '/Attachments.subs.php');

// Get the current attachment directory.
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
$context['attachmentUploadDir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];

// First time here?
Expand Down Expand Up @@ -587,7 +587,7 @@ public function action_maintenance()

$context['attach_multiple_dirs'] = count($attach_dirs) > 1 ? true : false;
$context['attach_dirs'] = $attach_dirs;
$context['base_dirs'] = !empty($modSettings['attachment_basedirectories']) ? unserialize($modSettings['attachment_basedirectories']) : array();
$context['base_dirs'] = !empty($modSettings['attachment_basedirectories']) ? Util::unserialize($modSettings['attachment_basedirectories']) : array();
$context['checked'] = isset($_SESSION['checked']) ? $_SESSION['checked'] : true;
if (!empty($_SESSION['results']))
{
Expand Down Expand Up @@ -917,7 +917,7 @@ public function action_repair()
{
// Just use the current path for temp files.
if (!is_array($modSettings['attachmentUploadDir']))
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
$attach_dirs = $modSettings['attachmentUploadDir'];

$current_check = 0;
Expand Down Expand Up @@ -1006,12 +1006,12 @@ public function action_attachpaths()

// Since this needs to be done eventually.
if (!is_array($modSettings['attachmentUploadDir']))
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);

if (!isset($modSettings['attachment_basedirectories']))
$modSettings['attachment_basedirectories'] = array();
elseif (!is_array($modSettings['attachment_basedirectories']))
$modSettings['attachment_basedirectories'] = unserialize($modSettings['attachment_basedirectories']);
$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);

$errors = array();

Expand Down Expand Up @@ -1093,7 +1093,7 @@ public function action_attachpaths()
'attachment_basedirectories' => serialize($modSettings['attachment_basedirectories']),
'basedirectory_for_attachments' => $base,
));
$modSettings['attachment_basedirectories'] = unserialize($modSettings['attachment_basedirectories']);
$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
}
}

Expand Down Expand Up @@ -1145,7 +1145,7 @@ public function action_attachpaths()
{
unset($modSettings['attachment_basedirectories'][$id]);
updateSettings(array('attachment_basedirectories' => serialize($modSettings['attachment_basedirectories'])));
$modSettings['attachment_basedirectories'] = unserialize($modSettings['attachment_basedirectories']);
$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
}
}
else
Expand Down Expand Up @@ -1178,7 +1178,7 @@ public function action_attachpaths()
if ($_POST['current_dir'] != $modSettings['currentAttachmentUploadDir'] && !empty($modSettings['last_attachments_directory']) && (isset($modSettings['last_attachments_directory'][$_POST['current_dir']]) || isset($modSettings['last_attachments_directory'][0])))
{
if (!is_array($modSettings['last_attachments_directory']))
$modSettings['last_attachments_directory'] = unserialize($modSettings['last_attachments_directory']);
$modSettings['last_attachments_directory'] = Util::unserialize($modSettings['last_attachments_directory']);
$num = substr(strrchr($modSettings['attachmentUploadDir'][$_POST['current_dir']], '_'), 1);

if (is_numeric($num))
Expand Down Expand Up @@ -1529,9 +1529,9 @@ public function action_transfer()
require_once(SUBSDIR . '/ManageAttachments.subs.php');

// The list(s) of directory's that are available.
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
if (!empty($modSettings['attachment_basedirectories']))
$modSettings['attachment_basedirectories'] = unserialize($modSettings['attachment_basedirectories']);
$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
else
$modSettings['basedirectory_for_attachments'] = array();

Expand Down
2 changes: 1 addition & 1 deletion sources/admin/ManageMaillist.controller.php
View file
Expand Up @@ -1444,7 +1444,7 @@ public function action_settings()

// Load any existing email => board values used for new topic creation
$context['maillist_from_to_board'] = array();
$data = (!empty($modSettings['maillist_receiving_address'])) ? unserialize($modSettings['maillist_receiving_address']) : array();
$data = (!empty($modSettings['maillist_receiving_address'])) ? Util::unserialize($modSettings['maillist_receiving_address']) : array();
foreach ($data as $key => $addr)
{
$context['maillist_from_to_board'][$key] = array(
Expand Down
4 changes: 2 additions & 2 deletions sources/admin/ManagePaid.controller.php
View file
Expand Up @@ -966,14 +966,14 @@ public function action_modifyuser()
$context['pending_payments'] = array();
if (!empty($row['pending_details']))
{
$pending_details = @unserialize($row['pending_details']);
$pending_details = Util::unserialize($row['pending_details']);
foreach ($pending_details as $id => $pending)
{
// Only this type need be displayed.
if ($pending[3] == 'payback')
{
// Work out what the options were.
$costs = @unserialize($context['current_subscription']['real_cost']);
$costs = Util::unserialize($context['current_subscription']['real_cost']);

if ($context['current_subscription']['real_length'] == 'F')
{
Expand Down
4 changes: 2 additions & 2 deletions sources/admin/ManageSearch.controller.php
View file
Expand Up @@ -127,7 +127,7 @@ public function action_searchSettings_display()

$context['search_engines'] = array();
if (!empty($modSettings['additional_search_engines']))
$context['search_engines'] = unserialize($modSettings['additional_search_engines']);
$context['search_engines'] = Util::unserialize($modSettings['additional_search_engines']);

for ($count = 0; $count < 3; $count++)
$context['search_engines'][] = array(
Expand Down Expand Up @@ -449,7 +449,7 @@ public function action_create()
// Resume building an index that was not completed
if (isset($_REQUEST['resume']) && !empty($modSettings['search_custom_index_resume']))
{
$context['index_settings'] = unserialize($modSettings['search_custom_index_resume']);
$context['index_settings'] = Util::unserialize($modSettings['search_custom_index_resume']);
$context['start'] = (int) $context['index_settings']['resume_at'];
unset($context['index_settings']['resume_at']);
$context['step'] = 1;
Expand Down
4 changes: 2 additions & 2 deletions sources/admin/ManageSecurity.controller.php
View file
Expand Up @@ -343,10 +343,10 @@ public function action_bbSettings_display()
$context[$list . '_desc'] = array();

if (!empty($modSettings[$list]))
$context[$list] = unserialize($modSettings[$list]);
$context[$list] = Util::unserialize($modSettings[$list]);

if (!empty($modSettings[$list . '_desc']))
$context[$list . '_desc'] = unserialize($modSettings[$list . '_desc']);
$context[$list . '_desc'] = Util::unserialize($modSettings[$list . '_desc']);
}

$config_vars = $this->_bbSettings->settings();
Expand Down
2 changes: 1 addition & 1 deletion sources/admin/ManageThemes.controller.php
View file
Expand Up @@ -1222,7 +1222,7 @@ public function action_install()
}

if (!empty($theme_info_xml['extra']))
$install_info += unserialize($theme_info_xml['extra']);
$install_info += Util::unserialize($theme_info_xml['extra']);
}

if (isset($install_info['based_on']))
Expand Down
2 changes: 1 addition & 1 deletion sources/admin/Packages.controller.php
View file
Expand Up @@ -1680,7 +1680,7 @@ public function action_perms()
unset($context['file_tree'][strtr(BOARDDIR, array('\\' => '/'))]['contents']['attachments']);

if (!is_array($modSettings['attachmentUploadDir']))
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);

// @todo Should we suggest non-current directories be read only?
foreach ($modSettings['attachmentUploadDir'] as $dir)
Expand Down
2 changes: 1 addition & 1 deletion sources/controllers/Draft.controller.php
View file
Expand Up @@ -278,7 +278,7 @@ public function action_showPMDrafts()
'to' => array(),
'bcc' => array(),
);
$recipient_ids = (!empty($row['to_list'])) ? unserialize($row['to_list']) : array();
$recipient_ids = (!empty($row['to_list'])) ? Util::unserialize($row['to_list']) : array();

// Get nice names to show the user, the id's are not that great to see!
if (!empty($recipient_ids['to']) || !empty($recipient_ids['bcc']))
Expand Down
2 changes: 1 addition & 1 deletion sources/controllers/Memberlist.controller.php
View file
Expand Up @@ -241,7 +241,7 @@ public function action_mlall()
{
// Maybe there's something cached already.
if (!empty($modSettings['memberlist_cache']))
$memberlist_cache = @unserialize($modSettings['memberlist_cache']);
$memberlist_cache = Util::unserialize($modSettings['memberlist_cache']);

// The chunk size for the cached index.
$cache_step_size = 500;
Expand Down
2 changes: 1 addition & 1 deletion sources/controllers/Mentions.controller.php
View file
Expand Up @@ -484,7 +484,7 @@ public function prepareMentionMessage(&$mentions, $type)
unset($mentions[$key]);

if (!empty($modSettings['user_access_mentions']))
$modSettings['user_access_mentions'] = @unserialize($modSettings['user_access_mentions']);
$modSettings['user_access_mentions'] = Util::unserialize($modSettings['user_access_mentions']);
else
$modSettings['user_access_mentions'] = array();

Expand Down
2 changes: 1 addition & 1 deletion sources/controllers/ProfileHistory.controller.php
View file
Expand Up @@ -944,7 +944,7 @@ public function list_getProfileEdits($start, $items_per_page, $sort, $memID)
$members = array();
while ($row = $db->fetch_assoc($request))
{
$extra = @unserialize($row['extra']);
$extra = Util::unserialize($row['extra']);
if (!empty($extra['applicator']))
$members[] = $extra['applicator'];

Expand Down
6 changes: 3 additions & 3 deletions sources/controllers/ProfileSubscriptions.controller.php
View file
Expand Up @@ -56,7 +56,7 @@ public function action_subscriptions()
foreach ($context['subscriptions'] as $id => $sub)
{
// Work out the costs.
$costs = @unserialize($sub['real_cost']);
$costs = Util::unserialize($sub['real_cost']);

$cost_array = array();

Expand Down Expand Up @@ -200,7 +200,7 @@ private function _confirmOrder($gateways, $memID)
// What are the details like?
$current_pending = array();
if ($context['current'][$order['id']]['pending_details'] != '')
$current_pending = @unserialize($context['current'][$order['id']]['pending_details']);
$current_pending = Util::unserialize($context['current'][$order['id']]['pending_details']);

// Don't get silly.
if (count($current_pending) > 9)
Expand Down Expand Up @@ -253,7 +253,7 @@ private function _orderDone($memID)
if (isset($context['current'][$sub_id]))
{
// What are the pending details?
$current_pending = @unserialize($context['current'][$sub_id]['pending_details']);
$current_pending = Util::unserialize($context['current'][$sub_id]['pending_details']);

// Nothing pending, nothing to do
if (!empty($current_pending))
Expand Down
2 changes: 1 addition & 1 deletion sources/controllers/Who.controller.php
View file
Expand Up @@ -156,7 +156,7 @@ public function action_who()

foreach ($members as $row)
{
$actions = @unserialize($row['url']);
$actions = Util::unserialize($row['url']);
if ($actions === false)
continue;

Expand Down
2 changes: 1 addition & 1 deletion sources/ext/bad-behavior/badbehavior-plugin.php
View file
Expand Up @@ -256,7 +256,7 @@ function bb2_read_whitelist()
$whitelist[$list] = array();
if (!empty($modSettings[$list]))
{
$whitelist[$list] = unserialize($modSettings[$list]);
$whitelist[$list] = Util::unserialize($modSettings[$list]);
$whitelist[$list] = array_filter($whitelist[$list]);
}
}
Expand Down
16 changes: 8 additions & 8 deletions sources/subs/Attachments.subs.php
View file
Expand Up @@ -66,7 +66,7 @@ function automanage_attachments_check_directory()
if (!empty($modSettings['attachment_basedirectories']) && !empty($modSettings['use_subdirectories_for_attachments']))
{
if (!is_array($modSettings['attachment_basedirectories']))
$modSettings['attachment_basedirectories'] = unserialize($modSettings['attachment_basedirectories']);
$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);

$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
}
Expand All @@ -78,7 +78,7 @@ function automanage_attachments_check_directory()
if (!isset($modSettings['last_attachments_directory']))
$modSettings['last_attachments_directory'] = array();
if (!is_array($modSettings['last_attachments_directory']))
$modSettings['last_attachments_directory'] = unserialize($modSettings['last_attachments_directory']);
$modSettings['last_attachments_directory'] = Util::unserialize($modSettings['last_attachments_directory']);
if (!isset($modSettings['last_attachments_directory'][$base_dir]))
$modSettings['last_attachments_directory'][$base_dir] = 0;
}
Expand Down Expand Up @@ -111,7 +111,7 @@ function automanage_attachments_check_directory()
}

if (!is_array($modSettings['attachmentUploadDir']))
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);

if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir))
$outputCreation = automanage_attachments_create_directory($updir);
Expand Down Expand Up @@ -213,7 +213,7 @@ function automanage_attachments_create_directory($updir)
'attachmentUploadDir' => serialize($modSettings['attachmentUploadDir']),
'currentAttachmentUploadDir' => $modSettings['currentAttachmentUploadDir'],
), true);
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
}

$context['attach_dir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
Expand Down Expand Up @@ -268,7 +268,7 @@ function automanage_attachments_by_space()
'last_attachments_directory' => serialize($modSettings['last_attachments_directory']),
'currentAttachmentUploadDir' => $modSettings['currentAttachmentUploadDir'],
));
$modSettings['last_attachments_directory'] = unserialize($modSettings['last_attachments_directory']);
$modSettings['last_attachments_directory'] = Util::unserialize($modSettings['last_attachments_directory']);

return true;
}
Expand Down Expand Up @@ -359,7 +359,7 @@ function processAttachments($id_msg = null)

if (!is_array($modSettings['attachmentUploadDir']))
{
$attachmentUploadDir = @unserialize($modSettings['attachmentUploadDir']);
$attachmentUploadDir = Util::unserialize($modSettings['attachmentUploadDir']);
if (!empty($attachmentUploadDir))
{
$modSettings['attachmentUploadDir'] = $attachmentUploadDir;
Expand Down Expand Up @@ -1308,7 +1308,7 @@ function getAttachmentPath()
if (empty($modSettings['attachmentUploadDir']))
$attachmentDir = BOARDDIR . '/attachments';
elseif (!empty($modSettings['currentAttachmentUploadDir']) && !is_array($modSettings['attachmentUploadDir']) && (@unserialize($modSettings['attachmentUploadDir']) !== false))
$attachmentDir = unserialize($modSettings['attachmentUploadDir']);
$attachmentDir = Util::unserialize($modSettings['attachmentUploadDir']);
else
$attachmentDir = $modSettings['attachmentUploadDir'];

Expand Down Expand Up @@ -1838,7 +1838,7 @@ function getLegacyAttachmentFilename($filename, $attachment_id, $dir = null, $ne
if (!empty($modSettings['currentAttachmentUploadDir']))
{
if (!is_array($modSettings['attachmentUploadDir']))
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
$path = $modSettings['attachmentUploadDir'][$dir];
}
else
Expand Down
2 changes: 1 addition & 1 deletion sources/subs/Cache.subs.php
View file
Expand Up @@ -293,7 +293,7 @@ function cache_get_data($key, $ttl = 120)
if (function_exists('call_integration_hook') && isset($value))
call_integration_hook('cache_get_data', array($key, $ttl, $value));

return empty($value) ? null : @unserialize($value);
return empty($value) ? null : Util::unserialize($value);
}

/**
Expand Down

0 comments on commit 3604f23

Please sign in to comment.