remove french helpsite

joomla · May 16, 2019 · 52b8a8d · 52b8a8d
1 parent b12056e
commit 52b8a8d
Show file tree

Hide file tree

Showing 25 changed files with 16 additions and 263 deletions.
diff --git a/administrator/components/com_admin/models/forms/profile.xml b/administrator/components/com_admin/models/forms/profile.xml
@@ -143,15 +143,6 @@
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field
-				name="helpsite"
-				type="helpsite"
-				label="COM_ADMIN_USER_FIELD_HELPSITE_LABEL"
-				description="COM_ADMIN_USER_FIELD_HELPSITE_DESC"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-
 			<field
 				name="timezone"
 				type="timezone"

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -1968,7 +1968,10 @@ public function deleteUnexistingFiles()
 			/*
 			 * Joomla! 3.8.0 thru 3.9.0
 			 */
+			'/administrator/components/com_users/controllers/profile.json.php',
 			'/administrator/includes/toolbar.php',
+			'/components/com_users/controllers/profile_base_json.php',
+			'/components/com_users/controllers/profile.json.php',
 			'/libraries/joomla/filesystem/file.php',
 			'/libraries/joomla/filesystem/folder.php',
 			'/libraries/joomla/filesystem/helper.php',

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.7-2019-05-16.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.7-2019-05-16.sql
@@ -0,0 +1 @@
+UPDATE `#__users` SET `params` = REPLACE(`params`, '"helpsite":"https:\\/\\/help.joomla.fr\\/index.php?option=com_help&keyref=Help{major}{minor}:{keyref}"', '');
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.7-2019-05-16.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.7-2019-05-16.sql
@@ -0,0 +1 @@
+UPDATE "#__users" SET "params" = REPLACE("params", '"helpsite":"https:\\/\\/help.joomla.fr\\/index.php?option=com_help&keyref=Help{major}{minor}:{keyref}"', '');
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.9.7-2019-05-16.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.9.7-2019-05-16.sql
@@ -0,0 +1 @@
+UPDATE [#__users] SET [params] = REPLACE([params], '"helpsite":"https:\\/\\/help.joomla.fr\\/index.php?option=com_help&keyref=Help{major}{minor}:{keyref}"', '');
diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
@@ -1194,15 +1194,6 @@
 			size="50"
 		/>
 
-		<field
-			name="helpurl"
-			type="helpsite"
-			label="COM_CONFIG_FIELD_HELP_SERVER_LABEL"
-			description="COM_CONFIG_FIELD_HELP_SERVER_DESC"
-			showDefault="false"
-			validate="options"
-		/>
-
 	</fieldset>
 
 	<fieldset

diff --git a/administrator/components/com_users/controllers/profile.json.php b/administrator/components/com_users/controllers/profile.json.php
diff --git a/administrator/components/com_users/models/forms/user.xml b/administrator/components/com_users/models/forms/user.xml
@@ -201,15 +201,6 @@
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field
-				name="helpsite"
-				type="helpsite"
-				label="COM_USERS_USER_FIELD_HELPSITE_LABEL"
-				description="COM_USERS_USER_FIELD_HELPSITE_DESC"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-
 			<field
 				name="timezone"
 				type="timezone"

diff --git a/administrator/help/helpsites.xml b/administrator/help/helpsites.xml
@@ -2,6 +2,5 @@
 <joshelp>
 	<sites>
 		<site tag="en-GB" url="https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&amp;lang={langcode}">English (GB) - Joomla help wiki</site>
-		<site tag="fr-FR" url="https://help.joomla.fr/index.php?option=com_help&amp;keyref=Help{major}{minor}:{keyref}">Français (FR) - Aide de Joomla!</site>
 	</sites>
 </joshelp>
diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini
@@ -161,6 +161,7 @@ COM_ADMIN_USER_FIELD_EDITOR_LABEL="Editor"
 COM_ADMIN_USER_FIELD_EMAIL_DESC="Enter an email address for the user."
 COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_DESC="Select the Language for the Frontend interface. This will only affect this User."
 COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
+; The following two strings are deprecated and will be removed with 4.0.
 COM_ADMIN_USER_FIELD_HELPSITE_DESC="Help site for this user."
 COM_ADMIN_USER_FIELD_HELPSITE_LABEL="Help Site"
 COM_ADMIN_USER_FIELD_LASTVISIT_DESC="Last visit date."

diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini
@@ -31,6 +31,7 @@ COM_CONFIG_ERROR_CONFIG_EXTENSION_NOT_FOUND="The Global Configuration extension
 COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE="Could not make configuration.php unwritable."
 COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE="Could not make configuration.php writable."
 COM_CONFIG_ERROR_CUSTOM_CACHE_PATH_NOTWRITABLE_USING_DEFAULT="The folder at %1$s is not writable and cannot be used for the cache, using the default %2$s instead."
+; The following 2 strings are deprecated and will be removed with 4.0.
 COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE="The new Help Sites list could not be saved."
 COM_CONFIG_ERROR_HELPREFRESH_FETCH="The current Help Sites list could not be fetched from the remote server."
 COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND="The asset for global configuration could not be found. Permissions have not been saved."
@@ -111,6 +112,7 @@ COM_CONFIG_FIELD_FTP_USERNAME_DESC="The username used to access the FTP server."
 COM_CONFIG_FIELD_FTP_USERNAME_LABEL="FTP Username"
 COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC="Compress buffered output if supported."
 COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL="Gzip Page Compression"
+; The following two strings are deprecated and will be removed with 4.0.
 COM_CONFIG_FIELD_HELP_SERVER_DESC="Select the name of the help server from which your system will collect the help screen displays."
 COM_CONFIG_FIELD_HELP_SERVER_LABEL="Help Server"
 COM_CONFIG_FIELD_LOG_PATH_DESC="Please specify a folder to store log files."

diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
@@ -331,6 +331,7 @@ COM_USERS_USER_FIELD_EMAIL_DESC="Enter an email address for the user."
 COM_USERS_USER_FIELD_ENABLE="Enabled"
 COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC="Select the Language for the Frontend interface. This will only affect this User."
 COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
+; The following two strings are deprecated and will be removed with 4.0.
 COM_USERS_USER_FIELD_HELPSITE_DESC="Help site for this user."
 COM_USERS_USER_FIELD_HELPSITE_LABEL="Help Site"
 COM_USERS_USER_FIELD_LASTRESET_DESC="Date and time of last password reset."

diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
@@ -8917,10 +8917,6 @@ th .tooltip-inner {
 .img-preview > img {
 	max-height: 100%;
 }
-#helpsite-refresh {
-	padding: 4px 12px;
-	vertical-align: top;
-}
 .alert-no-items {
 	margin-top: 20px;
 }

diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
@@ -8917,10 +8917,6 @@ th .tooltip-inner {
 .img-preview > img {
 	max-height: 100%;
 }
-#helpsite-refresh {
-	padding: 4px 12px;
-	vertical-align: top;
-}
 .alert-no-items {
 	margin-top: 20px;
 }

diff --git a/administrator/templates/isis/less/blocks/_custom.less b/administrator/templates/isis/less/blocks/_custom.less
@@ -165,11 +165,6 @@ th .tooltip-inner {
 	max-height: 100%;
 }
 
-/* Help site refresh button*/
-#helpsite-refresh {
-	padding: 4px 12px;
-	vertical-align: top;
-}
 .alert-no-items {
 	margin-top: 20px;
 }

