Merge lp:~vorlon/ubuntu-qa-website/https into lp:ubuntu-qa-website

[Steve Langasek]

[Paride Legovini (paride)]

LGTM, thanks Steve.

review: Approve

[Paride Legovini (paride)]

After merging there we'll need to somehow deploy the change to production, I suppose. We (Ubuntu QA) will try to figure it out after the Jammy point release: better not to break everything this week.

[Brian Murray (brian-murray)]

The actual update of the site is being tracked in RT 152584.

=== modified file 'modules/qatracker/admin/qatracker.admin.sites.php'
--- modules/qatracker/admin/qatracker.admin.sites.php	2012-09-19 21:14:48 +0000
+++ modules/qatracker/admin/qatracker.admin.sites.php	2022-07-21 17:36:53 +0000
@@ -36,7 +36,7 @@
     foreach ($result as $record) {
         $rows[] = array(
             $record->title,
-            l($record->subdomain, "http://".$record->subdomain),
+            l($record->subdomain, "https://".$record->subdomain),
             array_key_exists($record->userrole, $mapping) ? $mapping[$record->userrole] : $record->userrole,
             array_key_exists($record->adminrole, $mapping) ? $mapping[$record->adminrole] : $record->adminrole,
             array_key_exists($record->testcaserole, $mapping) ? $mapping[$record->testcaserole] : $record->testcaserole,

=== modified file 'modules/qatracker/qatracker.functions.php'
--- modules/qatracker/qatracker.functions.php	2016-01-20 07:59:52 +0000
+++ modules/qatracker/qatracker.functions.php	2022-07-21 17:36:53 +0000
@@ -90,7 +90,7 @@
                     <br />
                     ".t("Bug information are updated every 5 minutes.")."
                 </div>
-                <a class=\"blacklink\" rel=\"external\" href=\"http://launchpad.net/bugs/".$bug->originalbug."\">$icon</a>
+                <a class=\"blacklink\" rel=\"external\" href=\"https://launchpad.net/bugs/".$bug->originalbug."\">$icon</a>
             </div>";
     }
     else {
@@ -129,7 +129,7 @@
                         )."
                     </i>
                 </div>
-                <a class=\"blacklink\" rel=\"external\" href=\"http://launchpad.net/bugs/".$bug->bugnumber."\">$icon</a>
+                <a class=\"blacklink\" rel=\"external\" href=\"https://launchpad.net/bugs/".$bug->bugnumber."\">$icon</a>
             </div>";
     }
 }

=== modified file 'modules/qatracker/report/qatracker.report.bugs.php'
--- modules/qatracker/report/qatracker.report.bugs.php	2012-11-19 20:35:32 +0000
+++ modules/qatracker/report/qatracker.report.bugs.php	2022-07-21 17:36:53 +0000
@@ -64,7 +64,7 @@
         return $items;
     }
 
-    drupal_set_title(t("List of results for !bug (and its duplicates)", array("!bug" => l("bug #".arg(3), "http://bugs.launchpad.net/bugs/".arg(3)))), $output = PASS_THROUGH);
+    drupal_set_title(t("List of results for !bug (and its duplicates)", array("!bug" => l("bug #".arg(3), "https://bugs.launchpad.net/bugs/".arg(3)))), $output = PASS_THROUGH);
 
     # Getting all the entries
     $query = db_select('qatracker_launchpad_bug');

=== modified file 'modules/qatracker/report/qatracker.report.defects.php'
--- modules/qatracker/report/qatracker.report.defects.php	2016-03-24 13:52:19 +0000
+++ modules/qatracker/report/qatracker.report.defects.php	2022-07-21 17:36:53 +0000
@@ -160,7 +160,7 @@
             $rows[] = array(
                 'data' => array(
                     l($record->bugnumber,
-                        'http://bugs.launchpad.net/bugs/' . $record->bugnumber),
+                        'https://bugs.launchpad.net/bugs/' . $record->bugnumber),
                     $record->btitle,
                     str_replace(' (Ubuntu)', '', $record->product),
                     $record->status,

=== modified file 'modules/qatracker/report/qatracker.report.subscriptions.php'
--- modules/qatracker/report/qatracker.report.subscriptions.php	2012-11-19 20:35:32 +0000
+++ modules/qatracker/report/qatracker.report.subscriptions.php	2022-07-21 17:36:53 +0000
@@ -157,7 +157,7 @@
     $rows = array();
     foreach ($users_result as $entry) {
         #FIXME: hardcoded launchpad.net
-        $rows[] = array(l($entry->name, "http://launchpad.net/~".$entry->name), $entry->count);
+        $rows[] = array(l($entry->name, "https://launchpad.net/~".$entry->name), $entry->count);
     }
 
     $items[] = array(

=== modified file 'modules/qatracker/report/qatracker.report.testers.php'
--- modules/qatracker/report/qatracker.report.testers.php	2015-12-13 21:40:21 +0000
+++ modules/qatracker/report/qatracker.report.testers.php	2022-07-21 17:36:53 +0000
@@ -99,7 +99,7 @@
         # hardcoding Launchpad
         $rows[] = array(
             $position,
-            l($record->name, "http://launchpad.net/~".$record->name),
+            l($record->name, "https://launchpad.net/~".$record->name),
             $record->count,
         );
         if (arg(3) != "top100") {

=== modified file 'modules/qatracker/user/qatracker.user.results.php'
--- modules/qatracker/user/qatracker.user.results.php	2016-01-20 21:11:19 +0000
+++ modules/qatracker/user/qatracker.user.results.php	2022-07-21 17:36:53 +0000
@@ -410,7 +410,7 @@
         # hardcoding Launchpad
         $data = array(
             $icon,
-            l($account->name, "http://launchpad.net/~".$account->name),
+            l($account->name, "https://launchpad.net/~".$account->name),
             format_date(strtotime($record->last_touched), 'short'),
             array('data' => $bugs, 'style' => 'text-align:center;'),
             check_markup($record->comment),
@@ -880,7 +880,7 @@
     foreach ($bugs as $bug) {
         if (!empty($bug->bugnumber)) {
             $rows[] = array(
-                '<a href="http://launchpad.net/bugs/'.$bug->bugnumber.'">'.$bug->bugnumber.'</a>',
+                '<a href="https://launchpad.net/bugs/'.$bug->bugnumber.'">'.$bug->bugnumber.'</a>',
                 $bug->title,
                 $bug->status,
                 $bug->importance,

=== modified file 'scripts/sync-lp-bugs'
--- scripts/sync-lp-bugs	2017-03-29 16:56:36 +0000
+++ scripts/sync-lp-bugs	2022-07-21 17:36:53 +0000
@@ -153,9 +153,9 @@
 
     site_comment = None
     site_tags = None
-    site_rpc = xmlrpclib.ServerProxy("http://%s/xmlrpc.php" %
+    site_rpc = xmlrpclib.ServerProxy("https://%s/xmlrpc.php" %
                                             site_domain).qatracker
-    site_bugurl = "http://%s/qatracker/reports/bugs" % site_domain
+    site_bugurl = "https://%s/qatracker/reports/bugs" % site_domain
 
     # Start by looking for the site in the database
     site_dbrecords = store.find(Site, subdomain=unicode(site_domain))