[com_fields] Change extension variable to context for custom field groups (#13175)

* Change extension variable to context for custom field groups

* Stabilizing javascript

* Fixing code style error

* Check for admin permission of com_fields access correct

Author: laoneo

administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-29.sql

@@ -41,7 +41,7 @@ CREATE TABLE IF NOT EXISTS `#__fields` (
 CREATE TABLE IF NOT EXISTS `#__fields_groups` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `asset_id` int(10) NOT NULL DEFAULT 0,
-  `extension` varchar(255) NOT NULL DEFAULT '',
+  `context` varchar(255) NOT NULL DEFAULT '',
   `title` varchar(255) NOT NULL DEFAULT '',
   `note` varchar(255) NOT NULL DEFAULT '',
   `description` text NOT NULL,
@@ -60,7 +60,7 @@ CREATE TABLE IF NOT EXISTS `#__fields_groups` (
   KEY `idx_state` (`state`),
   KEY `idx_created_by` (`created_by`),
   KEY `idx_access` (`access`),
-  KEY `idx_extension` (`extension`),
+  KEY `idx_context` (`context`),
   KEY `idx_language` (`language`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 

administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-29.sql

@@ -47,7 +47,7 @@ CREATE INDEX "#__fields_idx_language" ON "#__fields" ("language");
 CREATE TABLE "#__fields_groups" (
   "id" serial NOT NULL,
   "asset_id" bigint DEFAULT 0 NOT NULL,
-  "extension" varchar(255) DEFAULT '' NOT NULL,
+  "context" varchar(255) DEFAULT '' NOT NULL,
   "title" varchar(255) DEFAULT '' NOT NULL,
   "note" varchar(255) DEFAULT '' NOT NULL,
   "description" text DEFAULT '' NOT NULL,
@@ -67,7 +67,7 @@ CREATE INDEX "#__fields_idx_checked_out" ON "#__fields_groups" ("checked_out");
 CREATE INDEX "#__fields_idx_state" ON "#__fields_groups" ("state");
 CREATE INDEX "#__fields_idx_created_by" ON "#__fields_groups" ("created_by");
 CREATE INDEX "#__fields_idx_access" ON "#__fields_groups" ("access");
-CREATE INDEX "#__fields_idx_extension" ON "#__fields_groups" ("extension");
+CREATE INDEX "#__fields_idx_context" ON "#__fields_groups" ("context");
 CREATE INDEX "#__fields_idx_language" ON "#__fields_groups" ("language");
 
 --

administrator/components/com_contact/helpers/contact.php

@@ -48,7 +48,7 @@ public static function addSubmenu($vName)
 			);
 			JHtmlSidebar::addEntry(
 				JText::_('JGLOBAL_FIELD_GROUPS'),
-				'index.php?option=com_fields&view=groups&extension=com_contact',
+				'index.php?option=com_fields&view=groups&context=com_contact.contact',
 				$vName == 'fields.groups'
 			);
 		}

administrator/components/com_content/helpers/content.php

@@ -49,7 +49,7 @@ public static function addSubmenu($vName)
 			);
 			JHtmlSidebar::addEntry(
 				JText::_('JGLOBAL_FIELD_GROUPS'),
-				'index.php?option=com_fields&view=groups&extension=com_content',
+				'index.php?option=com_fields&view=groups&context=com_content.article',
 				$vName == 'fields.groups'
 			);
 		}

administrator/components/com_fields/controllers/group.php

@@ -27,12 +27,12 @@ class FieldsControllerGroup extends JControllerForm
 	protected $text_prefix = 'COM_FIELDS_GROUP';
 
 	/**
-	 * The extension for which the group applies.
+	 * The component for which the group applies.
 	 *
 	 * @var    string
 	 * @since   __DEPLOY_VERSION__
 	 */
-	private $extension;
+	private $component = '';
 
 	/**
 	 * Class constructor.
@@ -45,7 +45,12 @@ public function __construct($config = array())
 	{
 		parent::__construct($config);
 
-		$this->extension = $this->input->getCmd('extension');
+		$parts = FieldsHelper::extract($this->input->getCmd('context'));
+
+		if ($parts)
+		{
+			$this->component = $parts[0];
+		}
 	}
 
 	/**
@@ -81,7 +86,7 @@ public function batch($model = null)
 	 */
 	protected function allowAdd($data = array())
 	{
-		return JFactory::getUser()->authorise('core.create', $this->extension);
+		return JFactory::getUser()->authorise('core.create', $this->component);
 	}
 
 	/**
@@ -100,19 +105,19 @@ protected function allowEdit($data = array(), $key = 'parent_id')
 		$user = JFactory::getUser();
 
 		// Check general edit permission first.
-		if ($user->authorise('core.edit', $this->extension))
+		if ($user->authorise('core.edit', $this->component))
 		{
 			return true;
 		}
 
 		// Check edit on the record asset (explicit or inherited)
-		if ($user->authorise('core.edit', $this->extension . '.fieldgroup.' . $recordId))
+		if ($user->authorise('core.edit', $this->component . '.fieldgroup.' . $recordId))
 		{
 			return true;
 		}
 
 		// Check edit own on the record asset (explicit or inherited)
-		if ($user->authorise('core.edit.own', $this->extension . '.fieldgroup.' . $recordId) || $user->authorise('core.edit.own', $this->extension))
+		if ($user->authorise('core.edit.own', $this->component . '.fieldgroup.' . $recordId) || $user->authorise('core.edit.own', $this->component))
 		{
 			// Existing record already has an owner, get it
 			$record = $this->getModel()->getItem($recordId);

administrator/components/com_fields/fields.php

@@ -2,29 +2,29 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_fields
- * 
+ *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
 
+JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
 $app       = JFactory::getApplication();
-$component = $app->getUserStateFromRequest('com_fields.groups.extension', 'extension', '', 'CMD');
+$context   = $app->getUserStateFromRequest(
+	'com_fields.groups.context',
+	'context',
+	$app->getUserStateFromRequest('com_fields.fields.context', 'context', 'com_content.article', 'CMD'),
+	'CMD'
+);
 
-if (!$component)
-{
-	$parts     = explode('.', $app->getUserStateFromRequest('com_fields.fields.context', 'context', '', 'CMD'));
-	$component = $parts[0];
-}
+$parts = FieldsHelper::extract($context);
 
-if (!JFactory::getUser()->authorise('core.manage', $component))
+if (!$parts || !JFactory::getUser()->authorise('core.manage', $parts[0]))
 {
 	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
 }
 
-JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
-JLoader::register('FieldsHelperInternal', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/internal.php');
-
 $controller = JControllerLegacy::getInstance('Fields');
 $controller->execute($app->input->get('task'));
 $controller->redirect();

administrator/components/com_fields/helpers/internal.php

@@ -21,15 +21,24 @@ class FieldsHelperInternal
 	/**
 	 * Configure the Linkbar.
 	 *
-	 * @param   string  $component  The component the fields are used for
-	 * @param   string  $vName      The view currently active
+	 * @param   string  $context  The context the fields are used for
+	 * @param   string  $vName    The view currently active
 	 *
 	 * @return  void
 	 *
 	 * @since    __DEPLOY_VERSION__
 	 */
-	public static function addSubmenu ($component, $vName)
+	public static function addSubmenu ($context, $vName)
 	{
+		$parts = FieldsHelper::extract($context);
+
+		if (!$parts)
+		{
+			return;
+		}
+
+		$component = $parts[0];
+
 		// Avoid nonsense situation.
 		if ($component == 'com_fields')
 		{

administrator/components/com_fields/models/field.php

@@ -324,11 +324,15 @@ public function getForm($data = array(), $loadData = true)
 		if (empty($context) && isset($data['context']))
 		{
 			$context = $data['context'];
-			$parts   = explode('.', $context);
+			$parts   = FieldsHelper::extract($context);
 
 			$this->setState('field.context', $context);
-			$this->setState('field.component', $parts[0]);
-			$this->setState('field.section', isset($parts[1]) ? $parts[1] : '');
+
+			if ($parts)
+			{
+				$this->setState('field.component', $parts[0]);
+				$this->setState('field.section', $parts[1]);
+			}
 		}
 
 		// Get the form.
@@ -769,7 +773,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 		}
 
 		$form->setFieldAttribute('type', 'component', $component);
-		$form->setFieldAttribute('group_id', 'extension', $component);
+		$form->setFieldAttribute('group_id', 'context', $this->state->get('field.context'));
 		$form->setFieldAttribute('rules', 'component', $component);
 
 		// Trigger the default form events.

administrator/components/com_fields/models/fields.php

@@ -78,9 +78,13 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('filter.context', $context);
 
 		// Split context into component and optional section
-		$parts = explode('.', $context);
-		$this->setState('filter.component', $parts[0]);
-		$this->setState('filter.section', (count($parts) > 1) ? $parts[1] : null);
+		$parts = FieldsHelper::extract($context);
+
+		if ($parts)
+		{
+			$this->setState('filter.component', $parts[0]);
+			$this->setState('filter.section', $parts[1]);
+		}
 	}
 
 	/**
@@ -345,7 +349,7 @@ public function getFilterForm($data = array(), $loadData = true)
 		if ($form)
 		{
 			$form->setValue('context', null, $this->getState('filter.context'));
-			$form->setFieldAttribute('group_id', 'extension', $this->getState('filter.component'), 'filter');
+			$form->setFieldAttribute('group_id', 'context', $this->getState('filter.context'), 'filter');
 		}
 
 		return $form;
@@ -368,7 +372,7 @@ public function getGroups()
 		$query->select('title AS text, id AS value, state');
 		$query->from('#__fields_groups');
 		$query->where('state IN (0,1)');
-		$query->where('extension = ' . $db->quote($this->state->get('filter.component')));
+		$query->where('context = ' . $db->quote($this->state->get('filter.component')));
 		$query->where('access IN (' . implode(',', $viewlevels) . ')');
 
 		$db->setQuery($query);

administrator/components/com_fields/models/fields/fieldgroups.php

@@ -28,7 +28,7 @@ class JFormFieldFieldgroups extends JFormAbstractlist
 	 */
 	protected function getOptions()
 	{
-		$extension = (string) $this->element['extension'];
+		$context = (string) $this->element['context'];
 		$states    = $this->element['state'] ? $this->element['state'] : '0,1';
 		$states    = ArrayHelper::toInteger(explode(',', $states));
 
@@ -40,7 +40,7 @@ protected function getOptions()
 		$query->select('title AS text, id AS value, state');
 		$query->from('#__fields_groups');
 		$query->where('state IN (' . implode(',', $states) . ')');
-		$query->where('extension = ' . $db->quote($extension));
+		$query->where('context = ' . $db->quote($context));
 		$query->where('access IN (' . implode(',', $viewlevels) . ')');
 
 		$db->setQuery($query);