| @@ -78,21 +78,20 @@ | ||
| 78 | 78 | if ( ! $this->settings['enable_cloudflare'] ) { |
| 79 | 79 | return false; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - $required_settings = [ | |
| 83 | - 'cloudflare_email', | |
| 84 | - 'cloudflare_api_key', | |
| 85 | - 'cloudflare_zone', | |
| 86 | - ]; | |
| 82 | + if ( empty( $this->settings['cloudflare_zone'] ) ) { | |
| 83 | + return false; | |
| 84 | + } | |
| 87 | 85 | |
| 88 | - foreach ( $required_settings as $field ) { | |
| 89 | - if ( empty( $this->settings[ $field ] ) ) { | |
| 90 | - return false; | |
| 91 | - } | |
| 86 | + if ( | |
| 87 | + ( ! empty( $this->settings['cloudflare_email'] ) && ! empty( Cloudflare\Cloudflare::get_cf_api_key() ) ) | |
| 88 | + || ( ! empty( Cloudflare\Cloudflare::get_cf_api_token() ) ) | |
| 89 | + ) { | |
| 90 | + return true; | |
| 92 | 91 | } |
| 93 | 92 | |
| 94 | - return true; | |
| 93 | + return false; | |
| 95 | 94 | } |
| 96 | 95 | |
| 97 | 96 | /** |
| 98 | 97 | * Whether load or not load heartbeat |