diff --git a/administrator/components/com_admin/models/forms/profile.xml b/administrator/components/com_admin/models/forms/profile.xml index 4c451639facb3..02ae043bafbb1 100644 --- a/administrator/components/com_admin/models/forms/profile.xml +++ b/administrator/components/com_admin/models/forms/profile.xml @@ -143,15 +143,6 @@ - - - - - -
JOPTION_USE_DEFAULT - - - - English (GB) - Joomla help wiki - Français (FR) - Aide de Joomla! diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini index d54265d16b10d..62e70da3da5f8 100644 --- 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 index 8ba1dcae56ad4..b77c2eee686bb 100644 --- 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 index d89be9d7e4c8d..f304ed0407c12 100644 --- 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/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 7af3a71e5565c..f9d8e7f7e304c 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -421,6 +421,7 @@ JGLOBAL_FILTER_TYPE_DESC="1. Blacklist allows all tags and attributes except for JGLOBAL_FILTER_TYPE_LABEL="Filter Type1" JGLOBAL_FULL_TEXT="Full Text" JGLOBAL_GT=">" +; The following strings is deprecated and will be removed with 4.0. JGLOBAL_HELPREFRESH_BUTTON="Refresh" JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC="The maximum number of old versions of an item to save. If zero, all old versions will be saved." JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL="Maximum Versions" diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css index 8ddd553b68260..c1f123175ff10 100644 --- 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 index 064494b04d82d..d385ac7ca0409 100644 --- 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 index 0a76f4086f37c..219a2e7d65b5c 100644 --- 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 deleted file mode 100644 index eea37b87f9c6b..0000000000000 --- a/components/com_users/controllers/profile.json.php +++ /dev/null @@ -1,21 +0,0 @@ -guest) - { - throw new Exception(JText::_('JERROR_ALERTNOAUTHOR')); - } - - // Set FTP credentials, if given - JClientHelper::setCredentialsFromRequest('ftp'); - - if (($data = file_get_contents('https://update.joomla.org/helpsites/helpsites.xml')) === false) - { - throw new Exception(JText::_('COM_CONFIG_ERROR_HELPREFRESH_FETCH'), 500); - } - elseif (!JFile::write(JPATH_ADMINISTRATOR . '/help/helpsites.xml', $data)) - { - throw new Exception(JText::_('COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE'), 500); - } - - $options = array_merge( - array( - JHtml::_('select.option', '', JText::_('JOPTION_USE_DEFAULT')) - ), - JHelp::createSiteList(JPATH_ADMINISTRATOR . '/help/helpsites.xml') - ); - - echo json_encode($options); - JFactory::getApplication()->close(); - } -} diff --git a/components/com_users/models/forms/frontend_admin.xml b/components/com_users/models/forms/frontend_admin.xml index 99b59489146b6..c9e58e469a073 100644 --- a/components/com_users/models/forms/frontend_admin.xml +++ b/components/com_users/models/forms/frontend_admin.xml @@ -25,15 +25,6 @@ - - - -
diff --git a/installation/application/web.php b/installation/application/web.php index b5176e2ea6cc0..3ccffbb4fc77a 100644 --- 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 index 8f4fb69c991dd..8e78644b8031e 100644 --- a/installation/localise.xml +++ b/installation/localise.xml @@ -1,7 +1,6 @@ - 0 diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini index 71278c17df852..4c688d2c067fa 100644 --- 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/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index 5529c6653232c..78c6b3a196a2c 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -244,6 +244,7 @@ JGLOBAL_FILTER_BUTTON="Filter" JGLOBAL_FILTER_LABEL="Filter" JGLOBAL_FULL_TEXT="Full Text" JGLOBAL_GT=">" +; The following string is deprecated and will be removed with 4.0. JGLOBAL_HELPREFRESH_BUTTON="Refresh" JGLOBAL_HITS="Hits" JGLOBAL_HITS_COUNT="Hits: %s" diff --git a/libraries/src/Form/Field/HelpsiteField.php b/libraries/src/Form/Field/HelpsiteField.php index b6e90fa87ce20..45db528b47165 100644 --- a/libraries/src/Form/Field/HelpsiteField.php +++ b/libraries/src/Form/Field/HelpsiteField.php @@ -19,7 +19,8 @@ * Form Field class for the Joomla Platform. * Provides a select list of help sites. * - * @since 1.6 + * @since 1.6 + * @deprecated 4.0 To be removed */ class HelpsiteField extends \JFormFieldList { diff --git a/libraries/src/Help/Help.php b/libraries/src/Help/Help.php index 118630d26ed41..f9b65349d8307 100644 --- 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/css/template.css b/templates/protostar/css/template.css index c6bdb79394610..83918b8b8aacb 100644 --- a/templates/protostar/css/template.css +++ b/templates/protostar/css/template.css @@ -7655,9 +7655,6 @@ div.current dd.tabs { border: 1px solid #CCC; background-color: #FFF; } -#helpsite-refresh { - vertical-align: top; -} #pop-print { float: right; margin: 10px; diff --git a/templates/protostar/less/template.less b/templates/protostar/less/template.less index 335a9bfa3be9f..0c3f37103cd94 100644 --- 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; diff --git a/tests/unit/suites/libraries/cms/form/field/JFormFieldHelpsiteTest.php b/tests/unit/suites/libraries/cms/form/field/JFormFieldHelpsiteTest.php deleted file mode 100644 index 93c33d2df6464..0000000000000 --- a/tests/unit/suites/libraries/cms/form/field/JFormFieldHelpsiteTest.php +++ /dev/null @@ -1,88 +0,0 @@ -saveFactoryState(); - - JFactory::$application = $this->getMockCmsApp(); - JFactory::$document = $this->getMockDocument(); - - $this->backupServer = $_SERVER; - - $_SERVER['HTTP_HOST'] = 'example.com'; - $_SERVER['SCRIPT_NAME'] = ''; - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - * - * @return void - * - * @since 3.2 - */ - protected function tearDown() - { - $_SERVER = $this->backupServer; - unset($this->backupServer); - $this->restoreFactoryState(); - - parent::tearDown(); - } - - /** - * Tests the getInput method. - * - * @return void - * - * @since 3.1 - */ - public function testGetInput() - { - $field = new JFormFieldHelpsite; - $field->setup( - new SimpleXMLElement(''), - 'value' - ); - - $this->assertContains( - '