From 40d4ef419ae4917c86d4c3d373bb6f7cc28fdc23 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Fri, 25 Mar 2016 00:06:04 +0000 Subject: [PATCH 1/2] update server to https --- .../com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql | 4 ++++ .../com_admin/sql/updates/postgresql/3.5.1-2016-03-25.sql | 4 ++++ .../com_admin/sql/updates/sqlazure/3.5.1-2016-03-25.sql | 4 ++++ .../components/com_joomlaupdate/joomlaupdate.xml | 2 +- .../components/com_joomlaupdate/models/default.php | 6 +++--- administrator/manifests/files/joomla.xml | 4 ++-- administrator/manifests/packages/pkg_en-GB.xml | 2 +- components/com_users/controllers/profile_base_json.php | 2 +- installation/sql/mysql/joomla.sql | 8 ++++---- installation/sql/postgresql/joomla.sql | 8 ++++---- installation/sql/sqlazure/joomla.sql | 8 ++++---- 11 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.5.1-2016-03-25.sql create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.5.1-2016-03-25.sql diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql new file mode 100644 index 0000000000000..3a607f8bb3f83 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql @@ -0,0 +1,4 @@ +UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/core/list.xml' WHERE `name` = 'Joomla! Core' AND `type` = 'collection'; +UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/jed/list.xml' WHERE `name` = 'Joomla! Extension Directory' AND `type` = 'collection'; +UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/language/translationlist_3.xml' WHERE `name` = 'Accredited Joomla! Translations' AND `type` = 'collection'; +UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml' WHERE `name` = 'Joomla! Update Component Update Site' AND `type` = 'extension'; diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.1-2016-03-25.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.1-2016-03-25.sql new file mode 100644 index 0000000000000..ff3d61ce21a60 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.1-2016-03-25.sql @@ -0,0 +1,4 @@ +UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/core/list.xml' WHERE "name" = 'Joomla! Core' AND "type" = 'collection'; +UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/jed/list.xml' WHERE "name" = 'Joomla! Extension Directory' AND "type" = 'collection'; +UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/language/translationlist_3.xml' WHERE "name" = 'Accredited Joomla! Translations' AND "type" = 'collection'; +UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml' WHERE "name" = 'Joomla! Update Component Update Site' AND "type" = 'extension'; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.1-2016-03-25.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.1-2016-03-25.sql new file mode 100644 index 0000000000000..59d5fb4c387ca --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.1-2016-03-25.sql @@ -0,0 +1,4 @@ +UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/core/list.xml' WHERE [name] = 'Joomla! Core' AND [type] = 'collection'; +UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/jed/list.xml' WHERE [name] = 'Joomla! Extension Directory' AND [type] = 'collection'; +UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/language/translationlist_3.xml' WHERE [name] = 'Accredited Joomla! Translations' AND [type] = 'collection'; +UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml' WHERE [name] = 'Joomla! Update Component Update Site' AND [type] = 'extension'; diff --git a/administrator/components/com_joomlaupdate/joomlaupdate.xml b/administrator/components/com_joomlaupdate/joomlaupdate.xml index 75fe660fd17f6..9bc0b8524e3a3 100644 --- a/administrator/components/com_joomlaupdate/joomlaupdate.xml +++ b/administrator/components/com_joomlaupdate/joomlaupdate.xml @@ -26,7 +26,7 @@ - http://update.joomla.org/core/extensions/com_joomlaupdate.xml + https://update.joomla.org/core/extensions/com_joomlaupdate.xml diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php index 13caaaf00f9ec..07b0ab931c1d7 100644 --- a/administrator/components/com_joomlaupdate/models/default.php +++ b/administrator/components/com_joomlaupdate/models/default.php @@ -37,12 +37,12 @@ public function applyUpdateSite() // "Minor & Patch Release for Current version AND Next Major Release". case 'sts': case 'next': - $updateURL = 'http://update.joomla.org/core/sts/list_sts.xml'; + $updateURL = 'https://update.joomla.org/core/sts/list_sts.xml'; break; // "Testing" case 'testing': - $updateURL = 'http://update.joomla.org/core/test/list_test.xml'; + $updateURL = 'https://update.joomla.org/core/test/list_test.xml'; break; // "Custom" @@ -66,7 +66,7 @@ public function applyUpdateSite() * case 'nochange': */ default: - $updateURL = 'http://update.joomla.org/core/list.xml'; + $updateURL = 'https://update.joomla.org/core/list.xml'; } $db = $this->getDbo(); diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 7d9f19572c75c..68a95af412afa 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -48,7 +48,7 @@ - http://update.joomla.org/core/list.xml - http://update.joomla.org/jed/list.xml + https://update.joomla.org/core/list.xml + https://update.joomla.org/jed/list.xml diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index c0baf0de19ead..5fd5681841527 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -19,7 +19,7 @@ - http://update.joomla.org/language/translationlist_3.xml + https://update.joomla.org/language/translationlist_3.xml diff --git a/components/com_users/controllers/profile_base_json.php b/components/com_users/controllers/profile_base_json.php index 61e4945f58e5f..d0498a3b1a406 100644 --- a/components/com_users/controllers/profile_base_json.php +++ b/components/com_users/controllers/profile_base_json.php @@ -31,7 +31,7 @@ public function gethelpsites() // Set FTP credentials, if given JClientHelper::setCredentialsFromRequest('ftp'); - if (($data = file_get_contents('http://update.joomla.org/helpsites/helpsites.xml')) === false) + if (($data = file_get_contents('https://update.joomla.org/helpsites/helpsites.xml')) === false) { throw new Exception(JText::_('COM_CONFIG_ERROR_HELPREFRESH_FETCH'), 500); } diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index eb189ba95b8a1..4d3fb2f04bbef 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -1784,10 +1784,10 @@ CREATE TABLE IF NOT EXISTS `#__update_sites` ( -- INSERT INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES -(1, 'Joomla! Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 0), -(2, 'Joomla! Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 0), -(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 0), -(4, 'Joomla! Update Component Update Site', 'extension', 'http://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0); +(1, 'Joomla! Core', 'collection', 'https://update.joomla.org/core/list.xml', 1, 0), +(2, 'Joomla! Extension Directory', 'collection', 'https://update.joomla.org/jed/list.xml', 1, 0), +(3, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_3.xml', 1, 0), +(4, 'Joomla! Update Component Update Site', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0); -- -------------------------------------------------------- diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index 3949eeb1e1c2f..2c0e63c83c790 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -1708,10 +1708,10 @@ COMMENT ON TABLE "#__update_sites" IS 'Update Sites'; -- Dumping data for table #__update_sites -- INSERT INTO "#__update_sites" ("update_site_id", "name", "type", "location", "enabled", "last_check_timestamp") VALUES -(1, 'Joomla! Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 0), -(2, 'Joomla! Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 0), -(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 0), -(4, 'Joomla! Update Component Update Site', 'extension', 'http://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0); +(1, 'Joomla! Core', 'collection', 'https://update.joomla.org/core/list.xml', 1, 0), +(2, 'Joomla! Extension Directory', 'collection', 'https://update.joomla.org/jed/list.xml', 1, 0), +(3, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_3.xml', 1, 0), +(4, 'Joomla! Update Component Update Site', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0); SELECT setval('#__update_sites_update_site_id_seq', 5, false); diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index aa3ecd5774730..9e29b39c24d38 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -2711,13 +2711,13 @@ CREATE TABLE [#__update_sites]( SET IDENTITY_INSERT [#__update_sites] ON; INSERT INTO [#__update_sites] ([update_site_id], [name], [type], [location], [enabled], [last_check_timestamp]) -SELECT 1, 'Joomla! Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 0 +SELECT 1, 'Joomla! Core', 'collection', 'https://update.joomla.org/core/list.xml', 1, 0 UNION ALL -SELECT 2, 'Joomla! Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 0 +SELECT 2, 'Joomla! Extension Directory', 'collection', 'https://update.joomla.org/jed/list.xml', 1, 0 UNION ALL -SELECT 3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 0 +SELECT 3, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_3.xml', 1, 0 UNION ALL -SELECT 4, 'Joomla! Update Component Update Site', 'extension', 'http://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0; +SELECT 4, 'Joomla! Update Component Update Site', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0; SET IDENTITY_INSERT [#__update_sites] OFF; From 308b7043f18d6325e144f55fc75c33c7c09110ab Mon Sep 17 00:00:00 2001 From: wojsmol Date: Fri, 1 Apr 2016 19:40:39 +0200 Subject: [PATCH 2/2] 3.5.2 plus current date --- .../updates/mysql/{3.5.1-2016-03-25.sql => 3.5.2-2016-04-01.sql} | 0 .../postgresql/{3.5.1-2016-03-25.sql => 3.5.2-2016-04-01.sql} | 0 .../sqlazure/{3.5.1-2016-03-25.sql => 3.5.2-2016-04-01.sql} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename administrator/components/com_admin/sql/updates/mysql/{3.5.1-2016-03-25.sql => 3.5.2-2016-04-01.sql} (100%) rename administrator/components/com_admin/sql/updates/postgresql/{3.5.1-2016-03-25.sql => 3.5.2-2016-04-01.sql} (100%) rename administrator/components/com_admin/sql/updates/sqlazure/{3.5.1-2016-03-25.sql => 3.5.2-2016-04-01.sql} (100%) diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.2-2016-04-01.sql similarity index 100% rename from administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql rename to administrator/components/com_admin/sql/updates/mysql/3.5.2-2016-04-01.sql diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.1-2016-03-25.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.2-2016-04-01.sql similarity index 100% rename from administrator/components/com_admin/sql/updates/postgresql/3.5.1-2016-03-25.sql rename to administrator/components/com_admin/sql/updates/postgresql/3.5.2-2016-04-01.sql diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.1-2016-03-25.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.2-2016-04-01.sql similarity index 100% rename from administrator/components/com_admin/sql/updates/sqlazure/3.5.1-2016-03-25.sql rename to administrator/components/com_admin/sql/updates/sqlazure/3.5.2-2016-04-01.sql