| @@ -9,16 +9,10 @@ | ||
| 9 | 9 | class FrmInbox extends FrmFormApi { |
| 10 | 10 | |
| 11 | 11 | protected $cache_key; |
| 12 | 12 | |
| 13 | - /** | |
| 14 | - * @var string | |
| 15 | - */ | |
| 16 | 13 | private $option = 'frm_inbox'; |
| 17 | 14 | |
| 18 | - /** | |
| 19 | - * @var array|false | |
| 20 | - */ | |
| 21 | 15 | private static $messages = false; |
| 22 | 16 | |
| 23 | 17 | /** |
| 24 | 18 | * @var array |
| @@ -24,9 +18,9 @@ | ||
| 24 | 18 | * @var array |
| 25 | 19 | */ |
| 26 | 20 | private static $banner_messages; |
| 27 | 21 | |
| 28 | - public function __construct() { | |
| 22 | + public function __construct( $for_parent = null ) { | |
| 29 | 23 | $this->set_cache_key(); |
| 30 | 24 | |
| 31 | 25 | if ( false === self::$messages ) { |
| 32 | 26 | $this->set_messages(); |
| @@ -53,19 +47,15 @@ | ||
| 53 | 47 | |
| 54 | 48 | /** |
| 55 | 49 | * @since 4.05 |
| 56 | 50 | * |
| 57 | - * @param false|string $filter | |
| 58 | - * | |
| 59 | - * @return array | |
| 51 | + * @param array|false $filter | |
| 60 | 52 | */ |
| 61 | 53 | public function get_messages( $filter = false ) { |
| 62 | 54 | $messages = self::$messages; |
| 63 | - | |
| 64 | 55 | if ( $filter === 'filter' ) { |
| 65 | 56 | $this->filter_messages( $messages ); |
| 66 | 57 | } |
| 67 | - | |
| 68 | 58 | return $messages; |
| 69 | 59 | } |
| 70 | 60 | |
| 71 | 61 | /** |
| @@ -74,9 +64,8 @@ | ||
| 74 | 64 | * @return void |
| 75 | 65 | */ |
| 76 | 66 | public function set_messages() { |
| 77 | 67 | self::$messages = get_option( $this->option ); |
| 78 | - | |
| 79 | 68 | if ( ! is_array( self::$messages ) ) { |
| 80 | 69 | self::$messages = array(); |
| 81 | 70 | } |
| 82 | 71 | |
| @@ -94,10 +83,9 @@ | ||
| 94 | 83 | * @return void |
| 95 | 84 | */ |
| 96 | 85 | private function add_api_messages() { |
| 97 | 86 | $api = $this->get_api_info(); |
| 98 | - | |
| 99 | - if ( ! $api ) { | |
| 87 | + if ( empty( $api ) ) { | |
| 100 | 88 | return; |
| 101 | 89 | } |
| 102 | 90 | |
| 103 | 91 | foreach ( $api as $message ) { |
| @@ -111,10 +99,10 @@ | ||
| 111 | 99 | * @return void |
| 112 | 100 | */ |
| 113 | 101 | public function add_message( $message ) { |
| 114 | 102 | if ( ! is_array( $message ) || ! isset( $message['key'] ) ) { |
| 115 | - // If the API response is invalid, $message may not be an array. | |
| 116 | - // If there are no messages from the API, it is returning a "No Entries Found" item with no key, so check for a key as well. | |
| 103 | + // if the API response is invalid, $message may not be an array. | |
| 104 | + // if there are no messages from the API, it is returning a "No Entries Found" item with no key, so check for a key as well. | |
| 117 | 105 | return; |
| 118 | 106 | } |
| 119 | 107 | |
| 120 | 108 | if ( isset( self::$messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) { |
| @@ -121,9 +109,9 @@ | ||
| 121 | 109 | // Don't replace messages unless required. |
| 122 | 110 | return; |
| 123 | 111 | } |
| 124 | 112 | |
| 125 | - if ( ! $this->within_valid_timeframe( $message ) ) { | |
| 113 | + if ( $this->is_expired( $message ) ) { | |
| 126 | 114 | return; |
| 127 | 115 | } |
| 128 | 116 | |
| 129 | 117 | if ( isset( self::$messages[ $message['key'] ] ) ) { |
| @@ -167,19 +155,16 @@ | ||
| 167 | 155 | * @return void |
| 168 | 156 | */ |
| 169 | 157 | private function clean_messages() { |
| 170 | 158 | $removed = false; |
| 171 | - | |
| 172 | 159 | foreach ( self::$messages as $t => $message ) { |
| 173 | 160 | $read = ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' ); |
| 174 | - $dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 175 | - | |
| 176 | - if ( ! $read && ! $dismissed && $this->within_valid_timeframe( $message ) ) { | |
| 177 | - continue; | |
| 161 | + $dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' ); | |
| 162 | + $expired = $this->is_expired( $message ); | |
| 163 | + if ( $read || $expired || $dismissed ) { | |
| 164 | + unset( self::$messages[ $t ] ); | |
| 165 | + $removed = true; | |
| 178 | 166 | } |
| 179 | - | |
| 180 | - unset( self::$messages[ $t ] ); | |
| 181 | - $removed = true; | |
| 182 | 167 | } |
| 183 | 168 | |
| 184 | 169 | if ( $removed ) { |
| 185 | 170 | $this->update_list(); |
| @@ -188,58 +173,28 @@ | ||
| 188 | 173 | |
| 189 | 174 | /** |
| 190 | 175 | * @param array $messages |
| 191 | 176 | * @param string $type |
| 192 | - * | |
| 193 | 177 | * @return void |
| 194 | 178 | */ |
| 195 | 179 | public function filter_messages( &$messages, $type = 'unread' ) { |
| 196 | 180 | $user_id = get_current_user_id(); |
| 197 | - | |
| 198 | 181 | foreach ( $messages as $k => $message ) { |
| 199 | 182 | $dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] ); |
| 200 | - | |
| 201 | - if ( ! $k || ! $this->within_valid_timeframe( $message ) || ( $type === 'dismissed' ) !== $dismissed ) { | |
| 183 | + if ( empty( $k ) || $this->is_expired( $message ) || ( $type === 'dismissed' ) !== $dismissed ) { | |
| 202 | 184 | unset( $messages[ $k ] ); |
| 203 | 185 | } elseif ( ! $this->is_for_user( $message ) ) { |
| 204 | 186 | unset( $messages[ $k ] ); |
| 205 | 187 | } |
| 206 | 188 | } |
| 207 | - | |
| 208 | 189 | $messages = apply_filters( 'frm_filter_inbox', $messages ); |
| 209 | 190 | } |
| 210 | 191 | |
| 211 | 192 | /** |
| 212 | - * Check if a message has started and is not expired. | |
| 213 | - * | |
| 214 | - * @since 6.25 | |
| 215 | - * | |
| 216 | 193 | * @param array $message |
| 217 | 194 | * |
| 218 | 195 | * @return bool |
| 219 | 196 | */ |
| 220 | - private function within_valid_timeframe( $message ) { | |
| 221 | - return $this->has_started( $message ) && ! $this->is_expired( $message ); | |
| 222 | - } | |
| 223 | - | |
| 224 | - /** | |
| 225 | - * Check if a message has actually started, so we can prevent showing something that is queued up early. | |
| 226 | - * | |
| 227 | - * @since 6.25 | |
| 228 | - * | |
| 229 | - * @param array $message | |
| 230 | - * | |
| 231 | - * @return bool | |
| 232 | - */ | |
| 233 | - private function has_started( $message ) { | |
| 234 | - return empty( $message['starts'] ) ? true : $message['starts'] <= time(); | |
| 235 | - } | |
| 236 | - | |
| 237 | - /** | |
| 238 | - * @param array $message | |
| 239 | - * | |
| 240 | - * @return bool | |
| 241 | - */ | |
| 242 | 197 | private function is_expired( $message ) { |
| 243 | 198 | return ! empty( $message['expires'] ) && $message['expires'] < time(); |
| 244 | 199 | } |
| 245 | 200 | |
| @@ -246,18 +201,21 @@ | ||
| 246 | 201 | /** |
| 247 | 202 | * Show different messages for different accounts. |
| 248 | 203 | * |
| 249 | 204 | * @param array $message |
| 250 | - * | |
| 251 | 205 | * @return bool |
| 252 | 206 | */ |
| 253 | 207 | private function is_for_user( $message ) { |
| 254 | - if ( FrmApiHelper::is_for_user( $message ) ) { | |
| 208 | + if ( ! isset( $message['who'] ) || $message['who'] === 'all' ) { | |
| 255 | 209 | return true; |
| 256 | 210 | } |
| 257 | - | |
| 258 | 211 | $who = (array) $message['who']; |
| 259 | - | |
| 212 | + if ( in_array( 'all', $who, true ) || in_array( 'everyone', $who, true ) ) { | |
| 213 | + return true; | |
| 214 | + } | |
| 215 | + if ( in_array( $this->get_user_type(), $who, true ) ) { | |
| 216 | + return true; | |
| 217 | + } | |
| 260 | 218 | /** |
| 261 | 219 | * Allow for other special inbox cases in other add-ons. |
| 262 | 220 | * |
| 263 | 221 | * @since 6.8.1 |
| @@ -268,8 +226,16 @@ | ||
| 268 | 226 | */ |
| 269 | 227 | return (bool) apply_filters( 'frm_inbox_message_is_for_user', false, $who, $message ); |
| 270 | 228 | } |
| 271 | 229 | |
| 230 | + private function get_user_type() { | |
| 231 | + if ( ! FrmAppHelper::pro_is_installed() ) { | |
| 232 | + return 'free'; | |
| 233 | + } | |
| 234 | + | |
| 235 | + return FrmAddonsController::license_type(); | |
| 236 | + } | |
| 237 | + | |
| 272 | 238 | /** |
| 273 | 239 | * @param string $key |
| 274 | 240 | * |
| 275 | 241 | * @return void |
| @@ -290,20 +256,16 @@ | ||
| 290 | 256 | /** |
| 291 | 257 | * @since 4.05.02 |
| 292 | 258 | * |
| 293 | 259 | * @param string $key |
| 294 | - * | |
| 295 | 260 | * @return void |
| 296 | 261 | */ |
| 297 | 262 | public function mark_unread( $key ) { |
| 298 | 263 | $is_read = isset( self::$messages[ $key ] ) && isset( self::$messages[ $key ]['read'] ) && isset( self::$messages[ $key ]['read'][ get_current_user_id() ] ); |
| 299 | - | |
| 300 | - if ( ! $is_read ) { | |
| 301 | - return; | |
| 264 | + if ( $is_read ) { | |
| 265 | + unset( self::$messages[ $key ]['read'][ get_current_user_id() ] ); | |
| 266 | + $this->update_list(); | |
| 302 | 267 | } |
| 303 | - | |
| 304 | - unset( self::$messages[ $key ]['read'][ get_current_user_id() ] ); | |
| 305 | - $this->update_list(); | |
| 306 | 268 | } |
| 307 | 269 | |
| 308 | 270 | /** |
| 309 | 271 | * @param string $key |
| @@ -334,9 +296,8 @@ | ||
| 334 | 296 | * @return void |
| 335 | 297 | */ |
| 336 | 298 | private function dismiss_all() { |
| 337 | 299 | $user_id = get_current_user_id(); |
| 338 | - | |
| 339 | 300 | foreach ( self::$messages as $key => $message ) { |
| 340 | 301 | if ( ! isset( $message['dismissed'] ) ) { |
| 341 | 302 | self::$messages[ $key ]['dismissed'] = array(); |
| 342 | 303 | } |
| @@ -347,21 +308,16 @@ | ||
| 347 | 308 | } |
| 348 | 309 | $this->update_list(); |
| 349 | 310 | } |
| 350 | 311 | |
| 351 | - /** | |
| 352 | - * @return array | |
| 353 | - */ | |
| 354 | 312 | public function unread() { |
| 355 | 313 | $messages = $this->get_messages( 'filter' ); |
| 356 | 314 | $user_id = get_current_user_id(); |
| 357 | - | |
| 358 | 315 | foreach ( $messages as $t => $message ) { |
| 359 | 316 | if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) { |
| 360 | 317 | unset( $messages[ $t ] ); |
| 361 | 318 | } |
| 362 | 319 | } |
| 363 | - | |
| 364 | 320 | return $messages; |
| 365 | 321 | } |
| 366 | 322 | |
| 367 | 323 | /** |
| @@ -367,14 +323,12 @@ | ||
| 367 | 323 | /** |
| 368 | 324 | * @since 6.8.4 The $filtered parameter was added. |
| 369 | 325 | * |
| 370 | 326 | * @param bool $filtered |
| 371 | - * | |
| 372 | 327 | * @return string |
| 373 | 328 | */ |
| 374 | 329 | public function unread_html( $filtered = true ) { |
| 375 | 330 | $count = count( $this->unread() ); |
| 376 | - | |
| 377 | 331 | if ( ! $count ) { |
| 378 | 332 | return ''; |
| 379 | 333 | } |
| 380 | 334 | |
| @@ -395,9 +349,8 @@ | ||
| 395 | 349 | /** |
| 396 | 350 | * @since 4.05.02 |
| 397 | 351 | * |
| 398 | 352 | * @param string $key |
| 399 | - * | |
| 400 | 353 | * @return void |
| 401 | 354 | */ |
| 402 | 355 | public function remove( $key ) { |
| 403 | 356 | if ( isset( self::$messages[ $key ] ) ) { |
| @@ -409,9 +362,9 @@ | ||
| 409 | 362 | /** |
| 410 | 363 | * @return void |
| 411 | 364 | */ |
| 412 | 365 | private function update_list() { |
| 413 | - update_option( $this->option, self::$messages, false ); | |
| 366 | + update_option( $this->option, self::$messages, 'no' ); | |
| 414 | 367 | } |
| 415 | 368 | |
| 416 | 369 | /** |
| 417 | 370 | * Show a banner message if one is available. |
| @@ -421,9 +374,8 @@ | ||
| 421 | 374 | public static function maybe_show_banner() { |
| 422 | 375 | if ( empty( self::$banner_messages ) ) { |
| 423 | 376 | return false; |
| 424 | 377 | } |
| 425 | - | |
| 426 | 378 | $message = end( self::$banner_messages ); |
| 427 | 379 | $cta = self::get_prepared_banner_cta( $message['cta'] ); |
| 428 | 380 | |
| 429 | 381 | require FrmAppHelper::plugin_path() . '/classes/views/inbox/banner.php'; |
| @@ -435,9 +387,8 @@ | ||
| 435 | 387 | * |
| 436 | 388 | * @since 6.8.4 |
| 437 | 389 | * |
| 438 | 390 | * @param string $cta |
| 439 | - * | |
| 440 | 391 | * @return string |
| 441 | 392 | */ |
| 442 | 393 | private static function get_prepared_banner_cta( $cta ) { |
| 443 | 394 | $cta = str_replace( 'button-secondary', 'button-primary', $cta ); |
| @@ -446,25 +397,22 @@ | ||
| 446 | 397 | /** |
| 447 | 398 | * Replace a single href attribute in the CTA. |
| 448 | 399 | * |
| 449 | 400 | * @param array $matches The regex results for a single match. |
| 450 | - * | |
| 451 | 401 | * @return string |
| 452 | 402 | */ |
| 453 | 403 | function ( $matches ) { |
| 454 | - $url = $matches[2]; | |
| 404 | + $url = $matches[2]; | |
| 405 | + $parts = parse_url( $url ); | |
| 455 | 406 | |
| 456 | 407 | if ( '#' === $url ) { |
| 457 | 408 | return 'href="#"'; |
| 458 | 409 | } |
| 459 | 410 | |
| 460 | - $parts = parse_url( $url ); | |
| 461 | 411 | $query = array(); |
| 462 | - | |
| 463 | 412 | if ( isset( $parts['query'] ) ) { |
| 464 | 413 | parse_str( $parts['query'], $query ); |
| 465 | 414 | } |
| 466 | - | |
| 467 | 415 | $query['utm_medium'] = 'banner'; |
| 468 | 416 | $parts['query'] = http_build_query( $query ); |
| 469 | 417 | return 'href="' . $parts['scheme'] . '://' . $parts['host'] . $parts['path'] . '?' . $parts['query'] . '"'; |
| 470 | 418 | }, |
| @@ -476,11 +424,10 @@ | ||
| 476 | 424 | * @return void |
| 477 | 425 | */ |
| 478 | 426 | public static function maybe_disable_screen_options() { |
| 479 | 427 | self::$banner_messages = self::get_banner_messages(); |
| 480 | - | |
| 481 | 428 | if ( self::$banner_messages ) { |
| 482 | - // Disable screen options tab when displaying banner messages because it gets in the way of the banner. | |
| 429 | + // disable screen options tab when displaying banner messages because it gets in the way of the banner. | |
| 483 | 430 | add_filter( 'screen_options_show_screen', '__return_false' ); |
| 484 | 431 | } |
| 485 | 432 | } |
| 486 | 433 | |
| @@ -509,9 +456,8 @@ | ||
| 509 | 456 | * |
| 510 | 457 | * @since 6.8.4 |
| 511 | 458 | * |
| 512 | 459 | * @param string $key The key we are checking for (ie. banner or slidein). |
| 513 | - * | |
| 514 | 460 | * @return array |
| 515 | 461 | */ |
| 516 | 462 | private static function get_messages_with_key( $key ) { |
| 517 | 463 | $inbox = new self(); |
| @@ -542,9 +488,8 @@ | ||
| 542 | 488 | * @return array|false |
| 543 | 489 | */ |
| 544 | 490 | public static function get_inbox_slide_in_value_for_js() { |
| 545 | 491 | $messages = self::get_slidein_messages(); |
| 546 | - | |
| 547 | 492 | if ( ! $messages ) { |
| 548 | 493 | return false; |
| 549 | 494 | } |
| 550 | 495 | |
| @@ -565,42 +510,11 @@ | ||
| 565 | 510 | |
| 566 | 511 | return array_reduce( |
| 567 | 512 | $keys_to_return, |
| 568 | 513 | function ( $total, $key ) use ( $message ) { |
| 569 | - $total[ $key ] = $message[ $key ] ?? ''; | |
| 514 | + $total[ $key ] = isset( $message[ $key ] ) ? $message[ $key ] : ''; | |
| 570 | 515 | return $total; |
| 571 | 516 | }, |
| 572 | 517 | array() |
| 573 | 518 | ); |
| 574 | - } | |
| 575 | - | |
| 576 | - /** | |
| 577 | - * Clear the inbox cache by deleting the associated option from the database. | |
| 578 | - * | |
| 579 | - * @since 6.17 | |
| 580 | - * | |
| 581 | - * @return void | |
| 582 | - */ | |
| 583 | - public static function clear_cache() { | |
| 584 | - delete_option( 'frm_inbox' ); | |
| 585 | - } | |
| 586 | - | |
| 587 | - /** | |
| 588 | - * Check inbox for an "error" type. This is displayed on the form list page if one exists. | |
| 589 | - * | |
| 590 | - * @since 6.19 | |
| 591 | - * | |
| 592 | - * @return array|false | |
| 593 | - */ | |
| 594 | - public static function check_for_error() { | |
| 595 | - $inbox = new self(); | |
| 596 | - $messages = $inbox->get_messages( 'filter' ); | |
| 597 | - | |
| 598 | - foreach ( $messages as $message ) { | |
| 599 | - if ( is_array( $message ) && isset( $message['type'] ) && 'error' === $message['type'] ) { | |
| 600 | - return $message; | |
| 601 | - } | |
| 602 | - } | |
| 603 | - | |
| 604 | - return false; | |
| 605 | 519 | } |
| 606 | 520 | } |
