[plg_user_profile] Misc fixes (#20412)

* Update profile.xml * Update profile.xml * Update profile.php * Update tos.php
joomla · May 23, 2018 · 39620fc · 39620fc
1 parent 5e423b6
commit 39620fc
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 23 deletions.
diff --git a/plugins/user/profile/field/tos.php b/plugins/user/profile/field/tos.php
@@ -59,7 +59,7 @@ protected function getLabel()
 		JHtml::_('behavior.modal');
 
 		// Build the class for the label.
-		$class = !empty($this->description) ? 'hasTooltip' : '';
+		$class = !empty($this->description) ? 'hasPopover' : '';
 		$class = $class . ' required';
 		$class = !empty($this->labelClass) ? $class . ' ' . $this->labelClass : $class;
 
@@ -69,16 +69,17 @@ protected function getLabel()
 		// If a description is specified, use it to build a tooltip.
 		if (!empty($this->description))
 		{
-			$label .= ' title="'
-				. htmlspecialchars(
-					trim($text, ':') . '<br />' . ($this->translateDescription ? JText::_($this->description) : $this->description),
-					ENT_COMPAT, 'UTF-8'
-				) . '"';
+			$label .= ' title="' . htmlspecialchars(trim($text, ':'), ENT_COMPAT, 'UTF-8') . '"';
+			$label .= ' data-content="' . htmlspecialchars(
+				$this->translateDescription ? JText::_($this->description) : $this->description,
+				ENT_COMPAT,
+				'UTF-8'
+			) . '"';
 		}
 
-		$tosarticle = $this->element['article'] > 0 ? (int) $this->element['article'] : 0;
+		$tosArticle = $this->element['article'] > 0 ? (int) $this->element['article'] : 0;
 
-		if ($tosarticle)
+		if ($tosArticle)
 		{
 			JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
 
@@ -90,27 +91,32 @@ protected function getLabel()
 			$query = $db->getQuery(true);
 			$query->select('id, alias, catid, language')
 				->from('#__content')
-				->where('id = ' . $tosarticle);
+				->where('id = ' . $tosArticle);
 			$db->setQuery($query);
 			$article = $db->loadObject();
 
 			if (JLanguageAssociations::isEnabled())
 			{
-				$tosassociated = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $tosarticle);
+				$tosAssociated = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $tosArticle);
 			}
 
-			$current_lang = JFactory::getLanguage()->getTag();
+			$currentLang = JFactory::getLanguage()->getTag();
 
-			if (isset($tosassociated) && $current_lang !== $article->language && array_key_exists($current_lang, $tosassociated))
+			if (isset($tosAssociated) && $currentLang !== $article->language && array_key_exists($currentLang, $tosAssociated))
 			{
-				$url  = ContentHelperRoute::getArticleRoute($tosassociated[$current_lang]->id, $tosassociated[$current_lang]->catid);
-				$link = JHtml::_('link', JRoute::_($url . '&tmpl=component&lang=' . $tosassociated[$current_lang]->language), $text, $attribs);
+				$url = ContentHelperRoute::getArticleRoute(
+					$tosAssociated[$currentLang]->id,
+					$tosAssociated[$currentLang]->catid,
+					$tosAssociated[$currentLang]->language
+				);
+
+				$link = JHtml::_('link', JRoute::_($url . '&tmpl=component'), $text, $attribs);
 			}
 			else
 			{
 				$slug = $article->alias ? ($article->id . ':' . $article->alias) : $article->id;
-				$url  = ContentHelperRoute::getArticleRoute($slug, $article->catid);
-				$link = JHtml::_('link', JRoute::_($url . '&tmpl=component&lang=' . $article->language), $text, $attribs);
+				$url  = ContentHelperRoute::getArticleRoute($slug, $article->catid, $article->language);
+				$link = JHtml::_('link', JRoute::_($url . '&tmpl=component'), $text, $attribs);
 			}
 		}
 		else

diff --git a/plugins/user/profile/profile.php b/plugins/user/profile/profile.php
@@ -272,19 +272,19 @@ public function onContentPrepareForm(JForm $form, $data)
 			$form->setFieldAttribute('tos', 'description', 'PLG_USER_PROFILE_FIELD_TOS_DESC_SITE', 'profile');
 		}
 
-		$tosarticle = $this->params->get('register_tos_article');
-		$tosenabled = $this->params->get('register-require_tos', 0);
+		$tosArticle = $this->params->get('register_tos_article');
+		$tosEnabled = $this->params->get('register-require_tos', 0);
 
 		// We need to be in the registration form and field needs to be enabled
-		if ($name !== 'com_users.registration' || !$tosenabled)
+		if ($name !== 'com_users.registration' || !$tosEnabled)
 		{
 			// We only want the TOS in the registration form
 			$form->removeField('tos', 'profile');
 		}
 		else
 		{
 			// Push the TOS article ID into the TOS field.
-			$form->setFieldAttribute('tos', 'article', $tosarticle, 'profile');
+			$form->setFieldAttribute('tos', 'article', $tosArticle, 'profile');
 		}
 
 		foreach ($fields as $field)
@@ -381,11 +381,11 @@ public function onUserBeforeSave($user, $isnew, $data)
 		// Check that the tos is checked if required ie only in registration from frontend.
 		$task       = JFactory::getApplication()->input->getCmd('task');
 		$option     = JFactory::getApplication()->input->getCmd('option');
