Skip to content

Commit 6d3dd16

Browse files
author
Rafael Grigorian
committed
Fixed #109 
1 parent 68be89c commit 6d3dd16

File tree

14 files changed

+34
-27
lines changed

14 files changed

+34
-27
lines changed

‎src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Dns/CloudflareNameservers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class JetRails_Cloudflare_Model_Adminhtml_Api_Dns_CloudflareNameservers
2929
*/
3030
public function getValue () {
3131
$response = parent::getValue ();
32-
if ( $response->success ) {
32+
if ( isset ( $response->success ) && $response->success ) {
3333
$response->result = $response->result->name_servers;
3434
}
3535
return $response;

‎src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Firewall/UserAgentBlocking.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,16 @@ public function usage () {
106106
$api = Mage::getModel ("cloudflare/api_request");
107107
$api->setType ( $api::REQUEST_GET );
108108
$result = $api->resolve ( $endpoint );
109-
$result = array_filter ( $result->result, function ( $i ) {
110-
return $i->scope === "zone";
111-
});
112-
return $result [ 0 ];
109+
if ( isset ( $result->result ) ) {
110+
$result = array_filter ( $result->result, function ( $i ) {
111+
return $i->scope === "zone";
112+
});
113+
return $result [ 0 ];
114+
}
115+
return [
116+
"used" => 0,
117+
"max" => 0
118+
];
113119
}
114120

115121
}

‎src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Overview/Configuration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ public function validateAuth ( $zone = null, $token = null ) {
2323
$api = Mage::getModel ("cloudflare/api_request");
2424
$api->setType ( $api::REQUEST_GET );
2525
$response = $api->resolve ("user/tokens/verify");
26-
if ( !$response->success ) {
26+
if ( !isset ( $response->success ) && $response->success ) {
2727
return false;
2828
}
2929
if ( !$zone ) $zone = $this->getZoneId ();
3030
$response = $api->resolve ("zones/$zone");
31-
return $response->success;
31+
return isset ( $response->success ) && $response->success;
3232
}
3333

3434
/**

‎src/app/code/community/JetRails/Cloudflare/Model/Adminhtml/Api/Speed/Polish.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function change ( $value, $webp ) {
4545
$api->setType ( $api::REQUEST_PATCH );
4646
$api->setData ( array ( "value" => $value ) );
4747
$response = $api->resolve ( $endpoint );
48-
if ( $response->success && $value != "off" ) {
48+
if ( isset ( $response->success ) && $response->success && $value != "off" ) {
4949
$endpoint = $this->getEndpoint ("settings/webp");
5050
$api = Mage::getModel ("cloudflare/api_request");
5151
$api->setType ( $api::REQUEST_PATCH );

‎src/app/code/community/JetRails/Cloudflare/controllers/Cloudflare/Api/Caching/PurgeCacheController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class JetRails_Cloudflare_Cloudflare_Api_Caching_PurgeCacheController
2121
public function everythingAction () {
2222
$api = Mage::getModel ("cloudflare/api_caching_purgeCache");
2323
$response = $api->purgeEverything ();
24-
if ( $response->success ) {
24+
if ( isset ( $response->success ) && $response->success ) {
2525
$response->messages = array_merge (
2626
array (
2727
"Successfully purged all assets. Please allow up to " .
@@ -42,7 +42,7 @@ public function individualAction () {
4242
$api = Mage::getModel ("cloudflare/api_caching_purgeCache");
4343
$files = $this->_request->getParam ("files");
4444
$response = $api->purgeIndividual ( $files );
45-
if ( $response->success ) {
45+
if ( isset ( $response->success ) && $response->success ) {
4646
$response->messages = array_merge (
4747
array (
4848
"Successfully purged assets. Please allow up to 30 " .

‎src/app/design/adminhtml/base/default/template/cloudflare/caching/caching_level.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<section
2-
class="cloudflare caching development_mode initialize loading"
2+
class="cloudflare caching caching_level initialize loading"
33
data-endpoint="<?php echo $this->getApiEndpoint () ?>"
44
data-form-key="<?php echo $this->getFormKey () ?>"
55
data-tab-name="caching"

‎src/app/design/adminhtml/base/default/template/cloudflare/page_rules/page_rules.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<div class="row" >
88
<div class="wrapper_left" >
99
<span class="section_title" >Page Rules</span>
10-
<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>
1110
<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>
11+
<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>
1212
</div>
1313
<div class="wrapper_right" >
1414
<div>

‎src/skin/adminhtml/base/default/js/cloudflare/caching/caching_level.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const $ = require ("jquery")
22
const notification = require ("cloudflare/core/notification")
3+
const common = require ("cloudflare/common")
34

45
$(document).on ( "cloudflare.caching.caching_level.initialize", ( event, data ) => {
56
var label = data.response.result.value
@@ -15,7 +16,7 @@ $(document).on ( "cloudflare.caching.caching_level.update", ( event, data ) => {
1516
data: { "form_key": data.form.key, "value": newValue },
1617
success: ( response ) => {
1718
notification.showMessages ( response )
18-
$(data.section).removeClass ("loading")
19+
common.loadSections (".caching_level")
1920
}
2021
})
2122
})

‎src/skin/adminhtml/base/default/js/cloudflare/dns/dns_records.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const $ = require ("jquery")
2-
const cloudflare = require ("cloudflare/common")
32
const common = require ("cloudflare/common")
43
const notification = require ("cloudflare/core/notification")
54
const modal = require ("cloudflare/core/modal")
@@ -245,7 +244,7 @@ $(document).on ( "cloudflare.dns.dns_records.create", function ( event, data ) {
245244
if ( response.success ) {
246245
$(data.section).find ("[name='name'],[name='content']").val ("")
247246
$(data.section).addClass ("loading")
248-
cloudflare.loadSections (".dns.dns_records")
247+
common.loadSections (".dns.dns_records")
249248
}
250249
}
251250
})
@@ -594,7 +593,7 @@ $(document).on ( "cloudflare.dns.dns_records.upload", function ( event, data ) {
594593
if ( response.success && response.result.recs_added == response.result.total_records_parsed ) {
595594
prompt.close ()
596595
$(data.section).addClass ("loading")
597-
cloudflare.loadSections (".dns.dns_records")
596+
common.loadSections (".dns.dns_records")
598597
}
599598
else if ( response.success ) {
600599
$(prompt.components.modal).removeClass ("loading")
@@ -606,7 +605,7 @@ $(document).on ( "cloudflare.dns.dns_records.upload", function ( event, data ) {
606605
$(messagesContainer).append ( $("<div>").text ( message.message ) )
607606
})
608607
if ( response.result.recs_added > 0 ) {
609-
cloudflare.loadSections (".dns.dns_records")
608+
common.loadSections (".dns.dns_records")
610609
}
611610
}
612611
else {

‎src/skin/adminhtml/base/default/js/cloudflare/firewall/access_rules.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const $ = require ("jquery")
2-
const cloudflare = require ("cloudflare/common")
32
const common = require ("cloudflare/common")
43
const notification = require ("cloudflare/core/notification")
54
const modal = require ("cloudflare/core/modal")

‎src/skin/adminhtml/base/default/js/cloudflare/generic/select.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const $ = require ("jquery")
2-
const cloudflare = require ("cloudflare/common")
2+
const common = require ("cloudflare/common")
33
const notification = require ("cloudflare/core/notification")
44

55
function initialize ( event, data ) {
@@ -21,7 +21,7 @@ function update ( event, data ) {
2121
}
2222
else {
2323
let targetSection = `${data.target.tab}.${data.target.section}`
24-
cloudflare.loadSections (`.cloudflare.${targetSection}`)
24+
common.loadSections (`.cloudflare.${targetSection}`)
2525
}
2626
}
2727
})

‎src/skin/adminhtml/base/default/js/cloudflare/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const $ = require ("jquery")
22
const notification = require ("cloudflare/core/notification")
3-
const cloudflare = require ("cloudflare/common")
3+
const common = require ("cloudflare/common")
44
const global = require ("cloudflare/global")
55
const requireAll = ( r ) => { r.keys ().forEach ( r ) }
66

@@ -39,7 +39,7 @@ $(window).on ( "load", function () {
3939
oldAjax.apply ( null, arguments )
4040
}
4141

42-
cloudflare.loadSections (".overview")
42+
common.loadSections (".overview")
4343

4444
$(".proxied").each ( ( index ) => {
4545
$(this).data ( "value", /proxied_on/.test ( $(this).attr ("src") ) )
@@ -138,5 +138,5 @@ $(document).on ( "click", ".cloudflare-dashboard ul.tabs li", function () {
138138
$(`.cloudflare-dashboard .content[data-target='${target}']`).addClass ("selected")
139139
$(this).addClass ("selected")
140140
$(`.initialize.${target}`).addClass ("loading")
141-
cloudflare.loadSections (`.${target}`)
141+
common.loadSections (`.${target}`)
142142
})

‎src/skin/adminhtml/base/default/js/cloudflare/speed/auto_minify.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const $ = require ("jquery")
2-
const cloudflare = require ("cloudflare/common")
32
const notification = require ("cloudflare/core/notification")
43
const common = require ("cloudflare/common")
54

‎src/skin/adminhtml/base/default/scss/cloudflare/core/modal.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,15 @@
271271
}
272272
}
273273
&.loading {
274-
> .container {
274+
pointer-events: none;
275+
.container {
275276
overflow: hidden;
276277
}
277-
> .container:after {
278+
.container:after {
278279
visibility: visible;
279-
background-color: rgba( 0, 0, 0, 0.5 );
280+
background-color: rgba( 0, 0, 0, 0.5 );
281+
cursor: not-allowed;
282+
content: "";
280283
}
281284
}
282285
}

0 commit comments

Comments
 (0)