Convert Serialize usage to JSON (Fixes #20) Rewrote Installer to be cleaner and easier to process changes. Fixed buffer issue (Fixes #27) (ebf0b51) - SD-SimpleDesk

Convert Serialize usage to JSON (Fixes #20) Rewrote Installer to be cleaner and easier to process changes. Fixed buffer issue (Fixes #27)

Parent f33d5b8

jdarwood007 commited on 2016-10-22 20:30:04
Showing 12 changed files, with 304 additions and 117 deletions.

Signed-off-by: jdarwood007 <unmonitored+github@sleepycode.com>

.gitignore d5724e5..3e53cf3
install.php 10f6bef..4ebbbf7
sd_source/SimpleDesk-AdminCustomField.php 28efa49..8193e90
sd_source/SimpleDesk-Display.php 7071319..b9a54d7
sd_source/SimpleDesk-Notifications.php 3c91903..9653517
sd_source/SimpleDesk-Scheduled.php 5493e57..24d9020
sd_source/SimpleDesk-Search.php 3318385..99bae6a
sd_source/SimpleDesk-TicketTopicMove.php 1717b96..3858e81
sd_source/SimpleDesk.php ce1d598..3dbc1ac
sd_source/Subs-SimpleDesk.php efb1f74..4f14027
sd_source/Subs-SimpleDeskAdmin.php 8db7e4f..81206da
sd_source/Subs-SimpleDeskPost.php 25b4eb1..04fb11b

.gitignore

View file @ ebf0b51

...	...	@@ -1,2 +1,8 @@
1		-patch.diff
2		-.git
3	1	\ No newline at end of file
	2	+# SimpleDesk Ignores #
	3	+#####################
	4	+
	5	+# Plugins #
	6	+##########
	7	+sd_plugins_lang/SDPlugin*.php
	8	+sd_plugins_source/*
	9	+css/helpdesk_custom.css

install.php

View file @ ebf0b51

@@ -5,7 +5,7 @@
 #     An advanced help desk modifcation built on SMF      #
 ###########################################################
 #                                                         #
-#       * Copyright 2015 - SimpleDesk.net                 #
+#       * Copyright 2016 - SimpleDesk.net                 #
 #                                                         #
 # This file and its contents are subject to the license   #
 # included with this distribution, license.txt, which     #
@@ -31,7 +31,71 @@
 /**
  *	Before attempting to execute, this file attempts to load SSI.php to enable access to the database functions.
 */
+global $modSettings, $smcFunc, $txt;
+sd_initialize_install();
 
+// Update mod settings if applicable
+foreach (sd_get_install_modSettings() as $new_setting => $new_value)
+{
+	if (empty($modSettings[$new_setting]))
+		updateSettings(array($new_setting => $new_value));
+}
+
+// Create new tables, if any
+foreach (sd_get_install_tables() as $table)
+{
+	$smcFunc['db_create_table']($table['table_name'], $table['columns'], $table['indexes'], $table['parameters'], $table['if_exists'], $table['error']);
+
+	// Because of issues with SMF at least in 2.0 RC5, users coming from older installs may not have all columns as if_exists => update doesn't appear to work.
+	// So, for every column, add it to the columns addition - and let SMF deal with it that way.
+	foreach ($table['columns'] as $table_info)
+		$columns[] = array(
+			'table_name' => $table['table_name'],
+			'column_info' => $table_info,
+			'parameters' => array(),
+			'if_exists' => 'ignore',
+			'error' => 'fatal',
+		);
+}
+
+// Another row we might want to add is package server. Except we may have to remove a pre-existing plugins one, because the version may be wrong.
+$query = $smcFunc['db_query']('', '
+	DELETE FROM {db_prefix}package_servers
+	WHERE url LIKE {string:plugins}',
+	array(
+		'plugins' => 'http://www.simpledesk.net/download%',
+	)
+);
+
+// Create new rows, if any
+foreach (sd_get_install_rows() as $row)
+	$smcFunc['db_insert']($row['method'], $row['table_name'], $row['columns'], $row['data'], $row['keys']);
+
+// Create new columns, if any
+foreach (sd_get_install_columns() as $column)
+	$smcFunc['db_add_column']($column['table_name'], $column['column_info'], $column['parameters'], $column['if_exists'], $column['error']);
+
+// Add integration hooks, if any
+foreach (sd_get_install_hooks() as $hook)
+	add_integration_function($hook['hook'], $hook['function'], $hook['perm'], !isset($hook['file']) ? '' : $hook['file'], !isset($hook['object']) ? false : $hook['object']);
+
+// SimpleDesk specific, after schema changes
+sd_upgrade_create_depts();
+sd_upgrade_recreate_search();
+sd_upgrade_fix_last_updated();
+sd_upgrade_convert_serialize();
+
+// Are we done?
+if (SMF == 'SSI')
+	echo 'Database changes are complete!';
+
+/*
+ * Sets up the installer
+ *
+ * @since 1.0
+*/
+function sd_initialize_install()
+{
 	// If we have found SSI.php and we are outside of SMF, then we are running standalone.
 	if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF'))
 		require_once(dirname(__FILE__) . '/SSI.php');
@@ -39,29 +103,46 @@ elseif (file_exists(getcwd() . '/SSI.php') && !defined('SMF'))
 		require_once(getcwd() . '/SSI.php');
 	elseif (!defined('SMF')) // If we are outside SMF and can't find SSI.php, then throw an error
 		die('<b>Error:</b> Cannot install - please verify you put this file in the same place as SMF\'s SSI.php.');
-elseif (@version_compare(PHP_VERSION, '4.3.0', '<'))
-	die('<b>Error:</b> SimpleDesk 2.0 requires PHP 4.3.0 to be installed on your server.');
+	elseif (@version_compare(PHP_VERSION, '5.3.8', '<'))
+		die('<b>Error:</b> SimpleDesk 2.1 requires PHP 5.3.8 to be installed on your server.');
 
 	if (SMF == 'SSI')
 		db_extend('packages');
 
 	// We have a lot to do. Make sure as best we can that we have the time to do so.
 	@set_time_limit(600);
+}
 
-global $modSettings, $smcFunc, $txt;
-
-// For our BBC settings, we first fetch a list off all BBC tags there are.
+/*
+ * Gets a list of bbc tags, we will use this during the install
+ *
+ * @since 1.0
+*/
+function sd_get_bbc_tags()
+{
 	$bbc_tags = array();
 	foreach (parse_bbc(false) AS $tag)
 		$bbc_tags[] = $tag['tag'];
 
+	return $bbc_tags;
+}
+
+/*
+ * New modSettings
+ *
+ * @since 1.0
+*/
+function sd_get_install_modSettings($getAll = false)
+{
+	global $modSettings;
+
 	// Here we will update the $modSettings variables.
 	$mod_settings = array();
 	$new_settings = array(
 		'shd_attachments_mode' => 'ticket',
 		'shd_staff_badge' => 'nobadge',
 		'shd_ticketnav_style' => 'sd',
-	'shd_enabled_bbc' => implode(',', $bbc_tags),	// By default, all available tags are enabled.
+		'shd_enabled_bbc' => implode(',', sd_get_bbc_tags()),	// By default, all available tags are enabled.
 		'shd_privacy_display' => 'smart',
 		'shd_allow_wikilinks' => 1,
 		'shd_display_ticket_logs' => 1,
@@ -92,13 +173,86 @@ $new_settings = array(
 		'shd_notify_assign_own' => 1,
 	);
 
+	if ($getAll)
+		return $new_settings;
+
 	foreach ($new_settings as $k => $v)
 		if (!isset($modSettings[$k]))
 			$mod_settings[$k] = $v;
-// Anything that shouldn't be set by default won't be in the list. Note that the check is made to isset not empty, because empty values are pre-existing off values, which are not purged from the DB.
 
+	return $mod_settings;
+}
+
+/*
+ * All the rows we need to add.
+ * Anything that shouldn't be set by default won't be in the list. Note that the check is made to isset not empty, because empty values are pre-existing off values, which are not purged from the DB.
+ *
+ * @since 1.0
+*/
+function sd_get_install_rows()
+{
+	$rows = array();
+	$rows[] = array(
+		'method' => 'replace',
+		'table_name' => '{db_prefix}scheduled_tasks',
+		'columns' => array(
+			'next_time' => 'int',
+			'time_offset' => 'int',
+			'time_regularity' => 'int',
+			'time_unit' => 'string',
+			'disabled' => 'int',
+			'task' => 'string',
+		),
+		'data' => array(
+			strtotime('tomorrow'),
+			0,
+			1,
+			'd',
+			0,
+			'simpledesk',
+		),
+		'keys' => array('task'),
+	);
+
+	$rows[] = array(
+		'method' => 'insert',
+		'table_name' => '{db_prefix}package_servers',
+		'columns' => array(
+			'name' => 'string',
+			'url' => 'string',
+		),
+		'data' => array(
+			'SimpleDesk Plugins',
+			'http://www.simpledesk.net/download/plugins/2.0', // !!! This should be updated in later releases!
+		),
+		'keys' => array('id_server'),
+	);
+
+	return $rows;
+}
+
+/*
+ * All the columns we need to add to any existing tables.
+ *
+ * @since 1.0
+*/
+function sd_get_install_columns()
+{
+	$columns = array();
+
+	return $columns;
+}
+
+/*
+ * Gets a list of all the hooks we need during install
+ *
+ * @since 1.0
+*/
+function sd_get_install_hooks()
+{
 	// Hook references to be added.
 	$hooks = array();
+
 	// SMF Core stuff
 	$hooks[] = array(
 		'hook' => 'integrate_pre_include',
@@ -264,11 +423,23 @@ $hooks = array();
 	// Other
 	$hooks[] = array(
 		'hook' => 'integrate_SSI',
-		'function' => 'ssi_shd_called',
+		'function' => false,
 		'file' => '$sourcedir/sd_source/SimpleDesk-SSI.php',
 		'perm' => true,
 	);
 
+	return $hooks;
+}
+
+/*
+ * Gets a list of all the tables we need to install SimpleDesk
+ *
+ * @since 1.0
+*/
+function sd_get_install_tables()
+{
+	global $modSettings;
+
 	// Now, we move on to adding new tables to the database.
 	$tables = array();
 	$tables[] = array(
@@ -352,7 +523,7 @@ $tables[] = array(
 			db_field('action', 'varchar', 30), // defines the message to use
 			db_field('id_ticket', 'mediumint'), // ticket it applies to
 			db_field('id_msg', 'int'), // msg it applies to
-		db_field('extra', 'mediumtext') // serialised array of params for log message
+			db_field('extra', 'mediumtext') // json array of params for log message
 		),
 		'indexes' => array(
 			array(
@@ -697,94 +868,21 @@ $tables[] = array(
 		'parameters' => array(),
 	);
 
-// Oh joy, we've now made it to extra rows...
-$rows = array();
-$rows[] = array(
-	'method' => 'replace',
-	'table_name' => '{db_prefix}scheduled_tasks',
-	'columns' => array(
-		'next_time' => 'int',
-		'time_offset' => 'int',
-		'time_regularity' => 'int',
-		'time_unit' => 'string',
-		'disabled' => 'int',
-		'task' => 'string',
-	),
-	'data' => array(
-		strtotime('tomorrow'),
-		0,
-		1,
-		'd',
-		0,
-		'simpledesk',
-	),
-	'keys' => array('task'),
-);
-// Another row we might want to add is package server. Except we may have to remove a pre-existing plugins one, because the version may be wrong.
-$query = $smcFunc['db_query']('', '
-	DELETE FROM {db_prefix}package_servers
-	WHERE url LIKE {string:plugins}',
-	array(
-		'plugins' => 'http://www.simpledesk.net/download%',
-	)
-);
-$rows[] = array(
-	'method' => 'insert',
-	'table_name' => '{db_prefix}package_servers',
-	'columns' => array(
-		'name' => 'string',
-		'url' => 'string',
-	),
-	'data' => array(
-		'SimpleDesk Plugins',
-		'http://www.simpledesk.net/download/plugins/2.0', // !!! This should be updated in later releases!
-	),
-	'keys' => array('id_server'),
-);
-
-// Now we can add a new column to an existing table
-$columns = array();
-
-// Update mod settings if applicable
-foreach ($mod_settings as $new_setting => $new_value)
-{
-	if (empty($modSettings[$new_setting]))
-		updateSettings(array($new_setting => $new_value));
+	return $tables;
 }
 
-// Create new tables, if any
-foreach ($tables as $table)
+/*
+ * If this is an upgraded 1.0 installation, we won't have any departments. Make sure we create one, if possible using the right language strings
+ *
+ * @since 2.0
+*/
+function sd_upgrade_create_depts()
 {
-	$smcFunc['db_create_table']($table['table_name'], $table['columns'], $table['indexes'], $table['parameters'], $table['if_exists'], $table['error']);
-
-	// Because of issues with SMF at least in 2.0 RC5, users coming from older installs may not have all columns as if_exists => update doesn't appear to work.
-	// So, for every column, add it to the columns addition - and let SMF deal with it that way.
-	foreach ($table['columns'] as $table_info)
-		$columns[] = array(
-			'table_name' => $table['table_name'],
-			'column_info' => $table_info,
-			'parameters' => array(),
-			'if_exists' => 'ignore',
-			'error' => 'fatal',
-		);
-}
+	global $smcFunc, $txt;
 
-// Create new rows, if any
-foreach ($rows as $row)
-	$smcFunc['db_insert']($row['method'], $row['table_name'], $row['columns'], $row['data'], $row['keys']);
-
-// Create new columns, if any
-foreach ($columns as $column)
-	$smcFunc['db_add_column']($column['table_name'], $column['column_info'], $column['parameters'], $column['if_exists'], $column['error']);
-
-// Add integration hooks, if any
-foreach ($hooks as $hook)
-	add_integration_function($hook['hook'], $hook['function'], $hook['perm'], !isset($hook['file']) ? '' : $hook['file'], !isset($hook['object']) ? false : $hook['object']);
-
-// SimpleDesk specific, after schema changes
-// If this is an upgraded 1.0 installation, we won't have any departments. Make sure we create one, if possible using the right language strings.
 	loadLanguage('SimpleDesk', 'english', false);
 	loadLanguage('SimpleDesk', '', false);
+
 	$query = $smcFunc['db_query']('', 'SELECT COUNT(*) FROM {db_prefix}helpdesk_depts');
 	list($count) = $smcFunc['db_fetch_row']($query);
 	$smcFunc['db_free_result']($query);
@@ -818,23 +916,43 @@ if (!empty($new_dept))
 			)
 		);
 	}
+}
+
+/*
+ * Recreate the search index
+ *
+ * @since 2.0
+*/
+function sd_upgrade_recreate_search()
+{
+	global $smcFunc;
 
-// Do we need to flag that a new search index is needed? If there are any pre-existing tickets, we will...
 	$query = $smcFunc['db_query']('', 'SELECT COUNT(*) FROM {db_prefix}helpdesk_tickets');
 	list($count) = $smcFunc['db_fetch_row']($query);
 	if (!empty($count))
 		updateSettings(array('shd_new_search_index' => 1));
+}
+
+/*
+ * If we're updating an existing install, we need to make sure there is a normalised value in the last_updated column.
+ *
+ * @since 2.0
+*/
+function sd_upgrade_fix_last_updated()
+{
+	global $smcFunc;
 
-// If we're updating an existing install, we need to make sure there is a normalised value in the last_updated column.
 	$smcFunc['db_query']('', '
 	UPDATE {db_prefix}helpdesk_tickets AS hdt, {db_prefix}helpdesk_ticket_replies AS hdtr
 	SET hdt.last_updated = hdtr.poster_time
 	WHERE hdt.id_last_msg = hdtr.id_msg AND hdt.last_updated = 0');
+}
 
-// Are we done?
-if (SMF == 'SSI')
-	echo 'Database changes are complete!';
-
+/*
+ * Calculates the proper settings to use in a column.
+ *
+ * @since 1.0
+*/
 function db_field($name, $type, $size = 0, $unsigned = true, $auto = false)
 {
 	$fields = array(
@@ -901,3 +1019,71 @@ function db_field($name, $type, $size = 0, $unsigned = true, $auto = false)
 
 	return $field;
 }
+
+/*
+ * Converts Seralized to JSON
+*/
+function sd_upgrade_convert_serialize()
+{
+	global $smcFunc;
+
+	$seralizeSettings = array();
+
+	// The log actions.
+	$seralizeSettings[] = array(
+		'table' => 'helpdesk_log_action',
+		'id' => 'id_action',
+		'column' => 'extra',
+	);
+
+	// The log actions.
+	$seralizeSettings[] = array(
+		'table' => 'helpdesk_custom_fields',
+		'id' => 'id_field',
+		'column' => 'field_options',
+	);
+
+
+	// Run the upgrader.
+	foreach ($seralizeSettings as $tempID => $data)
+	{
+		$request = $smcFunc['db_query']('', '
+			SELECT {raw:idColumn} AS rowID, {raw:valueColumn} AS rowValue
+			FROM {db_prefix}{raw:table}
+			WHERE {raw:valueColumn} LIKE {string:findSerialize} AND {raw:valueColumn} NOT LIKE {string:findJSON}',
+				array(
+					'idColumn' => $data['id'],
+					'valueColumn' => $data['column'],
+					'table' => $data['table'],
+					'findSerialize' => 'a:%',
+					'findJSON' => '{%',
+				)
+		);
+		while ($row = $smcFunc['db_fetch_assoc']($request))
+		{
+			$temp = @safe_unserialize($row['rowValue']);
+
+			if ($temp !== false)
+			{
+				$newValue = json_encode($temp);
+
+				$smcFunc['db_query']('', '
+					UPDATE {db_prefix}{raw:table}
+					SET {raw:valueColumn} = {string:rowValue}
+					WHERE {raw:idColumn} = {int:rowID}',
+					array(
+						'table' => $data['table'],
+
+						'valueColumn' => $data['column'],
+						'rowValue' => $newValue,
+
+						'idColumn' => $data['id'],
+						'rowID' => $row['rowID'],
+					)
+				);
+			}
+		}
+		$smcFunc['db_free_result']($request);
+
+	}
+}
\ No newline at end of file

sd_source/SimpleDesk-AdminCustomField.php

View file @ ebf0b51

@@ -170,7 +170,7 @@ function shd_admin_custom_edit()
 		$context['section_desc'] = $txt['shd_admin_edit_custom_field_desc'];
 		$context['page_title'] = $txt['shd_admin_edit_custom_field'];
 		$context['sub_template'] = 'shd_custom_field_edit';
-		$context['custom_field']['options'] = !empty($row['field_options']) ? unserialize($row['field_options']) : array(1 => '', '', '');
+		$context['custom_field']['options'] = !empty($row['field_options']) ? smf_json_decode($row['field_options'], true) : array(1 => '', '', '');
 		if (empty($context['custom_field']['options']['inactive']))
 			$context['custom_field']['options']['inactive'] = array();
 
@@ -392,7 +392,7 @@ function shd_admin_custom_save()
 			if (isset($_POST['default_select']) && $_POST['default_select'] == $k)
 				$_POST['default_check'] = $k;
 		}
-		$options = serialize($newOptions);
+		$options = json_encode($newOptions);
 	}
 
 	// Sort out the default selection if it's a multi-select, as well as required amounts
@@ -503,7 +503,7 @@ function shd_admin_custom_save()
 		// Depending on the field type, we may need to be funky about overlaying things, hence grabbing the old options.
 		if (!empty($row['field_options']) && in_array($row['field_type'], array(CFIELD_TYPE_SELECT, CFIELD_TYPE_RADIO, CFIELD_TYPE_MULTI)))
 		{
-			$row['field_options'] = unserialize($row['field_options']);
+			$row['field_options'] = smf_json_decode($row['field_options'], true);
 			ksort($row['field_options']);
 			ksort($newOptions);
 			$inactive = array();
@@ -521,7 +521,7 @@ function shd_admin_custom_save()
 			foreach ($newOptions as $k => $v)
 				$new_fields[$k] = $v;
 			$new_fields['inactive'] = $inactive;
-			$options = serialize($new_fields);
+			$options = json_encode($new_fields);
 		}
 
 		shd_db_query('', '

sd_source/SimpleDesk-Display.php

View file @ ebf0b51

@@ -400,7 +400,7 @@ function shd_view_ticket()
 			'icon' => $row['icon'],
 			'type' => $row['field_type'],
 			'default_value' => $row['field_type'] == CFIELD_TYPE_LARGETEXT ? explode(',', $row['default_value']) : $row['default_value'],
-			'options' => !empty($row['field_options']) ? unserialize($row['field_options']) : array(),
+			'options' => !empty($row['field_options']) ? smf_json_decode($row['field_options'], true) : array(),
 			'display_empty' => !empty($row['required']) ? true : !empty($row['display_empty']), // Required and "selection" fields will always be displayed.
 			'bbc' => !empty($row['bbc']) && ($row['field_type'] == CFIELD_TYPE_TEXT || $row['field_type'] == CFIELD_TYPE_LARGETEXT) && $row['placement'] != CFIELD_PLACE_PREFIX,
 			'editable' => !empty($editable),

sd_source/SimpleDesk-Notifications.php

View file @ ebf0b51

@@ -461,7 +461,7 @@ function shd_notify_users($notify_data)
 				'log_time' => 'int', 'id_member' => 'int', 'ip' => 'string-16', 'action' => 'string', 'id_ticket' => 'int', 'id_msg' => 'int', 'extra' => 'string-65534',
 			),
 			array(
-				time(), 0, '', 'notify', $notify_data['ticket'], !empty($notify_data['msg']) ? $notify_data['msg'] : 0, serialize($log),
+				time(), 0, '', 'notify', $notify_data['ticket'], !empty($notify_data['msg']) ? $notify_data['msg'] : 0, json_encode($log),
 			),
 			array('id_action')
 		);
@@ -506,7 +506,7 @@ function shd_notify_popup()
 	$row = $smcFunc['db_fetch_assoc']($query);
 	$smcFunc['db_free_result']($query);
 
-	$row['extra'] = unserialize($row['extra']);
+	$row['extra'] = smf_json_decode($row['extra'], true);
 
 	// Just check we did actually log an email of that type.
 	if (empty($row['extra']['emails'][$_GET['template']]))

sd_source/SimpleDesk-Scheduled.php

View file @ ebf0b51

@@ -109,7 +109,7 @@ function shd_scheduled_close_tickets()
 					'autoclose', // action
 					$ticket, // id_ticket
 					0, // id_msg
-					serialize(array(
+					json_encode(array(
 						'subject' => $subjects[$ticket],
 						'auto' => true, // indicate to the action log that this is the case
 					)),

sd_source/SimpleDesk-Search.php

View file @ ebf0b51

@@ -228,11 +228,11 @@ function shd_search2()
 		spamProtection('search');
 	else
 	{
-		list($temp_clauses, $temp_params, $temp_terms) = unserialize($_SESSION['lastsearch']);
+		list($temp_clauses, $temp_params, $temp_terms) = smf_json_decode($_SESSION['lastsearch'], true);
 		if ($temp_clauses != $context['search_clauses'] || $temp_params != $context['search_params'] || $temp_terms != $context['search_terms'])
 			spamProtection('search');
 	}
-	$_SESSION['lastsearch'] = serialize(array($context['search_clauses'], $context['search_params'], $context['search_terms']));
+	$_SESSION['lastsearch'] = json_encode(array($context['search_clauses'], $context['search_params'], $context['search_terms']));
 
 	$context['search_params']['start'] = ($context['pagenum'] - 1) * $number_per_page;
 	$context['search_params']['limit'] = $number_per_page;

sd_source/SimpleDesk-TicketTopicMove.php

View file @ ebf0b51

@@ -388,7 +388,7 @@ function shd_tickettotopic2()
 			'name' => $row['field_name'],
 			'type' => $row['field_type'],
 			'bbc' => !empty($row['bbc']),
-			'options' => !empty($row['field_options']) ? unserialize($row['field_options']) : array(),
+			'options' => !empty($row['field_options']) ? smf_json_decode($row['field_options'], true) : array(),
 			'placement' => $row['placement'],
 			'visible' => array(
 				'user' => $user_see,

sd_source/SimpleDesk.php

View file @ ebf0b51

@@ -1150,7 +1150,7 @@ function shd_helpdesk_listing()
 		{
 			if (!empty($row['field_options']))
 			{
-				$row['field_options'] = unserialize($row['field_options']);
+				$row['field_options'] = smf_json_decode($row['field_options'], true);
 				if (isset($row['field_options']['inactive']))
 					unset($row['field_options']['inactive']);
 				foreach ($row['field_options'] as $k => $v)

sd_source/Subs-SimpleDesk.php

View file @ ebf0b51

@@ -528,7 +528,7 @@ function shd_log_action($action, $params, $do_last_update = true)
 			'log_time' => 'int', 'id_member' => 'int', 'ip' => 'string-16', 'action' => 'string', 'id_ticket' => 'int', 'id_msg' => 'int', 'extra' => 'string-65534',
 		),
 		array(
-			time(), $user_info['id'], $user_info['ip'], $action, $ticket_id, $msg_id, serialize($params),
+			time(), $user_info['id'], $user_info['ip'], $action, $ticket_id, $msg_id, json_encode($params),
 		),
 		array('id_action')
 	);
@@ -1668,7 +1668,7 @@ function shd_init_actions(&$actionArray)
  *
  *	@since 2.0
 */
-function shd_buffer_replace(&$buffer)
+function shd_buffer_replace($buffer)
 {
 	global $modSettings, $context;
 

sd_source/Subs-SimpleDeskAdmin.php

View file @ ebf0b51

@@ -114,7 +114,7 @@ function shd_load_action_log_entries($start = 0, $items_per_page = 10, $sort = '
 	$notify_members = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		$row['extra'] = @unserialize($row['extra']);
+		$row['extra'] = smf_json_decode($row['extra'], true);
 		$row['extra'] = is_array($row['extra']) ? $row['extra'] : array();
 
 		// Uhoh, we don't know who this is! Check it's not automatically by the system. If it is... mark it so.
@@ -188,7 +188,7 @@ function shd_load_action_log_entries($start = 0, $items_per_page = 10, $sort = '
 		// Notifications are pretty tricky. So let's take care of all of it at once, and skip the rest if we're doing that.
 		if ($action['action'] == 'notify' && isset($action['extra']['emails']))
 		{
-			// Because this could be a lot of people etc., we compact its storage heavily compared to a conventional serialize().
+			// Because this could be a lot of people etc., we compact its storage heavily compared to a conventional smf_json_decode().
 			// See shd_notify_users in SimpleDesk-Notifications.php for what this is.
 
 			// Now we have all the usernames for this instance, let's go and build this entry.

sd_source/Subs-SimpleDeskPost.php

View file @ ebf0b51

@@ -812,7 +812,7 @@ function shd_load_custom_fields($is_ticket = true, $ticketContext = 0, $dept = 0
 				'name' => $row['field_name'],
 				'desc' => parse_bbc($row['field_desc'], false),
 				'icon' => $row['icon'],
-				'options' => !empty($row['field_options']) ? unserialize($row['field_options']) : array(),
+				'options' => !empty($row['field_options']) ? smf_json_decode($row['field_options'], true) : array(),
 				'type' => $row['field_type'],
 				'default_value' => $row['field_type'] == CFIELD_TYPE_LARGETEXT ? explode(',', $row['default_value']) : $row['default_value'],
 				'display_empty' => !empty($row['required']) ? 1 : $row['display_empty'], // Required and "selection" fields will always be displayed.


...	...	@@ -228,11 +228,11 @@ function shd_search2()
228	228	spamProtection('search');
229	229	else
230	230	{
231		- list($temp_clauses, $temp_params, $temp_terms) = unserialize($_SESSION['lastsearch']);
	231	+ list($temp_clauses, $temp_params, $temp_terms) = smf_json_decode($_SESSION['lastsearch'], true);
232	232	if ($temp_clauses != $context['search_clauses'] \|\| $temp_params != $context['search_params'] \|\| $temp_terms != $context['search_terms'])
233	233	spamProtection('search');
234	234	}
235		- $_SESSION['lastsearch'] = serialize(array($context['search_clauses'], $context['search_params'], $context['search_terms']));
	235	+ $_SESSION['lastsearch'] = json_encode(array($context['search_clauses'], $context['search_params'], $context['search_terms']));
236	236
237	237	$context['search_params']['start'] = ($context['pagenum'] - 1) * $number_per_page;
238	238	$context['search_params']['limit'] = $number_per_page;

...	...	@@ -1150,7 +1150,7 @@ function shd_helpdesk_listing()
1150	1150	{
1151	1151	if (!empty($row['field_options']))
1152	1152	{
1153		- $row['field_options'] = unserialize($row['field_options']);
	1153	+ $row['field_options'] = smf_json_decode($row['field_options'], true);
1154	1154	if (isset($row['field_options']['inactive']))
1155	1155	unset($row['field_options']['inactive']);
1156	1156	foreach ($row['field_options'] as $k => $v)

...	...	@@ -5,7 +5,7 @@
5	5	# An advanced help desk modifcation built on SMF #
6	6	###########################################################
7	7	# #
8		-# * Copyright 2015 - SimpleDesk.net #
	8	+# * Copyright 2016 - SimpleDesk.net #
9	9	# #
10	10	# This file and its contents are subject to the license #
11	11	# included with this distribution, license.txt, which #
...	...	@@ -31,7 +31,71 @@
31	31	/**
32	32	* Before attempting to execute, this file attempts to load SSI.php to enable access to the database functions.
33	33	*/
	34	+global $modSettings, $smcFunc, $txt;
	35	+sd_initialize_install();
34	36
	37	+// Update mod settings if applicable
	38	+foreach (sd_get_install_modSettings() as $new_setting => $new_value)
	39	+{
	40	+ if (empty($modSettings[$new_setting]))
	41	+ updateSettings(array($new_setting => $new_value));
	42	+}
	43	+
	44	+// Create new tables, if any
	45	+foreach (sd_get_install_tables() as $table)
	46	+{
	47	+ $smcFunc['db_create_table']($table['table_name'], $table['columns'], $table['indexes'], $table['parameters'], $table['if_exists'], $table['error']);
	48	+
	49	+ // Because of issues with SMF at least in 2.0 RC5, users coming from older installs may not have all columns as if_exists => update doesn't appear to work.
	50	+ // So, for every column, add it to the columns addition - and let SMF deal with it that way.
	51	+ foreach ($table['columns'] as $table_info)
	52	+ $columns[] = array(
	53	+ 'table_name' => $table['table_name'],
	54	+ 'column_info' => $table_info,
	55	+ 'parameters' => array(),
	56	+ 'if_exists' => 'ignore',
	57	+ 'error' => 'fatal',
	58	+ );
	59	+}
	60	+
	61	+// Another row we might want to add is package server. Except we may have to remove a pre-existing plugins one, because the version may be wrong.
	62	+$query = $smcFunc['db_query']('', '
	63	+ DELETE FROM {db_prefix}package_servers
	64	+ WHERE url LIKE {string:plugins}',
	65	+ array(
	66	+ 'plugins' => 'http://www.simpledesk.net/download%',
	67	+ )
	68	+);
	69	+
	70	+// Create new rows, if any
	71	+foreach (sd_get_install_rows() as $row)
	72	+ $smcFunc['db_insert']($row['method'], $row['table_name'], $row['columns'], $row['data'], $row['keys']);
	73	+
	74	+// Create new columns, if any
	75	+foreach (sd_get_install_columns() as $column)
	76	+ $smcFunc['db_add_column']($column['table_name'], $column['column_info'], $column['parameters'], $column['if_exists'], $column['error']);
	77	+
	78	+// Add integration hooks, if any
	79	+foreach (sd_get_install_hooks() as $hook)
	80	+ add_integration_function($hook['hook'], $hook['function'], $hook['perm'], !isset($hook['file']) ? '' : $hook['file'], !isset($hook['object']) ? false : $hook['object']);
	81	+
	82	+// SimpleDesk specific, after schema changes
	83	+sd_upgrade_create_depts();
	84	+sd_upgrade_recreate_search();
	85	+sd_upgrade_fix_last_updated();
	86	+sd_upgrade_convert_serialize();
	87	+
	88	+// Are we done?
	89	+if (SMF == 'SSI')
	90	+ echo 'Database changes are complete!';
	91	+
	92	+/*
	93	+ * Sets up the installer
	94	+ *
	95	+ * @since 1.0
	96	+*/
	97	+function sd_initialize_install()
	98	+{
35	99	// If we have found SSI.php and we are outside of SMF, then we are running standalone.
36	100	if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF'))
37	101	require_once(dirname(__FILE__) . '/SSI.php');
...	...	@@ -39,29 +103,46 @@ elseif (file_exists(getcwd() . '/SSI.php') && !defined('SMF'))
39	103	require_once(getcwd() . '/SSI.php');
40	104	elseif (!defined('SMF')) // If we are outside SMF and can't find SSI.php, then throw an error
41	105	die('<b>Error:</b> Cannot install - please verify you put this file in the same place as SMF\'s SSI.php.');
42		-elseif (@version_compare(PHP_VERSION, '4.3.0', '<'))
43		- die('<b>Error:</b> SimpleDesk 2.0 requires PHP 4.3.0 to be installed on your server.');
	106	+ elseif (@version_compare(PHP_VERSION, '5.3.8', '<'))
	107	+ die('<b>Error:</b> SimpleDesk 2.1 requires PHP 5.3.8 to be installed on your server.');
44	108
45	109	if (SMF == 'SSI')
46	110	db_extend('packages');
47	111
48	112	// We have a lot to do. Make sure as best we can that we have the time to do so.
49	113	@set_time_limit(600);
	114	+}
50	115
51		-global $modSettings, $smcFunc, $txt;
52		-
53		-// For our BBC settings, we first fetch a list off all BBC tags there are.
	116	+/*
	117	+ * Gets a list of bbc tags, we will use this during the install
	118	+ *
	119	+ * @since 1.0
	120	+*/
	121	+function sd_get_bbc_tags()
	122	+{
54	123	$bbc_tags = array();
55	124	foreach (parse_bbc(false) AS $tag)
56	125	$bbc_tags[] = $tag['tag'];
57	126
	127	+ return $bbc_tags;
	128	+}
	129	+
	130	+/*
	131	+ * New modSettings
	132	+ *
	133	+ * @since 1.0
	134	+*/
	135	+function sd_get_install_modSettings($getAll = false)
	136	+{
	137	+ global $modSettings;
	138	+
58	139	// Here we will update the $modSettings variables.
59	140	$mod_settings = array();
60	141	$new_settings = array(
61	142	'shd_attachments_mode' => 'ticket',
62	143	'shd_staff_badge' => 'nobadge',
63	144	'shd_ticketnav_style' => 'sd',
64		- 'shd_enabled_bbc' => implode(',', $bbc_tags), // By default, all available tags are enabled.
	145	+ 'shd_enabled_bbc' => implode(',', sd_get_bbc_tags()), // By default, all available tags are enabled.
65	146	'shd_privacy_display' => 'smart',
66	147	'shd_allow_wikilinks' => 1,
67	148	'shd_display_ticket_logs' => 1,
...	...	@@ -92,13 +173,86 @@ $new_settings = array(
92	173	'shd_notify_assign_own' => 1,
93	174	);
94	175
	176	+ if ($getAll)
	177	+ return $new_settings;
	178	+
95	179	foreach ($new_settings as $k => $v)
96	180	if (!isset($modSettings[$k]))
97	181	$mod_settings[$k] = $v;
98		-// Anything that shouldn't be set by default won't be in the list. Note that the check is made to isset not empty, because empty values are pre-existing off values, which are not purged from the DB.
99	182
	183	+ return $mod_settings;
	184	+}
	185	+
	186	+/*
	187	+ * All the rows we need to add.
	188	+ * Anything that shouldn't be set by default won't be in the list. Note that the check is made to isset not empty, because empty values are pre-existing off values, which are not purged from the DB.
	189	+ *
	190	+ * @since 1.0
	191	+*/
	192	+function sd_get_install_rows()
	193	+{
	194	+ $rows = array();
	195	+ $rows[] = array(
	196	+ 'method' => 'replace',
	197	+ 'table_name' => '{db_prefix}scheduled_tasks',
	198	+ 'columns' => array(
	199	+ 'next_time' => 'int',
	200	+ 'time_offset' => 'int',
	201	+ 'time_regularity' => 'int',
	202	+ 'time_unit' => 'string',
	203	+ 'disabled' => 'int',
	204	+ 'task' => 'string',
	205	+ ),
	206	+ 'data' => array(
	207	+ strtotime('tomorrow'),
	208	+ 0,
	209	+ 1,
	210	+ 'd',
	211	+ 0,
	212	+ 'simpledesk',
	213	+ ),
	214	+ 'keys' => array('task'),
	215	+ );
	216	+
	217	+ $rows[] = array(
	218	+ 'method' => 'insert',
	219	+ 'table_name' => '{db_prefix}package_servers',
	220	+ 'columns' => array(
	221	+ 'name' => 'string',
	222	+ 'url' => 'string',
	223	+ ),
	224	+ 'data' => array(
	225	+ 'SimpleDesk Plugins',
	226	+ 'http://www.simpledesk.net/download/plugins/2.0', // !!! This should be updated in later releases!
	227	+ ),
	228	+ 'keys' => array('id_server'),
	229	+ );
	230	+
	231	+ return $rows;
	232	+}
	233	+
	234	+/*
	235	+ * All the columns we need to add to any existing tables.
	236	+ *
	237	+ * @since 1.0
	238	+*/
	239	+function sd_get_install_columns()
	240	+{
	241	+ $columns = array();
	242	+
	243	+ return $columns;
	244	+}
	245	+
	246	+/*
	247	+ * Gets a list of all the hooks we need during install
	248	+ *
	249	+ * @since 1.0
	250	+*/
	251	+function sd_get_install_hooks()
	252	+{
100	253	// Hook references to be added.
101	254	$hooks = array();
	255	+
102	256	// SMF Core stuff
103	257	$hooks[] = array(
104	258	'hook' => 'integrate_pre_include',
...	...	@@ -264,11 +423,23 @@ $hooks = array();
264	423	// Other
265	424	$hooks[] = array(
266	425	'hook' => 'integrate_SSI',
267		- 'function' => 'ssi_shd_called',
	426	+ 'function' => false,
268	427	'file' => '$sourcedir/sd_source/SimpleDesk-SSI.php',
269	428	'perm' => true,
270	429	);
271	430
	431	+ return $hooks;
	432	+}
	433	+
	434	+/*
	435	+ * Gets a list of all the tables we need to install SimpleDesk
	436	+ *
	437	+ * @since 1.0
	438	+*/
	439	+function sd_get_install_tables()
	440	+{
	441	+ global $modSettings;
	442	+
272	443	// Now, we move on to adding new tables to the database.
273	444	$tables = array();
274	445	$tables[] = array(
...	...	@@ -352,7 +523,7 @@ $tables[] = array(
352	523	db_field('action', 'varchar', 30), // defines the message to use
353	524	db_field('id_ticket', 'mediumint'), // ticket it applies to
354	525	db_field('id_msg', 'int'), // msg it applies to
355		- db_field('extra', 'mediumtext') // serialised array of params for log message
	526	+ db_field('extra', 'mediumtext') // json array of params for log message
356	527	),
357	528	'indexes' => array(
358	529	array(
...	...	@@ -697,94 +868,21 @@ $tables[] = array(
697	868	'parameters' => array(),
698	869	);
699	870
700		-// Oh joy, we've now made it to extra rows...
701		-$rows = array();
702		-$rows[] = array(
703		- 'method' => 'replace',
704		- 'table_name' => '{db_prefix}scheduled_tasks',
705		- 'columns' => array(
706		- 'next_time' => 'int',
707		- 'time_offset' => 'int',
708		- 'time_regularity' => 'int',
709		- 'time_unit' => 'string',
710		- 'disabled' => 'int',
711		- 'task' => 'string',
712		- ),
713		- 'data' => array(
714		- strtotime('tomorrow'),
715		- 0,
716		- 1,
717		- 'd',
718		- 0,
719		- 'simpledesk',
720		- ),
721		- 'keys' => array('task'),
722		-);
723		-// Another row we might want to add is package server. Except we may have to remove a pre-existing plugins one, because the version may be wrong.
724		-$query = $smcFunc['db_query']('', '
725		- DELETE FROM {db_prefix}package_servers
726		- WHERE url LIKE {string:plugins}',
727		- array(
728		- 'plugins' => 'http://www.simpledesk.net/download%',
729		- )
730		-);
731		-$rows[] = array(
732		- 'method' => 'insert',
733		- 'table_name' => '{db_prefix}package_servers',
734		- 'columns' => array(
735		- 'name' => 'string',
736		- 'url' => 'string',
737		- ),
738		- 'data' => array(
739		- 'SimpleDesk Plugins',
740		- 'http://www.simpledesk.net/download/plugins/2.0', // !!! This should be updated in later releases!
741		- ),
742		- 'keys' => array('id_server'),
743		-);
744		-
745		-// Now we can add a new column to an existing table
746		-$columns = array();
747		-
748		-// Update mod settings if applicable
749		-foreach ($mod_settings as $new_setting => $new_value)
750		-{
751		- if (empty($modSettings[$new_setting]))
752		- updateSettings(array($new_setting => $new_value));
	871	+ return $tables;
753	872	}
754	873
755		-// Create new tables, if any
756		-foreach ($tables as $table)
	874	+/*
	875	+ * If this is an upgraded 1.0 installation, we won't have any departments. Make sure we create one, if possible using the right language strings
	876	+ *
	877	+ * @since 2.0
	878	+*/
	879	+function sd_upgrade_create_depts()
757	880	{
758		- $smcFunc['db_create_table']($table['table_name'], $table['columns'], $table['indexes'], $table['parameters'], $table['if_exists'], $table['error']);
759		-
760		- // Because of issues with SMF at least in 2.0 RC5, users coming from older installs may not have all columns as if_exists => update doesn't appear to work.
761		- // So, for every column, add it to the columns addition - and let SMF deal with it that way.
762		- foreach ($table['columns'] as $table_info)
763		- $columns[] = array(
764		- 'table_name' => $table['table_name'],
765		- 'column_info' => $table_info,
766		- 'parameters' => array(),
767		- 'if_exists' => 'ignore',
768		- 'error' => 'fatal',
769		- );
770		-}
	881	+ global $smcFunc, $txt;
771	882
772		-// Create new rows, if any
773		-foreach ($rows as $row)
774		- $smcFunc['db_insert']($row['method'], $row['table_name'], $row['columns'], $row['data'], $row['keys']);
775		-
776		-// Create new columns, if any
777		-foreach ($columns as $column)
778		- $smcFunc['db_add_column']($column['table_name'], $column['column_info'], $column['parameters'], $column['if_exists'], $column['error']);
779		-
780		-// Add integration hooks, if any
781		-foreach ($hooks as $hook)
782		- add_integration_function($hook['hook'], $hook['function'], $hook['perm'], !isset($hook['file']) ? '' : $hook['file'], !isset($hook['object']) ? false : $hook['object']);
783		-
784		-// SimpleDesk specific, after schema changes
785		-// If this is an upgraded 1.0 installation, we won't have any departments. Make sure we create one, if possible using the right language strings.
786	883	loadLanguage('SimpleDesk', 'english', false);
787	884	loadLanguage('SimpleDesk', '', false);
	885	+
788	886	$query = $smcFunc['db_query']('', 'SELECT COUNT(*) FROM {db_prefix}helpdesk_depts');
789	887	list($count) = $smcFunc['db_fetch_row']($query);
790	888	$smcFunc['db_free_result']($query);
...	...	@@ -818,23 +916,43 @@ if (!empty($new_dept))
818	916	)
819	917	);
820	918	}
	919	+}
	920	+
	921	+/*
	922	+ * Recreate the search index
	923	+ *
	924	+ * @since 2.0
	925	+*/
	926	+function sd_upgrade_recreate_search()
	927	+{
	928	+ global $smcFunc;
821	929
822		-// Do we need to flag that a new search index is needed? If there are any pre-existing tickets, we will...
823	930	$query = $smcFunc['db_query']('', 'SELECT COUNT(*) FROM {db_prefix}helpdesk_tickets');
824	931	list($count) = $smcFunc['db_fetch_row']($query);
825	932	if (!empty($count))
826	933	updateSettings(array('shd_new_search_index' => 1));
	934	+}
	935	+
	936	+/*
	937	+ * If we're updating an existing install, we need to make sure there is a normalised value in the last_updated column.
	938	+ *
	939	+ * @since 2.0
	940	+*/
	941	+function sd_upgrade_fix_last_updated()
	942	+{
	943	+ global $smcFunc;
827	944
828		-// If we're updating an existing install, we need to make sure there is a normalised value in the last_updated column.
829	945	$smcFunc['db_query']('', '
830	946	UPDATE {db_prefix}helpdesk_tickets AS hdt, {db_prefix}helpdesk_ticket_replies AS hdtr
831	947	SET hdt.last_updated = hdtr.poster_time
832	948	WHERE hdt.id_last_msg = hdtr.id_msg AND hdt.last_updated = 0');
	949	+}
833	950
834		-// Are we done?
835		-if (SMF == 'SSI')
836		- echo 'Database changes are complete!';
837		-
	951	+/*
	952	+ * Calculates the proper settings to use in a column.
	953	+ *
	954	+ * @since 1.0
	955	+*/
838	956	function db_field($name, $type, $size = 0, $unsigned = true, $auto = false)
839	957	{
840	958	$fields = array(
...	...	@@ -901,3 +1019,71 @@ function db_field($name, $type, $size = 0, $unsigned = true, $auto = false)
901	1019
902	1020	return $field;
903	1021	}
	1022	+
	1023	+/*
	1024	+ * Converts Seralized to JSON
	1025	+*/
	1026	+function sd_upgrade_convert_serialize()
	1027	+{
	1028	+ global $smcFunc;
	1029	+
	1030	+ $seralizeSettings = array();
	1031	+
	1032	+ // The log actions.
	1033	+ $seralizeSettings[] = array(
	1034	+ 'table' => 'helpdesk_log_action',
	1035	+ 'id' => 'id_action',
	1036	+ 'column' => 'extra',
	1037	+ );
	1038	+
	1039	+ // The log actions.
	1040	+ $seralizeSettings[] = array(
	1041	+ 'table' => 'helpdesk_custom_fields',
	1042	+ 'id' => 'id_field',
	1043	+ 'column' => 'field_options',
	1044	+ );
	1045	+
	1046	+
	1047	+ // Run the upgrader.
	1048	+ foreach ($seralizeSettings as $tempID => $data)
	1049	+ {
	1050	+ $request = $smcFunc['db_query']('', '
	1051	+ SELECT {raw:idColumn} AS rowID, {raw:valueColumn} AS rowValue
	1052	+ FROM {db_prefix}{raw:table}
	1053	+ WHERE {raw:valueColumn} LIKE {string:findSerialize} AND {raw:valueColumn} NOT LIKE {string:findJSON}',
	1054	+ array(
	1055	+ 'idColumn' => $data['id'],
	1056	+ 'valueColumn' => $data['column'],
	1057	+ 'table' => $data['table'],
	1058	+ 'findSerialize' => 'a:%',
	1059	+ 'findJSON' => '{%',
	1060	+ )
	1061	+ );
	1062	+ while ($row = $smcFunc['db_fetch_assoc']($request))
	1063	+ {
	1064	+ $temp = @safe_unserialize($row['rowValue']);
	1065	+
	1066	+ if ($temp !== false)
	1067	+ {
	1068	+ $newValue = json_encode($temp);
	1069	+
	1070	+ $smcFunc['db_query']('', '
	1071	+ UPDATE {db_prefix}{raw:table}
	1072	+ SET {raw:valueColumn} = {string:rowValue}
	1073	+ WHERE {raw:idColumn} = {int:rowID}',
	1074	+ array(
	1075	+ 'table' => $data['table'],
	1076	+
	1077	+ 'valueColumn' => $data['column'],
	1078	+ 'rowValue' => $newValue,
	1079	+
	1080	+ 'idColumn' => $data['id'],
	1081	+ 'rowID' => $row['rowID'],
	1082	+ )
	1083	+ );
	1084	+ }
	1085	+ }
	1086	+ $smcFunc['db_free_result']($request);
	1087	+
	1088	+ }
	1089	+}
904	1090	\ No newline at end of file

...	...	@@ -170,7 +170,7 @@ function shd_admin_custom_edit()
170	170	$context['section_desc'] = $txt['shd_admin_edit_custom_field_desc'];
171	171	$context['page_title'] = $txt['shd_admin_edit_custom_field'];
172	172	$context['sub_template'] = 'shd_custom_field_edit';
173		- $context['custom_field']['options'] = !empty($row['field_options']) ? unserialize($row['field_options']) : array(1 => '', '', '');
	173	+ $context['custom_field']['options'] = !empty($row['field_options']) ? smf_json_decode($row['field_options'], true) : array(1 => '', '', '');
174	174	if (empty($context['custom_field']['options']['inactive']))
175	175	$context['custom_field']['options']['inactive'] = array();
176	176
...	...	@@ -392,7 +392,7 @@ function shd_admin_custom_save()
392	392	if (isset($_POST['default_select']) && $_POST['default_select'] == $k)
393	393	$_POST['default_check'] = $k;
394	394	}
395		- $options = serialize($newOptions);
	395	+ $options = json_encode($newOptions);
396	396	}
397	397
398	398	// Sort out the default selection if it's a multi-select, as well as required amounts
...	...	@@ -503,7 +503,7 @@ function shd_admin_custom_save()
503	503	// Depending on the field type, we may need to be funky about overlaying things, hence grabbing the old options.
504	504	if (!empty($row['field_options']) && in_array($row['field_type'], array(CFIELD_TYPE_SELECT, CFIELD_TYPE_RADIO, CFIELD_TYPE_MULTI)))
505	505	{
506		- $row['field_options'] = unserialize($row['field_options']);
	506	+ $row['field_options'] = smf_json_decode($row['field_options'], true);
507	507	ksort($row['field_options']);
508	508	ksort($newOptions);
509	509	$inactive = array();
...	...	@@ -521,7 +521,7 @@ function shd_admin_custom_save()
521	521	foreach ($newOptions as $k => $v)
522	522	$new_fields[$k] = $v;
523	523	$new_fields['inactive'] = $inactive;
524		- $options = serialize($new_fields);
	524	+ $options = json_encode($new_fields);
525	525	}
526	526
527	527	shd_db_query('', '

...	...	@@ -400,7 +400,7 @@ function shd_view_ticket()
400	400	'icon' => $row['icon'],
401	401	'type' => $row['field_type'],
402	402	'default_value' => $row['field_type'] == CFIELD_TYPE_LARGETEXT ? explode(',', $row['default_value']) : $row['default_value'],
403		- 'options' => !empty($row['field_options']) ? unserialize($row['field_options']) : array(),
	403	+ 'options' => !empty($row['field_options']) ? smf_json_decode($row['field_options'], true) : array(),
404	404	'display_empty' => !empty($row['required']) ? true : !empty($row['display_empty']), // Required and "selection" fields will always be displayed.
405	405	'bbc' => !empty($row['bbc']) && ($row['field_type'] == CFIELD_TYPE_TEXT \|\| $row['field_type'] == CFIELD_TYPE_LARGETEXT) && $row['placement'] != CFIELD_PLACE_PREFIX,
406	406	'editable' => !empty($editable),

...	...	@@ -461,7 +461,7 @@ function shd_notify_users($notify_data)
461	461	'log_time' => 'int', 'id_member' => 'int', 'ip' => 'string-16', 'action' => 'string', 'id_ticket' => 'int', 'id_msg' => 'int', 'extra' => 'string-65534',
462	462	),
463	463	array(
464		- time(), 0, '', 'notify', $notify_data['ticket'], !empty($notify_data['msg']) ? $notify_data['msg'] : 0, serialize($log),
	464	+ time(), 0, '', 'notify', $notify_data['ticket'], !empty($notify_data['msg']) ? $notify_data['msg'] : 0, json_encode($log),
465	465	),
466	466	array('id_action')
467	467	);
...	...	@@ -506,7 +506,7 @@ function shd_notify_popup()
506	506	$row = $smcFunc['db_fetch_assoc']($query);
507	507	$smcFunc['db_free_result']($query);
508	508
509		- $row['extra'] = unserialize($row['extra']);
	509	+ $row['extra'] = smf_json_decode($row['extra'], true);
510	510
511	511	// Just check we did actually log an email of that type.
512	512	if (empty($row['extra']['emails'][$_GET['template']]))

...	...	@@ -109,7 +109,7 @@ function shd_scheduled_close_tickets()
109	109	'autoclose', // action
110	110	$ticket, // id_ticket
111	111	0, // id_msg
112		- serialize(array(
	112	+ json_encode(array(
113	113	'subject' => $subjects[$ticket],
114	114	'auto' => true, // indicate to the action log that this is the case
115	115	)),

...	...	@@ -388,7 +388,7 @@ function shd_tickettotopic2()
388	388	'name' => $row['field_name'],
389	389	'type' => $row['field_type'],
390	390	'bbc' => !empty($row['bbc']),
391		- 'options' => !empty($row['field_options']) ? unserialize($row['field_options']) : array(),
	391	+ 'options' => !empty($row['field_options']) ? smf_json_decode($row['field_options'], true) : array(),
392	392	'placement' => $row['placement'],
393	393	'visible' => array(
394	394	'user' => $user_see,

...	...	@@ -528,7 +528,7 @@ function shd_log_action($action, $params, $do_last_update = true)
528	528	'log_time' => 'int', 'id_member' => 'int', 'ip' => 'string-16', 'action' => 'string', 'id_ticket' => 'int', 'id_msg' => 'int', 'extra' => 'string-65534',
529	529	),
530	530	array(
531		- time(), $user_info['id'], $user_info['ip'], $action, $ticket_id, $msg_id, serialize($params),
	531	+ time(), $user_info['id'], $user_info['ip'], $action, $ticket_id, $msg_id, json_encode($params),
532	532	),
533	533	array('id_action')
534	534	);
...	...	@@ -1668,7 +1668,7 @@ function shd_init_actions(&$actionArray)
1668	1668	*
1669	1669	* @since 2.0
1670	1670	*/
1671		-function shd_buffer_replace(&$buffer)
	1671	+function shd_buffer_replace($buffer)
1672	1672	{
1673	1673	global $modSettings, $context;
1674	1674

...	...	@@ -114,7 +114,7 @@ function shd_load_action_log_entries($start = 0, $items_per_page = 10, $sort = '
114	114	$notify_members = array();
115	115	while ($row = $smcFunc['db_fetch_assoc']($request))
116	116	{
117		- $row['extra'] = @unserialize($row['extra']);
	117	+ $row['extra'] = smf_json_decode($row['extra'], true);
118	118	$row['extra'] = is_array($row['extra']) ? $row['extra'] : array();
119	119
120	120	// Uhoh, we don't know who this is! Check it's not automatically by the system. If it is... mark it so.
...	...	@@ -188,7 +188,7 @@ function shd_load_action_log_entries($start = 0, $items_per_page = 10, $sort = '
188	188	// Notifications are pretty tricky. So let's take care of all of it at once, and skip the rest if we're doing that.
189	189	if ($action['action'] == 'notify' && isset($action['extra']['emails']))
190	190	{
191		- // Because this could be a lot of people etc., we compact its storage heavily compared to a conventional serialize().
	191	+ // Because this could be a lot of people etc., we compact its storage heavily compared to a conventional smf_json_decode().
192	192	// See shd_notify_users in SimpleDesk-Notifications.php for what this is.
193	193
194	194	// Now we have all the usernames for this instance, let's go and build this entry.

...	...	@@ -812,7 +812,7 @@ function shd_load_custom_fields($is_ticket = true, $ticketContext = 0, $dept = 0
812	812	'name' => $row['field_name'],
813	813	'desc' => parse_bbc($row['field_desc'], false),
814	814	'icon' => $row['icon'],
815		- 'options' => !empty($row['field_options']) ? unserialize($row['field_options']) : array(),
	815	+ 'options' => !empty($row['field_options']) ? smf_json_decode($row['field_options'], true) : array(),
816	816	'type' => $row['field_type'],
817	817	'default_value' => $row['field_type'] == CFIELD_TYPE_LARGETEXT ? explode(',', $row['default_value']) : $row['default_value'],
818	818	'display_empty' => !empty($row['required']) ? 1 : $row['display_empty'], // Required and "selection" fields will always be displayed.
819	819