SD-SimpleDesk

@@ -242,6 +242,10 @@ h3.ticketheader img

 {

 	margin-top: 8px;

 }

+.shd_customfields .input_text

+{

+	width: 85%;

+}

 .shd_ticket_log_expand_container

 {

 	margin-right: 3px;

@@ -304,7 +304,7 @@ $txt['shd_admin_default_state_off'] = 'Not checked';

 $txt['shd_admin_save_custom_field'] = 'Save field';

 $txt['shd_admin_delete_custom_field'] = 'Delete field';

 $txt['shd_admin_cancel_custom_field'] = 'Cancel';

-$txt['shd_admin_delete_custom_field_confirm'] = 'Do you really want to delete this custom field?';

+$txt['shd_admin_delete_custom_field_confirm'] = 'Do you really want to delete this custom field? All values stored for this field will be removed, and there is NO undo function.';

 $txt['shd_admin_custom_field_options'] = 'Options';

 $txt['shd_admin_custom_field_options_desc'] = 'Leave option box blank to remove. Radio button selects default option.';

 $txt['shd_admin_custom_field_no_selected_default'] = 'No selected default';

@@ -197,8 +197,9 @@ function shd_admin_custom_save()

 	checkSession('request');

 	// Deletifyingistuffithingi?

-	if (isset($_REQUEST['delete']))

+	if (isset($_REQUEST['delete']) && !empty($_REQUEST['field']))

 	{

+		$_REQUEST['field'] = (int) $_REQUEST['field'];

 		$smcFunc['db_query']('', '

 			DELETE FROM {db_prefix}helpdesk_custom_fields

 			WHERE id_field = {int:field}',

@@ -207,6 +208,14 @@ function shd_admin_custom_save()

 			)

 		);

+		$smcFunc['db_query']('', '

+			DELETE FROM {db_prefix}helpdesk_custom_fields_values

+			WHERE id_field = {int:field}',

+			array(

+				'field' => $_REQUEST['field'],

+			)

+		);

+

 		// End of the road

 		redirectexit('action=admin;area=helpdesk_customfield;' . $context['session_var'] . '=' . $context['session_id']);

 	}

@@ -75,8 +75,8 @@ function template_shd_custom_field_home()

 							<td>', empty($field['is_first']) ? ('<a href="' . $scripturl . '?action=admin;area=helpdesk_customfield;sa=move;field=' . $field['id_field'] . ';direction=up;' . $context['session_var'] . '=' . $context['session_id'] . '"><img src="' . $settings['default_images_url'] . '/simpledesk/move_up.png" alt="' . $txt['shd_admin_move_up'] . '" title="' . $txt['shd_admin_move_up'] . '" /></a>') : '', '</td>

 							<td>', empty($field['is_last']) ? ('<a href="' . $scripturl . '?action=admin;area=helpdesk_customfield;sa=move;field=' . $field['id_field'] . ';direction=down;' . $context['session_var'] . '=' . $context['session_id'] . '"><img src="' . $settings['default_images_url'] . '/simpledesk/move_down.png" alt="' . $txt['shd_admin_move_down'] . '" title="' . $txt['shd_admin_move_down'] . '" /></a>') : '', '</td>

 							<td>

-								<a href="', $scripturl, '?action=admin;area=helpdesk_customfield;sa=edit;field=', $field['id_field'], ';', $context['session_var'], ';', $context['session_id'], '"><img src="', $settings['default_images_url'], '/simpledesk/edit.png" class="icon" alt="', $txt['shd_ticket_edit'],'" /></a>

-								<a href="', $scripturl, '?action=admin;area=helpdesk_customfield;sa=save;field=', $field['id_field'], ';delete;', $context['session_var'], ';', $context['session_id'], '"><img src="', $settings['default_images_url'], '/simpledesk/delete.png" class="icon" alt="', $txt['shd_ticket_delete'],'" /></a>

+								<a href="', $scripturl, '?action=admin;area=helpdesk_customfield;sa=edit;field=', $field['id_field'], ';', $context['session_var'], '=', $context['session_id'], '"><img src="', $settings['default_images_url'], '/simpledesk/edit.png" class="icon" alt="', $txt['shd_ticket_edit'],'" /></a>

+								<a href="', $scripturl, '?action=admin;area=helpdesk_customfield;sa=save;field=', $field['id_field'], ';delete;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_admin_delete_custom_field_confirm']). ');"><img src="', $settings['default_images_url'], '/simpledesk/delete.png" class="icon" alt="', $txt['shd_ticket_delete'],'" /></a>

 							</td>

 						</tr>';

@@ -178,7 +178,7 @@ function template_ticket_custom_fields()

 			if ($field['type'] == CFIELD_TYPE_TEXT)

 			{

 				echo '

-						<dd><input type="text" name="field-', $field['id'], '" value="', $field['value'], '" size="50" /></dd>';

+						<dd><input type="text" name="field-', $field['id'], '" value="', $field['value'], '" class="input_text" /></dd>';

 			}

 			// Textarea

 			elseif ($field['type'] == CFIELD_TYPE_LARGETEXT)

@@ -226,13 +226,18 @@ function template_ticket_custom_fields()

 			// Last one, radio buttons

 			elseif ($field['type'] == CFIELD_TYPE_RADIO)

 			{

+				echo '

+						<dd>';

 				if (empty($field['is_required']))

 					echo '

-						<dd><input name="field-', $field['id'], '" type="radio" value="0"', $field['value'] == 0 ? ' checked="checked"' : '', ' /> <span>', $txt['shd_no_value'], '</span></dd>';

+							<input name="field-', $field['id'], '" type="radio" value="0"', $field['value'] == 0 ? ' checked="checked"' : '', ' /> <span>', $txt['shd_no_value'], '</span><br />';

 				foreach ($field['options'] as $key => $option)

 					echo '

-						<dd><input name="field-', $field['id'], '" type="radio" value="', $key, '"', $field['value'] == $key ? ' checked="checked"' : '', ' /> <span>', $option, '</span></dd>';

+							<input name="field-', $field['id'], '" type="radio" value="', $key, '"', $field['value'] == $key ? ' checked="checked"' : '', ' /> <span>', $option, '</span><br />';

+

+				echo '

+						</dd>';

 			}

 			// Default to a text input field

 			else