Fixed Hard Coupling (com_users | plg_users_joomla)

administrator/components/com_users/models/user.php

@@ -112,14 +112,6 @@ public function getItem($pk = null)
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
-		$pluginParams = new Registry;
-
-		if (JPluginHelper::isEnabled('user', 'joomla'))
-		{
-			$plugin = JPluginHelper::getPlugin('user', 'joomla');
-			$pluginParams->loadString($plugin->params);
-		}
-
 		// Get the form.
 		$form = $this->loadForm('com_users.user', 'user', array('control' => 'jform', 'load_data' => $loadData));
 
@@ -128,15 +120,6 @@ public function getForm($data = array(), $loadData = true)
 			return false;
 		}
 
-		$userId = $form->getValue('id');
-
-		// Passwords fields are required when mail to user is set to No in the joomla user plugin
-		if ($userId === 0 && $pluginParams->get('mail_to_user', '1') === '0')
-		{
-			$form->setFieldAttribute('password', 'required', 'true');
-			$form->setFieldAttribute('password2', 'required', 'true');
-		}
-
 		// If the user needs to change their password, mark the password fields as required
 		if (JFactory::getUser()->requireReset)
 		{
@@ -150,6 +133,8 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('language', 'type', 'frontend_language', 'params');
 		}
 
+		$userId = $form->getValue('id');
+
 		// The user should not be able to set the requireReset value on their own account
 		if ((int) $userId === (int) JFactory::getUser()->id)
 		{

plugins/user/joomla/joomla.php

@@ -34,6 +34,46 @@ class PlgUserJoomla extends JPlugin
 	 */
 	protected $db;
 
+	/**
+	 * Set as required the passwords fields when mail to user is set to No
+	 *
+	 * @param   JForm  $form  The form to be altered.
+	 * @param   mixed  $data  The associated data for the form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onContentPrepareForm($form, $data)
+	{
+		// Check we are manipulating a valid user form before modifying it.
+		$name = $form->getName();
+
+		if ($name === 'com_users.user')
+		{
+			// In case there is a validation error (like duplicated user), $data is not a stdClass but just an empty array
+			// TODO: Check inside the FormModel, for put the right associated data for the form
+			if (!$data)
+			{
+				$data = JFactory::getApplication()->input->get('jform', array(), 'array');
+			}
+
+			if (is_array($data))
+			{
+				$data = (object) $data;
+			}
+
+			// Passwords fields are required when mail to user is set to No
+			if (empty($data->id) && !$this->params->get('mail_to_user', 1))
+			{
+				$form->setFieldAttribute('password', 'required', 'true');
+				$form->setFieldAttribute('password2', 'required', 'true');
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	 * Remove all sessions for the user name
 	 *