[MediaWiki-commits] [Gerrit] Minor updates to reflect switch to HTTPS-only - change (mediawiki...ZeroPortal)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296178

Change subject: Minor updates to reflect switch to HTTPS-only
......................................................................

Minor updates to reflect switch to HTTPS-only

Change-Id: Iaf6f39678067b5d02f748794092749239109e05e
Depends-On: Icd6e271b333ce67f06840277e6360b162778658d
---
M includes/ApiZeroPortal.php
M includes/ZeroConfigView.php
M tests/curl/bannercheck.bash
3 files changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroPortal 
refs/changes/78/296178/1

diff --git a/includes/ApiZeroPortal.php b/includes/ApiZeroPortal.php
index d0a8459..2dae71c 100644
--- a/includes/ApiZeroPortal.php
+++ b/includes/ApiZeroPortal.php
@@ -96,7 +96,6 @@
                                        foreach ( $content->getConfigIds() as 
$id ) {
                                                $content->selectConfigById( $id 
);
                                                $val = array(
-                                                       'https' => 
$content->enableHttps(),
                                                        'languages' => 
$content->whitelistedLangs() ?: true,
                                                        'sites' => 
$content->sites(),
                                                        'via' => 
$content->proxies(),
diff --git a/includes/ZeroConfigView.php b/includes/ZeroConfigView.php
index c062908..99da118 100644
--- a/includes/ZeroConfigView.php
+++ b/includes/ZeroConfigView.php
@@ -69,7 +69,7 @@
 // ********** MOST COMMENTS ARE SET TO DEFAULTS **********
 // If you need the same value as shown, just delete the comment.
 //
-//    "bannerUrl": "http://wikipedia.org";,
+//    "bannerUrl": "https://wikipedia.org";,
 //    "background": "#E31230",
 //    "foreground": "#551011",
 
@@ -80,7 +80,6 @@
 //    ],
 //    "whitelistedLangs": [],   <-- ALL by default
 //    "proxies": [ "DIRECT" ]
-//    "enableHttps": false
 //    "bannerWarning": false,
     }],
 
diff --git a/tests/curl/bannercheck.bash b/tests/curl/bannercheck.bash
index 31397b6..1e480df 100755
--- a/tests/curl/bannercheck.bash
+++ b/tests/curl/bannercheck.bash
@@ -2,10 +2,10 @@
 
 EMAIL=`cat emailbanner`
 
-RAWUNKNOWN=`curl --silent --header "X-CS: NOPE" 
"http://en.m.wikipedia.org/w/api.php?action=zeroconfig&type=config"`
+RAWUNKNOWN=`curl --silent --header "X-CS: NOPE" 
"https://en.m.wikipedia.org/w/api.php?action=zeroconfig&type=config"`
 UNKNOWN=`echo $RAWUNKNOWN | grep '{"enabled":false}'`
 
-RAWKNOWN=`curl --silent --header "X-CS: 250-99" 
http://en.m.wikipedia.org/wiki/Special:ZeroRatedMobileAccess?zcmd=js-banner`
+RAWKNOWN=`curl --silent --header "X-CS: 250-99" 
https://en.m.wikipedia.org/wiki/Special:ZeroRatedMobileAccess?zcmd=js-banner`
 KNOWN=`echo $RAWKNOWN | grep 'enabled":true,' | grep 'zero-rated-banner-text'`
 
 STATUS="OK"

-- 
To view, visit https://gerrit.wikimedia.org/r/296178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf6f39678067b5d02f748794092749239109e05e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroPortal
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits