| @@ -145,9 +145,9 @@ | ||
| 145 | 145 | #region HTTP |
| 146 | 146 | #-------------------------------------------------------------------------------- |
| 147 | 147 | |
| 148 | 148 | if ( ! defined( 'WP_FS__IS_HTTP_REQUEST' ) ) { |
| 149 | - define( 'WP_FS__IS_HTTP_REQUEST', isset( $_SERVER['HTTP_HOST'] ) ); | |
| 149 | + define( 'WP_FS__IS_HTTP_REQUEST', isset( $_SERVER['HTTP_HOST'] ) && isset( $_SERVER['REQUEST_METHOD'] ) ); | |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | if ( ! defined( 'WP_FS__IS_HTTPS' ) ) { |
| 153 | 153 | define( 'WP_FS__IS_HTTPS', ( WP_FS__IS_HTTP_REQUEST && |
| @@ -203,9 +203,9 @@ | ||
| 203 | 203 | #region API |
| 204 | 204 | #-------------------------------------------------------------------------------- |
| 205 | 205 | |
| 206 | 206 | if ( ! defined( 'WP_FS__API_ADDRESS_LOCALHOST' ) ) { |
| 207 | - define( 'WP_FS__API_ADDRESS_LOCALHOST', 'http://api.freemius:8080' ); | |
| 207 | + define( 'WP_FS__API_ADDRESS_LOCALHOST', 'http://api.freemius-local.com:8080' ); | |
| 208 | 208 | } |
| 209 | 209 | if ( ! defined( 'WP_FS__API_SANDBOX_ADDRESS_LOCALHOST' ) ) { |
| 210 | 210 | define( 'WP_FS__API_SANDBOX_ADDRESS_LOCALHOST', 'http://sandbox-api.freemius:8080' ); |
| 211 | 211 | } |
| @@ -247,8 +247,11 @@ | ||
| 247 | 247 | } |
| 248 | 248 | if ( ! defined( 'WP_FS__API_CACHE_OPTION_NAME' ) ) { |
| 249 | 249 | define( 'WP_FS__API_CACHE_OPTION_NAME', WP_FS___OPTION_PREFIX . 'api_cache' ); |
| 250 | 250 | } |
| 251 | + if ( ! defined( 'WP_FS__GDPR_OPTION_NAME' ) ) { | |
| 252 | + define( 'WP_FS__GDPR_OPTION_NAME', WP_FS___OPTION_PREFIX . 'gdpr' ); | |
| 253 | + } | |
| 251 | 254 | define( 'WP_FS__OPTIONS_OPTION_NAME', WP_FS___OPTION_PREFIX . 'options' ); |
| 252 | 255 | |
| 253 | 256 | /** |
| 254 | 257 | * Module types |
| @@ -281,10 +284,13 @@ | ||
| 281 | 284 | if ( ! defined( 'WP_FS__TIME_10_MIN_IN_SEC' ) ) { |
| 282 | 285 | define( 'WP_FS__TIME_10_MIN_IN_SEC', 600 ); |
| 283 | 286 | } |
| 284 | 287 | // define( 'WP_FS__TIME_15_MIN_IN_SEC', 900 ); |
| 288 | + if ( ! defined( 'WP_FS__TIME_12_HOURS_IN_SEC' ) ) { | |
| 289 | + define( 'WP_FS__TIME_12_HOURS_IN_SEC', 43200 ); | |
| 290 | + } | |
| 285 | 291 | if ( ! defined( 'WP_FS__TIME_24_HOURS_IN_SEC' ) ) { |
| 286 | - define( 'WP_FS__TIME_24_HOURS_IN_SEC', 86400 ); | |
| 292 | + define( 'WP_FS__TIME_24_HOURS_IN_SEC', WP_FS__TIME_12_HOURS_IN_SEC * 2 ); | |
| 287 | 293 | } |
| 288 | 294 | if ( ! defined( 'WP_FS__TIME_WEEK_IN_SEC' ) ) { |
| 289 | 295 | define( 'WP_FS__TIME_WEEK_IN_SEC', 7 * WP_FS__TIME_24_HOURS_IN_SEC ); |
| 290 | 296 | } |
| @@ -344,12 +350,12 @@ | ||
| 344 | 350 | * @author Vova Feldman (@svovaf) |
| 345 | 351 | */ |
| 346 | 352 | if ( ! defined( 'WP_FS__IS_NETWORK_ADMIN' ) ) { |
| 347 | 353 | define( 'WP_FS__IS_NETWORK_ADMIN', |
| 348 | - is_network_admin() || | |
| 349 | - ( is_multisite() && | |
| 354 | + is_multisite() && | |
| 355 | + ( is_network_admin() || | |
| 350 | 356 | ( ( defined( 'DOING_AJAX' ) && DOING_AJAX && |
| 351 | - ( isset( $_REQUEST['_fs_network_admin'] ) /*|| | |
| 357 | + ( isset( $_REQUEST['_fs_network_admin'] ) && 'true' === $_REQUEST['_fs_network_admin'] /*|| | |
| 352 | 358 | ( ! empty( $_REQUEST['action'] ) && 'delete-plugin' === $_REQUEST['action'] )*/ ) |
| 353 | 359 | ) || |
| 354 | 360 | // Plugin uninstall. |
| 355 | 361 | defined( 'WP_UNINSTALL_PLUGIN' ) ) |
| @@ -374,5 +380,12 @@ | ||
| 374 | 380 | // Set to true to show network level settings even if delegated to site admins. |
| 375 | 381 | define( 'WP_FS__SHOW_NETWORK_EVEN_WHEN_DELEGATED', false ); |
| 376 | 382 | } |
| 377 | 383 | |
| 378 | - #endregion | |
| 384 | + #endregion | |
| 385 | + | |
| 386 | + if ( ! defined( 'WP_FS__DEMO_MODE' ) ) { | |
| 387 | + define( 'WP_FS__DEMO_MODE', false ); | |
| 388 | + } | |
| 389 | + if ( ! defined( 'FS_SDK__SSLVERIFY' ) ) { | |
| 390 | + define( 'FS_SDK__SSLVERIFY', false ); | |
| 391 | + } | |