diff --git a/components/com_users/controllers/profile.json.php b/components/com_users/controllers/profile.json.php
diff --git a/components/com_users/controllers/profile_base_json.php b/components/com_users/controllers/profile_base_json.php
diff --git a/components/com_users/models/forms/frontend_admin.xml b/components/com_users/models/forms/frontend_admin.xml
@@ -25,15 +25,6 @@
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field 
-				name="helpsite"
-				type="helpsite"
-				label="COM_USERS_USER_FIELD_HELPSITE_LABEL"
-				description="COM_USERS_USER_FIELD_HELPSITE_DESC"
-				>
-				<option value="">JOPTION_USE_DEFAULT</option>
-			</field>
-
 		</fieldset>
 	</fields>
 </form>
diff --git a/installation/application/web.php b/installation/application/web.php
@@ -275,7 +275,6 @@ public function getLocalise()
 		$ret = array();
 
 		$ret['language']   = (string) $xml->forceLang;
-		$ret['helpurl']    = (string) $xml->helpurl;
 		$ret['debug']      = (string) $xml->debug;
 		$ret['sampledata'] = (string) $xml->sampledata;
 
@@ -402,15 +401,8 @@ protected function initialiseApp($options = array())
 			$options['language'] = 'en-GB';
 		}
 
-		// Check for custom helpurl.
-		if (empty($forced['helpurl']))
-		{
-			$options['helpurl'] = 'https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&lang={langcode}';
-		}
-		else
-		{
-			$options['helpurl'] = $forced['helpurl'];
-		}
+		// Set the official helpurl.
+		$options['helpurl'] = 'https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&lang={langcode}';
 
 		// Store helpurl in the session.
 		$this->getSession()->set('setup.helpurl', $options['helpurl']);

diff --git a/installation/localise.xml b/installation/localise.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <localise version="3.6" client="installation">
 	<forceLang></forceLang>
-	<helpurl></helpurl>
 	<debug>0</debug>
 	<sampledata></sampledata>
 	<params/>

diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini
@@ -164,6 +164,7 @@ COM_USERS_USER_FIELD_EDITOR_DESC="Choose your text editor."
 COM_USERS_USER_FIELD_EDITOR_LABEL="Editor"
 COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC="Choose your default language for the Frontend."
 COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
+; The following two strings are deprecated and will be removed with 4.0.
 COM_USERS_USER_FIELD_HELPSITE_DESC="Help site for the Backend."
 COM_USERS_USER_FIELD_HELPSITE_LABEL="Help Site"
 COM_USERS_USER_FIELD_TIMEZONE_DESC="Choose your time zone."

diff --git a/libraries/src/Form/Field/HelpsiteField.php b/libraries/src/Form/Field/HelpsiteField.php
@@ -4,6 +4,7 @@
  *
  * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * @deprecated  4.0 To be removed
  */
 
 namespace Joomla\CMS\Form\Field;

diff --git a/libraries/src/Help/Help.php b/libraries/src/Help/Help.php
@@ -48,15 +48,8 @@ public static function createUrl($ref, $useComponent = false, $override = null,
 		}
 		else
 		{
-			// Get the user help URL.
-			$user = \JFactory::getUser();
-			$url  = $user->getParam('helpsite');
-
-			// If user hasn't specified a help URL, then get the global one.
-			if ($url == '')
-			{
-				$url = $app->get('helpurl');
-			}
+			// Get the global help URL.
+			$url = $app->get('helpurl');
 
 			// Component help URL overrides user and global.
 			if ($useComponent)

diff --git a/templates/protostar/less/template.less b/templates/protostar/less/template.less
@@ -619,11 +619,6 @@ div.current dd.tabs {
 	background-color: #FFF;
 }
 
-/* Help site refresh button*/
-#helpsite-refresh {
-	vertical-align: top;
-}
-
 /*Print pop-up*/
 #pop-print {
 	float: right;