Dr0ptp4kt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/63242
Change subject: Enforce the JSON configuration page for each carrier's
"enabled" field.
......................................................................
Enforce the JSON configuration page for each carrier's "enabled" field.
* Make it possible to rapidly disable or enable display of banners for
a carrier.
Change-Id: Iffd9cf59339e33472fa6ac271a83bdc08149c63b
---
M includes/PageRenderingHooks.php
1 file changed, 8 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/42/63242/1
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index a18b5a6..e540b8a 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -110,7 +110,12 @@
if ( $carrierId === null ) {
$carrierId = $wgRequest->getHeader( 'X-CS' );
}
+
if ( $carrierId !== '(null)' && $carrierId ) {
+ self::$carrier = $this->lookupCarrier(
$carrierId );
+ }
+
+ if ( self::$carrier['enabled'] ) {
self::$renderZeroRatedBanner = true;
self::$carrierId = $carrierId;
} else {
@@ -176,8 +181,10 @@
}
$options = array();
- $options['toggle_view_desktop'] =
'&renderZeroRatedBanner=true&renderwarning=yes&returnto=';
+ $zeroRedirects =
'&renderZeroRatedBanner=true&renderwarning=yes&returnto=';
+ $options['toggle_view_desktop'] =
$zeroRedirects;
$options['supported_languages'] =
self::$carrier['showLangs'];
+ $options['zeroRedirects'] = $zeroRedirects;
}
if ( self::$renderWarning && self::$acceptBilling !==
'yes' && self::$renderZeroRatedBanner === true ) {
--
To view, visit https://gerrit.wikimedia.org/r/63242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffd9cf59339e33472fa6ac271a83bdc08149c63b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
