| @@ -9,9 +9,9 @@ | ||
| 9 | 9 | public $brandname = 'WP Remote'; |
| 10 | 10 | public $badgeinfo = 'wprbadge'; |
| 11 | 11 | public $ip_header_option = 'wpripheader'; |
| 12 | 12 | public $brand_option = 'wprbrand'; |
| 13 | - public $version = '5.41'; | |
| 13 | + public $version = '4.74'; | |
| 14 | 14 | public $webpage = 'https://wpremote.com'; |
| 15 | 15 | public $appurl = 'https://app.wpremote.com'; |
| 16 | 16 | public $slug = 'wpremote/plugin.php'; |
| 17 | 17 | public $plug_redirect = 'wprredirect'; |
| @@ -17,12 +17,10 @@ | ||
| 17 | 17 | public $plug_redirect = 'wprredirect'; |
| 18 | 18 | public $logo = '../img/wprlogo.png'; |
| 19 | 19 | public $brand_icon = '/img/icon.png'; |
| 20 | 20 | public $services_option_name = 'wprconfig'; |
| 21 | - public $author = 'WP Remote'; | |
| 22 | - public $title = 'WP Remote'; | |
| 23 | 21 | |
| 24 | - const DB_VERSION = '4'; | |
| 22 | + const DB_VERSION = '3'; | |
| 25 | 23 | |
| 26 | 24 | public function __construct($settings) { |
| 27 | 25 | $this->settings = $settings; |
| 28 | 26 | $this->config = $this->settings->getOption($this->services_option_name); |
| @@ -39,25 +37,8 @@ | ||
| 39 | 37 | public function hasValidDBVersion() { |
| 40 | 38 | return WPRInfo::DB_VERSION === $this->getCurrentDBVersion(); |
| 41 | 39 | } |
| 42 | 40 | |
| 43 | - public function getLatestWooCommerceDBVersion() { | |
| 44 | - if (defined('WC_ABSPATH') && file_exists(WC_ABSPATH . 'includes/class-wc-install.php')) { | |
| 45 | - include_once WC_ABSPATH . 'includes/class-wc-install.php'; | |
| 46 | - | |
| 47 | - if (class_exists('WC_Install')) { | |
| 48 | - $update_versions = array_keys(WC_Install::get_db_update_callbacks()); | |
| 49 | - | |
| 50 | - if (!empty($update_versions)) { | |
| 51 | - asort($update_versions); | |
| 52 | - return end($update_versions); | |
| 53 | - } | |
| 54 | - } | |
| 55 | - } | |
| 56 | - | |
| 57 | - return false; | |
| 58 | - } | |
| 59 | - | |
| 60 | 41 | public static function getRequestID() { |
| 61 | 42 | if (!defined("BV_REQUEST_ID")) { |
| 62 | 43 | define("BV_REQUEST_ID", uniqid(mt_rand())); |
| 63 | 44 | } |
| @@ -84,9 +65,9 @@ | ||
| 84 | 65 | } |
| 85 | 66 | |
| 86 | 67 | public function getBrandName() { |
| 87 | 68 | $brand = $this->getBrandInfo(); |
| 88 | - if (is_array($brand) && array_key_exists('menuname', $brand)) { | |
| 69 | + if ($brand && array_key_exists('menuname', $brand)) { | |
| 89 | 70 | return $brand['menuname']; |
| 90 | 71 | } |
| 91 | 72 | |
| 92 | 73 | return $this->brandname; |
| @@ -93,9 +74,9 @@ | ||
| 93 | 74 | } |
| 94 | 75 | |
| 95 | 76 | public function getBrandIcon() { |
| 96 | 77 | $brand = $this->getBrandInfo(); |
| 97 | - if (is_array($brand) && array_key_exists('brand_icon', $brand)) { | |
| 78 | + if ($brand && array_key_exists('brand_icon', $brand)) { | |
| 98 | 79 | return $brand['brand_icon']; |
| 99 | 80 | } |
| 100 | 81 | return $this->brand_icon; |
| 101 | 82 | } |
| @@ -109,9 +90,9 @@ | ||
| 109 | 90 | if (defined('BV_APP_URL')) { |
| 110 | 91 | return BV_APP_URL; |
| 111 | 92 | } else { |
| 112 | 93 | $brand = $this->getBrandInfo(); |
| 113 | - if (is_array($brand) && array_key_exists('appurl', $brand)) { | |
| 94 | + if ($brand && array_key_exists('appurl', $brand)) { | |
| 114 | 95 | return $brand['appurl']; |
| 115 | 96 | } |
| 116 | 97 | return $this->appurl; |
| 117 | 98 | } |
| @@ -121,26 +102,10 @@ | ||
| 121 | 102 | $expiry_time = time() - (3 * 24 * 3600); |
| 122 | 103 | return ($this->getWatchTime() > $expiry_time); |
| 123 | 104 | } |
| 124 | 105 | |
| 125 | - public function isValidEnvironment(){ | |
| 126 | - $bvsiteinfo = new WPRWPSiteInfo(); | |
| 127 | - $bvconfig = $this->config; | |
| 128 | - | |
| 129 | - if (is_multisite()) { | |
| 130 | - return true; | |
| 131 | - } elseif ($bvconfig && array_key_exists("siteurl_scheme", $bvconfig)) { | |
| 132 | - $siteurl = $bvsiteinfo->siteurl('', $bvconfig["siteurl_scheme"]); | |
| 133 | - if (array_key_exists("abspath", $bvconfig) && | |
| 134 | - array_key_exists("siteurl", $bvconfig) && !empty($siteurl)) { | |
| 135 | - return ($bvconfig["abspath"] == ABSPATH && $bvconfig["siteurl"] == $siteurl); | |
| 136 | - } | |
| 137 | - } | |
| 138 | - return true; | |
| 139 | - } | |
| 140 | - | |
| 141 | 106 | public function isProtectModuleEnabled() { |
| 142 | - return $this->isServiceActive("protect") && $this->isValidEnvironment(); | |
| 107 | + return $this->isServiceActive("protect"); | |
| 143 | 108 | } |
| 144 | 109 | |
| 145 | 110 | public function isDynSyncModuleEnabled() { |
| 146 | 111 | if ($this->isServiceActive("dynsync")) { |
| @@ -164,9 +129,9 @@ | ||
| 164 | 129 | return ($this->settings->getOption($this->plug_redirect) === 'yes') ? true : false; |
| 165 | 130 | } |
| 166 | 131 | |
| 167 | 132 | public function isMalcare() { |
| 168 | - return $this->getBrandName() === 'MalCare'; | |
| 133 | + return $this->getBrandName() === 'MalCare - Pro'; | |
| 169 | 134 | } |
| 170 | 135 | |
| 171 | 136 | public function isBlogvault() { |
| 172 | 137 | return $this->getBrandName() === 'BlogVault'; |