Skip to content

Commit 41bc7e3

Browse files
author
Rafael Grigorian
committed
Fixed #20
1 parent c106d16 commit 41bc7e3

File tree

21 files changed

+1282
-670
lines changed

21 files changed

+1282
-670
lines changed

src/app/code/JetRails/Cloudflare/Controller/Adminhtml/Api/Caching/PurgeCache/Everything.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Everything extends Action {
2323
*/
2424
public function execute () {
2525
$response = $this->_api->purgeEverything ();
26-
if ( $response->success ) {
26+
if ( isset ( $response->success ) && $response->success ) {
2727
$response->messages = array_merge (
2828
array (
2929
"Successfully purged all assets. Please allow up to " .

src/app/code/JetRails/Cloudflare/Controller/Adminhtml/Api/Caching/PurgeCache/Individual.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Individual extends Action {
2424
public function execute () {
2525
$files = $this->_request->getParam ("files");
2626
$response = $this->_api->purgeIndividual ( $files );
27-
if ( $response->success ) {
27+
if ( isset ( $response->success ) && $response->success ) {
2828
$response->messages = array_merge (
2929
array (
3030
"Successfully purged assets. Please allow up to 30 " .

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class CloudflareNameservers extends Getter {
3232
*/
3333
public function getValue () {
3434
$response = parent::getValue ();
35-
if ( $response->success ) {
35+
if ( isset ( $response->success ) && $response->success ) {
3636
$response->result = $response->result->name_servers;
3737
}
3838
return $response;

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,16 @@ public function usage () {
116116
$endpoint = $this->getEndpoint ("firewall/ua_rules/usage");
117117
$this->_requestModel->setType ( Request::REQUEST_GET );
118118
$result = $this->_requestModel->resolve ( $endpoint );
119-
$result = array_filter ( $result->result, function ( $i ) {
120-
return $i->scope === "zone";
121-
});
122-
return $result [ 0 ];
119+
if ( isset ( $result->result ) ) {
120+
$result = array_filter ( $result->result, function ( $i ) {
121+
return $i->scope === "zone";
122+
});
123+
return $result [ 0 ];
124+
}
125+
return [
126+
"used" => 0,
127+
"max" => 0
128+
];
123129
}
124130

125131
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public function __construct (
4040
public function validateAuth () {
4141
$this->_request->setType ( Request::REQUEST_GET );
4242
$response = $this->_request->resolve ("user/tokens/verify");
43-
if ( !$response->success ) {
43+
if ( !isset ( $response->success ) && $response->success ) {
4444
return false;
4545
}
4646
$zone = $this->getZoneId ();
4747
$response = $this->_request->resolve ("zones/$zone");
48-
return $response->success;
48+
return isset ( $response->success ) && $response->success;
4949
}
5050

5151
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function change ( $value, $webp ) {
6060
$this->_requestModel->setData ( array ( "value" => $value ) );
6161
$response = $this->_requestModel->resolve ( $endpoint );
6262
$zoneId = $this->_configurationModel->getZoneId ();
63-
if ( $response->success && $value != "off" ) {
63+
if ( isset ( $response->success ) && $response->success && $value != "off" ) {
6464
$endpoint = sprintf ( "zones/%s/settings/webp", $zoneId );
6565
$this->_requestModel->setType ( Request::REQUEST_PATCH );
6666
$this->_requestModel->setData ( array (

src/app/code/JetRails/Cloudflare/view/adminhtml/web/css/bundle.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)