Version 4.3.0

applications/core/modules/admin/customization/emails.php

@@ -48,8 +48,13 @@ class _emails extends \IPS\Dispatcher\Controller
 		$table->quickSearch		= 'template_name';
 		$table->limit			= 100;
 
+		/* Primary Sort */
+		$table->primarySortBy			= 'template_pinned';
+		$table->primarySortDirection	= 'desc';
+
 		/* Default sort options */
 		$table->noSort			= array( 'template_name' );
+		$table->sortBy			= $table->sortBy ?: 'template_id';
 		$table->sortDirection	= $table->sortDirection ?: 'desc';
 
 		$table->quickSearch = function( $val )
@@ -61,7 +66,7 @@ class _emails extends \IPS\Dispatcher\Controller
 			}
 			else
 			{
-				return "`template_name` LIKE '%{$val}%'";
+				return "`template_name` LIKE '%" . \IPS\Db::i()->escape_string( $val ) . "%'";
 			}
 		};
 
@@ -175,11 +180,18 @@ class _emails extends \IPS\Dispatcher\Controller
 		if ( $values = $form->values() )
 		{
 			/* Open XML file */
-			$xml = \IPS\Xml\SimpleXML::loadFile( $values['email_template_file'] );
-
-			if( !count($xml->template) )
+			try
 			{
-				\IPS\Output::i()->error( 'email_template_badform', '1S128/4', 403, '' );
+				$xml = \IPS\Xml\SimpleXML::loadFile( $values['email_template_file'] );
+
+				if( !count($xml->template) )
+				{
+					\IPS\Output::i()->error( 'email_template_badform', '1S128/4', 403, '' );
+				}
+			}
+			catch( \InvalidArgumentException $e )
+			{
+				\IPS\Output::i()->error( 'email_template_badform', '1C373/1', 403, '' );
 			}
 
 			foreach( $xml->template as $template )