Remove XHTML

Author: iMattPro

controller/mcp_controller.php

@@ -258,7 +258,7 @@ protected function action_delete($cannedmessage_id)
 
 		if ($cannedmessage['is_cat'] && $this->manager->has_children($cannedmessage))
 		{
-			trigger_error($this->language->lang('CANNEDMESSAGE_HAS_CHILDREN_DEL') . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $this->get_main_u_action($cannedmessage['parent_id']) . '">', '</a>'));
+			trigger_error($this->language->lang('CANNEDMESSAGE_HAS_CHILDREN_DEL') . '<br><br>' . $this->language->lang('RETURN_PAGE', '<a href="' . $this->get_main_u_action($cannedmessage['parent_id']) . '">', '</a>'));
 		}
 
 		if (confirm_box(true))
@@ -285,7 +285,7 @@ protected function move_message($direction, $cannedmessage_id)
 
 		if (!$cannedmessage)
 		{
-			trigger_error($this->language->lang('CANNEDMESSAGE_INVALID_ITEM') . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $this->get_main_u_action(0) . '">', '</a>'));
+			trigger_error($this->language->lang('CANNEDMESSAGE_INVALID_ITEM') . '<br><br>' . $this->language->lang('RETURN_PAGE', '<a href="' . $this->get_main_u_action(0) . '">', '</a>'));
 		}
 
 		$result = $this->manager->move_message($cannedmessage_id, $direction);
@@ -355,7 +355,7 @@ protected function page_setup($cannedmessage_data)
 		$has_errors = (bool) count($this->errors);
 		$this->template->assign_vars(array(
 			'S_ERROR'   => $has_errors,
-			'ERROR_MSG' => $has_errors ? implode('<br />', $this->errors) : '',
+			'ERROR_MSG' => $has_errors ? implode('<br>', $this->errors) : '',
 
 			'S_CANNEDMESSAGE_ADD_OR_EDIT'	=> true,
 			'U_ACTION'						=> $u_action,
@@ -413,6 +413,6 @@ protected function success($message, $log_type, $cannedmessage)
 
 		$redirect = $this->get_main_u_action($cannedmessage['parent_id']);
 		meta_refresh(3, $redirect);
-		trigger_error($this->language->lang($message) . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>'));
+		trigger_error($this->language->lang($message) . '<br><br>' . $this->language->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>'));
 	}
 }

language/en/info_acp_cannedmessages.php

@@ -19,9 +19,9 @@
 }
 
 $lang = array_merge($lang, array(
-	'MCP_CANNEDMESSAGE_ADD_LOG'			=> '<strong>Canned Message added</strong><br />» %s',
-	'MCP_CANNEDMESSAGE_EDIT_LOG'		=> '<strong>Canned Message edited</strong><br />» %s',
-	'MCP_CANNEDMESSAGE_DELETE_LOG'		=> '<strong>Canned Message deleted</strong><br />» %s',
+	'MCP_CANNEDMESSAGE_ADD_LOG'			=> '<strong>Canned Message added</strong><br>» %s',
+	'MCP_CANNEDMESSAGE_EDIT_LOG'		=> '<strong>Canned Message edited</strong><br>» %s',
+	'MCP_CANNEDMESSAGE_DELETE_LOG'		=> '<strong>Canned Message deleted</strong><br>» %s',
 	'MCP_CANNEDMESSAGE_MOVE_UP_LOG'		=> '<strong>Moved canned message</strong> %1$s <strong>above</strong> %2$s',
 	'MCP_CANNEDMESSAGE_MOVE_DOWN_LOG'	=> '<strong>Moved canned message</strong> %1$s <strong>below</strong> %2$s',
 ));

styles/prosilver/template/mcp_cannedmessages_manage.html

@@ -22,7 +22,7 @@ <h3>{{ lang('ERROR') }}</h3>
 				<fieldset>
 					<dl>
 						<dt><label for="cannedmessage_name">{{ lang('CANNEDMESSAGE_NAME') ~ lang('COLON') }}</label></dt>
-						<dd><input name="cannedmessage_name" id="cannedmessage_name" type="text" class="inputbox" maxlength="255" value="{{ CANNESMESSAGE_NAME }}" /></dd>
+						<dd><input name="cannedmessage_name" id="cannedmessage_name" type="text" class="inputbox" maxlength="255" value="{{ CANNESMESSAGE_NAME }}"></dd>
 					</dl>
 
 					<dl>
@@ -67,13 +67,13 @@ <h3>{{ lang('ERROR') }}</h3>
 					{% endif %}
 				</fieldset>
 
-				<hr />
+				<hr>
 
 				<fieldset class="submit-buttons">
-					<input type="submit" name="preview" id="preview" value="{{ lang('PREVIEW') }}" class="button1 button button-form"{% if IS_CAT %} style="display: none;"{% endif %} />
-					<input type="submit" name="submit" id="submit" value="{{ lang('SUBMIT') }}" class="button1 button button-form" />
-					<input type="submit" name="cancel" id="cancel" value="{{ lang('CANCEL') }}" class="button1 button button-form" />
-					<input type="hidden" name="action_cancel" id="action_cancel" value="{{ U_ACTION_CANCEL }}" />
+					<input type="submit" name="preview" id="preview" value="{{ lang('PREVIEW') }}" class="button1 button button-form"{% if IS_CAT %} style="display: none;"{% endif %}>
+					<input type="submit" name="submit" id="submit" value="{{ lang('SUBMIT') }}" class="button1 button button-form">
+					<input type="submit" name="cancel" id="cancel" value="{{ lang('CANCEL') }}" class="button1 button button-form">
+					<input type="hidden" name="action_cancel" id="action_cancel" value="{{ U_ACTION_CANCEL }}">
 					{{ S_FORM_TOKEN }}
 				</fieldset>
 			</form>
@@ -135,10 +135,9 @@ <h3>{{ lang('ERROR') }}</h3>
 
 			<form id="cannedmessages" method="post" action="{{ U_ACTION_ADD }}">
 				<fieldset class="quick">
-					<input type="hidden" name="action" value="add" />
-
-					<input type="text" id="cannedmessage_name" name="cannedmessage_name" class="inputbox autowidth" value="" maxlength="255" />
-					<input class="button1 button button-form" id="addmessage" name="addmessage" type="submit" value="{{ lang('CREATE_CANNEDMESSAGE') }}" />
+					<input type="hidden" name="action" value="add">
+					<input type="text" id="cannedmessage_name" name="cannedmessage_name" class="inputbox autowidth" value="" maxlength="255">
+					<input class="button1 button button-form" id="addmessage" name="addmessage" type="submit" value="{{ lang('CREATE_CANNEDMESSAGE') }}">
 					{{ S_FORM_TOKEN }}
 				</fieldset>
 			</form>