Simplify code (#25687)

joomla · Jul 23, 2019 · 9ac19fa · 9ac19fa
1 parent d029939
commit 9ac19fa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/plugins/system/skipto/skipto.php b/plugins/system/skipto/skipto.php
@@ -9,6 +9,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
@@ -23,7 +24,7 @@ class PlgSystemSkipto extends CMSPlugin
 	/**
 	 * Application object.
 	 *
-	 * @var    \Joomla\CMS\Application\CMSApplication
+	 * @var    CMSApplicationInterface
 	 * @since  4.0.0
 	 */
 	protected $app;
@@ -37,9 +38,9 @@ class PlgSystemSkipto extends CMSPlugin
 	 */
 	public function onAfterDispatch()
 	{
-		$section = $this->params->get('section_skipto', 2);
+		$section = $this->params->get('section', 'administrator');
 
-		if ($section !== 3 && ($this->app->isClient('administrator') && $section !== 2 || $this->app->isClient('site') && $section !== 1))
+		if ($section !== 'both' && $this->app->isClient($section) !== true)
 		{
 			return;
 		}

diff --git a/plugins/system/skipto/skipto.xml b/plugins/system/skipto/skipto.xml
@@ -20,15 +20,15 @@
 		<fields name="params">
 			<fieldset name="basic">
 				<field
-					name="section_skipto"
+					name="section"
 					type="list"
 					label="PLG_SYSTEM_SKIPTO_SECTION"
-					default="2"
-					filter="integer"
+					default="administrator"
+					validate="options"
 					>
-					<option value="1">PLG_SYSTEM_SKIPTO_SECTION_SITE</option>
-					<option value="2">PLG_SYSTEM_SKIPTO_SECTION_ADMIN</option>
-					<option value="3">PLG_SYSTEM_SKIPTO_SECTION_BOTH</option>
+					<option value="site">PLG_SYSTEM_SKIPTO_SECTION_SITE</option>
+					<option value="administrator">PLG_SYSTEM_SKIPTO_SECTION_ADMIN</option>
+					<option value="both">PLG_SYSTEM_SKIPTO_SECTION_BOTH</option>
 				</field>
 			</fieldset>
 		</fields>