Fixed #109

Rafael Grigorian · Rafael Grigorian · commit 6d3dd16685d4 · 2020-05-18T15:16:06.000-05:00
diff --git a/src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Dns/CloudflareNameservers.php b/src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Dns/CloudflareNameservers.php
@@ -29,7 +29,7 @@ class JetRails_Cloudflare_Model_Adminhtml_Api_Dns_CloudflareNameservers
 		 */
 		public function getValue () {
 			$response = parent::getValue ();
-			if ( $response->success ) {
+			if ( isset ( $response->success ) && $response->success ) {
 				$response->result = $response->result->name_servers;
 			}
 			return $response;
diff --git a/src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Firewall/UserAgentBlocking.php b/src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Firewall/UserAgentBlocking.php
@@ -106,10 +106,16 @@ public function usage () {
 			$api = Mage::getModel ("cloudflare/api_request");
 			$api->setType ( $api::REQUEST_GET );
 			$result = $api->resolve ( $endpoint );
-			$result = array_filter ( $result->result, function ( $i ) {
-				return $i->scope === "zone";
-			});
-			return $result [ 0 ];
+			if ( isset ( $result->result ) ) {
+				$result = array_filter ( $result->result, function ( $i ) {
+					return $i->scope === "zone";
+				});
+				return $result [ 0 ];
+			}
+			return [
+				"used" => 0,
+				"max" => 0
+			];
 		}
 
 	}
diff --git a/src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Overview/Configuration.php b/src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Overview/Configuration.php
@@ -23,12 +23,12 @@ public function validateAuth ( $zone = null, $token = null ) {
 			$api = Mage::getModel ("cloudflare/api_request");
 			$api->setType ( $api::REQUEST_GET );
 			$response = $api->resolve ("user/tokens/verify");
-			if ( !$response->success ) {
+			if ( !isset ( $response->success ) && $response->success ) {
 				return false;
 			}
 			if ( !$zone ) $zone = $this->getZoneId ();
 			$response = $api->resolve ("zones/$zone");
-			return $response->success;
+			return isset ( $response->success ) && $response->success;
 		}
 
 		/**
diff --git a/src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Speed/Polish.php b/src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Speed/Polish.php
@@ -45,7 +45,7 @@ public function change ( $value, $webp ) {
 			$api->setType ( $api::REQUEST_PATCH );
 			$api->setData ( array ( "value" => $value ) );
 			$response = $api->resolve ( $endpoint );
-			if ( $response->success && $value != "off" ) {
+			if ( isset ( $response->success ) && $response->success && $value != "off" ) {
 				$endpoint = $this->getEndpoint ("settings/webp");
 				$api = Mage::getModel ("cloudflare/api_request");
 				$api->setType ( $api::REQUEST_PATCH );
diff --git a/src/app/code/community/JetRails/Cloudflare/controllers/Cloudflare/Api/Caching/PurgeCacheController.php b/src/app/code/community/JetRails/Cloudflare/controllers/Cloudflare/Api/Caching/PurgeCacheController.php
@@ -21,7 +21,7 @@ class JetRails_Cloudflare_Cloudflare_Api_Caching_PurgeCacheController
 		public function everythingAction () {
 			$api = Mage::getModel ("cloudflare/api_caching_purgeCache");
 			$response = $api->purgeEverything ();
-			if ( $response->success ) {
+			if ( isset ( $response->success ) && $response->success ) {
 				$response->messages = array_merge (
 					array (
 						"Successfully purged all assets. Please allow up to " .
@@ -42,7 +42,7 @@ public function individualAction () {
 			$api = Mage::getModel ("cloudflare/api_caching_purgeCache");
 			$files = $this->_request->getParam ("files");
 			$response = $api->purgeIndividual ( $files );
-			if ( $response->success ) {
+			if ( isset ( $response->success ) && $response->success ) {
 				$response->messages = array_merge (
 					array (
 						"Successfully purged assets. Please allow up to 30 " .
diff --git a/src/app/design/adminhtml/base/default/template/cloudflare/caching/caching_level.phtml b/src/app/design/adminhtml/base/default/template/cloudflare/caching/caching_level.phtml
@@ -1,5 +1,5 @@
 <section
-	class="cloudflare caching development_mode initialize loading"
+	class="cloudflare caching caching_level initialize loading"
 	data-endpoint="<?php echo $this->getApiEndpoint () ?>"
 	data-form-key="<?php echo $this->getFormKey () ?>"
 	data-tab-name="caching"
diff --git a/src/app/design/adminhtml/base/default/template/cloudflare/page_rules/page_rules.phtml b/src/app/design/adminhtml/base/default/template/cloudflare/page_rules/page_rules.phtml
@@ -7,8 +7,8 @@
 	<div class="row" >
 		<div class="wrapper_left" >
 			<span class="section_title" >Page Rules</span>
-			<p><strong>You have <span id="rules_left" >0</span> Page Rules left</strong>. <a target="_blank" href="https://support.cloudflare.com/hc/en-us/articles/225894428-How-To-Buy-Additional-Page-Rules" >Buy More Page Rules</a></p>
 			<p>Page Rules let you control which Cloudflare settings trigger on a given URL. Only one Page Rule will trigger per URL, so it is helpful if you sort Page Rules in priority order, and make your URL patterns as specific as possible.</p>
+			<p><strong>You have <span id="rules_left" >0</span> Page Rules left</strong>. <a target="_blank" href="https://support.cloudflare.com/hc/en-us/articles/225894428-How-To-Buy-Additional-Page-Rules" >Buy More Page Rules</a></p>
 		</div>
 		<div class="wrapper_right" >
 			<div>
diff --git a/src/skin/adminhtml/base/default/js/cloudflare/caching/caching_level.js b/src/skin/adminhtml/base/default/js/cloudflare/caching/caching_level.js
@@ -1,5 +1,6 @@
 const $ = require ("jquery")
 const notification = require ("cloudflare/core/notification")
+const common = require ("cloudflare/common")
 
 $(document).on ( "cloudflare.caching.caching_level.initialize", ( event, data ) => {
 	var label = data.response.result.value
@@ -15,7 +16,7 @@ $(document).on ( "cloudflare.caching.caching_level.update", ( event, data ) => {
 		data: { "form_key": data.form.key, "value": newValue },
 		success: ( response ) => {
 			notification.showMessages ( response )
-			$(data.section).removeClass ("loading")
+			common.loadSections (".caching_level")
 		}
 	})
 })
diff --git a/src/skin/adminhtml/base/default/js/cloudflare/dns/dns_records.js b/src/skin/adminhtml/base/default/js/cloudflare/dns/dns_records.js
@@ -1,5 +1,4 @@
 const $ = require ("jquery")
-const cloudflare = require ("cloudflare/common")
 const common = require ("cloudflare/common")
 const notification = require ("cloudflare/core/notification")
 const modal = require ("cloudflare/core/modal")
@@ -245,7 +244,7 @@ $(document).on ( "cloudflare.dns.dns_records.create", function ( event, data ) {
 			if ( response.success ) {
 				$(data.section).find ("[name='name'],[name='content']").val ("")
 				$(data.section).addClass ("loading")
-				cloudflare.loadSections (".dns.dns_records")
+				common.loadSections (".dns.dns_records")
 			}
 		}
 	})
@@ -594,7 +593,7 @@ $(document).on ( "cloudflare.dns.dns_records.upload", function ( event, data ) {
 					if ( response.success && response.result.recs_added == response.result.total_records_parsed ) {
 						prompt.close ()
 						$(data.section).addClass ("loading")
-						cloudflare.loadSections (".dns.dns_records")
+						common.loadSections (".dns.dns_records")
 					}
 					else if ( response.success ) {
 						$(prompt.components.modal).removeClass ("loading")
@@ -606,7 +605,7 @@ $(document).on ( "cloudflare.dns.dns_records.upload", function ( event, data ) {
 							$(messagesContainer).append ( $("<div>").text ( message.message ) )
 						})
 						if ( response.result.recs_added > 0 ) {
-							cloudflare.loadSections (".dns.dns_records")
+							common.loadSections (".dns.dns_records")
 						}
 					}
 					else {
diff --git a/src/skin/adminhtml/base/default/js/cloudflare/firewall/access_rules.js b/src/skin/adminhtml/base/default/js/cloudflare/firewall/access_rules.js
@@ -1,5 +1,4 @@
 const $ = require ("jquery")
-const cloudflare = require ("cloudflare/common")
 const common = require ("cloudflare/common")
 const notification = require ("cloudflare/core/notification")
 const modal = require ("cloudflare/core/modal")
diff --git a/src/skin/adminhtml/base/default/js/cloudflare/generic/select.js b/src/skin/adminhtml/base/default/js/cloudflare/generic/select.js
@@ -1,5 +1,5 @@
 const $ = require ("jquery")
-const cloudflare = require ("cloudflare/common")
+const common = require ("cloudflare/common")
 const notification = require ("cloudflare/core/notification")
 
 function initialize ( event, data ) {
@@ -21,7 +21,7 @@ function update ( event, data ) {
 			}
 			else {
 				let targetSection = `${data.target.tab}.${data.target.section}`
-				cloudflare.loadSections (`.cloudflare.${targetSection}`)
+				common.loadSections (`.cloudflare.${targetSection}`)
 			}
 		}
 	})
diff --git a/src/skin/adminhtml/base/default/js/cloudflare/index.js b/src/skin/adminhtml/base/default/js/cloudflare/index.js
@@ -1,6 +1,6 @@
 const $ = require ("jquery")
 const notification = require ("cloudflare/core/notification")
-const cloudflare = require ("cloudflare/common")
+const common = require ("cloudflare/common")
 const global = require ("cloudflare/global")
 const requireAll = ( r ) => { r.keys ().forEach ( r ) }
 
@@ -39,7 +39,7 @@ $(window).on ( "load", function () {
 		oldAjax.apply ( null, arguments )
 	}
 
-	cloudflare.loadSections (".overview")
+	common.loadSections (".overview")
 
 	$(".proxied").each ( ( index ) => {
 		$(this).data ( "value", /proxied_on/.test ( $(this).attr ("src") ) )
@@ -138,5 +138,5 @@ $(document).on ( "click", ".cloudflare-dashboard ul.tabs li", function () {
 	$(`.cloudflare-dashboard .content[data-target='${target}']`).addClass ("selected")
 	$(this).addClass ("selected")
 	$(`.initialize.${target}`).addClass ("loading")
-	cloudflare.loadSections (`.${target}`)
+	common.loadSections (`.${target}`)
 })
diff --git a/src/skin/adminhtml/base/default/js/cloudflare/speed/auto_minify.js b/src/skin/adminhtml/base/default/js/cloudflare/speed/auto_minify.js
@@ -1,5 +1,4 @@
 const $ = require ("jquery")
-const cloudflare = require ("cloudflare/common")
 const notification = require ("cloudflare/core/notification")
 const common = require ("cloudflare/common")
 
diff --git a/src/skin/adminhtml/base/default/scss/cloudflare/core/modal.scss b/src/skin/adminhtml/base/default/scss/cloudflare/core/modal.scss
@@ -271,12 +271,15 @@
 			}
 		}
 		&.loading {
-			> .container {
+			pointer-events: none;
+			.container {
 				overflow: hidden;
 			}
-			> .container:after {
+			.container:after {
 				visibility: visible;
-			    background-color: rgba( 0, 0, 0, 0.5 );
+				background-color: rgba( 0, 0, 0, 0.5 );
+				cursor: not-allowed;
+				content: "";
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class JetRails_Cloudflare_Model_Adminhtml_Api_Dns_CloudflareNameservers`
`29`	`29`	`*/`
`30`	`30`	`public function getValue () {`
`31`	`31`	`$response = parent::getValue ();`
`32`		`- if ( $response->success ) {`
	`32`	`+ if ( isset ( $response->success ) && $response->success ) {`
`33`	`33`	`$response->result = $response->result->name_servers;`
`34`	`34`	`}`
`35`	`35`	`return $response;`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ public function validateAuth ( $zone = null, $token = null ) {`
`23`	`23`	`$api = Mage::getModel ("cloudflare/api_request");`
`24`	`24`	`$api->setType ( $api::REQUEST_GET );`
`25`	`25`	`$response = $api->resolve ("user/tokens/verify");`
`26`		`- if ( !$response->success ) {`
	`26`	`+ if ( !isset ( $response->success ) && $response->success ) {`
`27`	`27`	`return false;`
`28`	`28`	`}`
`29`	`29`	`if ( !$zone ) $zone = $this->getZoneId ();`
`30`	`30`	`$response = $api->resolve ("zones/$zone");`
`31`		`- return $response->success;`
	`31`	`+ return isset ( $response->success ) && $response->success;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`const $ = require ("jquery")`
`2`		`-const cloudflare = require ("cloudflare/common")`
`3`	`2`	`const common = require ("cloudflare/common")`
`4`	`3`	`const notification = require ("cloudflare/core/notification")`
`5`	`4`	`const modal = require ("cloudflare/core/modal")`