-		$tosarticle = $this->params->get('register_tos_article');
-		$tosenabled = ($this->params->get('register-require_tos', 0) == 2);
+		$tosArticle = $this->params->get('register_tos_article');
+		$tosEnabled = ($this->params->get('register-require_tos', 0) == 2);
 
 		// Check that the tos is checked.
-		if ($task === 'register' && $tosenabled && $tosarticle && $option === 'com_users' && !$data['profile']['tos'])
+		if ($task === 'register' && $tosEnabled && $tosArticle && $option === 'com_users' && !$data['profile']['tos'])
 		{
 			throw new InvalidArgumentException(JText::_('PLG_USER_PROFILE_FIELD_TOS_DESC_SITE'));
 		}

diff --git a/plugins/user/profile/profile.xml b/plugins/user/profile/profile.xml
@@ -33,6 +33,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_ADDRESS1_LABEL"
 					description="PLG_USER_PROFILE_FIELD_ADDRESS1_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -44,6 +46,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_ADDRESS2_LABEL"
 					description="PLG_USER_PROFILE_FIELD_ADDRESS2_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -55,6 +59,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_CITY_LABEL"
 					description="PLG_USER_PROFILE_FIELD_CITY_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -66,6 +72,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_REGION_LABEL"
 					description="PLG_USER_PROFILE_FIELD_REGION_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -77,6 +85,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_COUNTRY_LABEL"
 					description="PLG_USER_PROFILE_FIELD_COUNTRY_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -88,6 +98,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_POSTAL_CODE_LABEL"
 					description="PLG_USER_PROFILE_FIELD_POSTAL_CODE_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -99,6 +111,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_PHONE_LABEL"
 					description="PLG_USER_PROFILE_FIELD_PHONE_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -110,6 +124,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_WEB_SITE_LABEL"
 					description="PLG_USER_PROFILE_FIELD_WEB_SITE_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -121,6 +137,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_LABEL"
 					description="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -132,6 +150,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_ABOUT_ME_LABEL"
 					description="PLG_USER_PROFILE_FIELD_ABOUT_ME_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option	value="2">JOPTION_REQUIRED</option>
 					<option	value="1">JOPTION_OPTIONAL</option>
@@ -144,6 +164,7 @@
 					label="PLG_USER_PROFILE_FIELD_TOS_LABEL"
 					description="PLG_USER_PROFILE_FIELD_TOS_DESC"
 					default="0"
+					filter="integer"
 					>
 					<option	value="2">JOPTION_REQUIRED</option>
 					<option	value="0">JDISABLED</option>
@@ -158,13 +179,16 @@
 					new="true"
 					edit="true"
 					clear="true"
+					filter="integer"
 				/>
 
 				<field
 					name="register-require_dob"
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_DOB_LABEL"
 					description="PLG_USER_PROFILE_FIELD_DOB_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option	value="2">JOPTION_REQUIRED</option>
 					<option	value="1">JOPTION_OPTIONAL</option>
@@ -189,6 +213,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_ADDRESS1_LABEL"
 					description="PLG_USER_PROFILE_FIELD_ADDRESS1_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -200,6 +226,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_ADDRESS2_LABEL"
 					description="PLG_USER_PROFILE_FIELD_ADDRESS2_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -211,6 +239,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_CITY_LABEL"
 					description="PLG_USER_PROFILE_FIELD_CITY_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -222,6 +252,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_REGION_LABEL"
 					description="PLG_USER_PROFILE_FIELD_REGION_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -233,6 +265,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_COUNTRY_LABEL"
 					description="PLG_USER_PROFILE_FIELD_COUNTRY_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -244,6 +278,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_POSTAL_CODE_LABEL"
 					description="PLG_USER_PROFILE_FIELD_POSTAL_CODE_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -255,6 +291,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_PHONE_LABEL"
 					description="PLG_USER_PROFILE_FIELD_PHONE_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -266,6 +304,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_WEB_SITE_LABEL"
 					description="PLG_USER_PROFILE_FIELD_WEB_SITE_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -277,6 +317,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_LABEL"
 					description="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option value="2">JOPTION_REQUIRED</option>
 					<option value="1">JOPTION_OPTIONAL</option>
@@ -288,6 +330,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_ABOUT_ME_LABEL"
 					description="PLG_USER_PROFILE_FIELD_ABOUT_ME_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option	value="2">JOPTION_REQUIRED</option>
 					<option	value="1">JOPTION_OPTIONAL</option>
@@ -299,6 +343,8 @@
 					type="list"
 					label="PLG_USER_PROFILE_FIELD_DOB_LABEL"
 					description="PLG_USER_PROFILE_FIELD_DOB_DESC"
+					default="1"
+					filter="integer"
 					>
 					<option	value="2">JOPTION_REQUIRED</option>
 					<option	value="1">JOPTION_OPTIONAL</option>

diff --git a/plugins/user/profile/profiles/profile.xml b/plugins/user/profile/profiles/profile.xml
@@ -121,6 +121,7 @@
 				label="PLG_USER_PROFILE_FIELD_TOS_LABEL"
 				description="PLG_USER_PROFILE_FIELD_TOS_DESC"
 				default="0"
+				filter="integer"
 				>
 				<option value="1">PLG_USER_PROFILE_OPTION_AGREE</option>
 				<option value="0">JNO</option>