Changeset 2863427
- Timestamp:
- 02/10/2023 07:30:54 PM (3 years ago)
- Location:
- optinmonster/trunk
- Files:
-
- 32 added
- 32 deleted
- 8 edited
-
CHANGELOG.md (modified) (1 diff)
-
OMAPI/Output.php (modified) (1 diff)
-
OMAPI/Save.php (modified) (1 diff)
-
OMAPI/Shortcodes/Shortcode.php (modified) (1 diff)
-
OMAPI/Type.php (modified) (2 diffs)
-
optin-monster-wp-api.php (modified) (7 diffs)
-
readme.txt (modified) (2 diffs)
-
vue/dist/js/about.6c40bb27.js (added)
-
vue/dist/js/about.6c40bb27.js.map (added)
-
vue/dist/js/about.c0e8a74f.js (deleted)
-
vue/dist/js/about.c0e8a74f.js.map (deleted)
-
vue/dist/js/campaign-edit.075b1cc0.js (added)
-
vue/dist/js/campaign-edit.075b1cc0.js.map (added)
-
vue/dist/js/campaign-edit.60d97d04.js (deleted)
-
vue/dist/js/campaign-edit.60d97d04.js.map (deleted)
-
vue/dist/js/campaigns.718530af.js (deleted)
-
vue/dist/js/campaigns.718530af.js.map (deleted)
-
vue/dist/js/campaigns.e95ba120.js (added)
-
vue/dist/js/campaigns.e95ba120.js.map (added)
-
vue/dist/js/common.c005e882.js (deleted)
-
vue/dist/js/common.c005e882.js.map (deleted)
-
vue/dist/js/common.c0fde8d1.js (added)
-
vue/dist/js/common.c0fde8d1.js.map (added)
-
vue/dist/js/connect.2ee83f61.js (added)
-
vue/dist/js/connect.2ee83f61.js.map (added)
-
vue/dist/js/connect.be8c6839.js (deleted)
-
vue/dist/js/connect.be8c6839.js.map (deleted)
-
vue/dist/js/dashboard.18874b93.js (added)
-
vue/dist/js/dashboard.18874b93.js.map (added)
-
vue/dist/js/dashboard.cc5d482c.js (deleted)
-
vue/dist/js/dashboard.cc5d482c.js.map (deleted)
-
vue/dist/js/integrations.07dee6ea.js (deleted)
-
vue/dist/js/integrations.07dee6ea.js.map (deleted)
-
vue/dist/js/integrations.da8b8322.js (added)
-
vue/dist/js/integrations.da8b8322.js.map (added)
-
vue/dist/js/monsterleads.18c31389.js (added)
-
vue/dist/js/monsterleads.18c31389.js.map (added)
-
vue/dist/js/monsterleads.6bc97cd5.js (deleted)
-
vue/dist/js/monsterleads.6bc97cd5.js.map (deleted)
-
vue/dist/js/onboarding-wizard.6361b4e2.js (deleted)
-
vue/dist/js/onboarding-wizard.6361b4e2.js.map (deleted)
-
vue/dist/js/onboarding-wizard.f7c17fba.js (added)
-
vue/dist/js/onboarding-wizard.f7c17fba.js.map (added)
-
vue/dist/js/personalization.1018b7bc.js (added)
-
vue/dist/js/personalization.1018b7bc.js.map (added)
-
vue/dist/js/personalization.512dedff.js (deleted)
-
vue/dist/js/personalization.512dedff.js.map (deleted)
-
vue/dist/js/playbooks.47b5a2c8.js (added)
-
vue/dist/js/playbooks.47b5a2c8.js.map (added)
-
vue/dist/js/playbooks.5de32e0e.js (deleted)
-
vue/dist/js/playbooks.5de32e0e.js.map (deleted)
-
vue/dist/js/settings.997a94cb.js (deleted)
-
vue/dist/js/settings.997a94cb.js.map (deleted)
-
vue/dist/js/settings.bb78a5ed.js (added)
-
vue/dist/js/settings.bb78a5ed.js.map (added)
-
vue/dist/js/temp.1f9d04d7.js (deleted)
-
vue/dist/js/temp.1f9d04d7.js.map (deleted)
-
vue/dist/js/temp.dfe3efb6.js (added)
-
vue/dist/js/temp.dfe3efb6.js.map (added)
-
vue/dist/js/templates.02dba996.js (deleted)
-
vue/dist/js/templates.02dba996.js.map (deleted)
-
vue/dist/js/templates.7b779062.js (added)
-
vue/dist/js/templates.7b779062.js.map (added)
-
vue/dist/js/university.8d805941.js (deleted)
-
vue/dist/js/university.8d805941.js.map (deleted)
-
vue/dist/js/university.e36c11ee.js (added)
-
vue/dist/js/university.e36c11ee.js.map (added)
-
vue/dist/manifest.json (modified) (2 diffs)
-
vue/dist/wp-om-app-b78af314.js (added)
-
vue/dist/wp-om-app-b78af314.js.map (added)
-
vue/dist/wp-om-app-d9545d29.js (deleted)
-
vue/dist/wp-om-app-d9545d29.js.map (deleted)
Legend:
- Unmodified
- Added
- Removed
-
optinmonster/trunk/CHANGELOG.md
r2859837 r2863427 1 1 # Changelog 2 2 All notable changes to the OptinMonster plugin will be documented in this file. 3 4 ### 2.12.2 - 2023-02-10 5 * Security update to ensure OptinMonster shortcodes can only load from the campaign post-type. 3 6 4 7 ### 2.12.1 - 2023-02-03 -
optinmonster/trunk/OMAPI/Output.php
r2859273 r2863427 806 806 */ 807 807 public function prepare_campaign( $optin ) { 808 $optin = $this->base->validate_is_campaign_type( $optin ); 808 809 $campaign_embed = ! empty( $optin->post_content ) 809 810 ? trim( html_entity_decode( stripslashes( $optin->post_content ), ENT_QUOTES, 'UTF-8' ), '\'' ) -
optinmonster/trunk/OMAPI/Save.php
r2758201 r2863427 230 230 'post_content' => $optin->output, 231 231 'post_status' => $status, 232 'post_type' => 'omapi',232 'post_type' => OMAPI_Type::SLUG, 233 233 ) 234 234 ); -
optinmonster/trunk/OMAPI/Shortcodes/Shortcode.php
r2637603 r2863427 261 261 $html = $this->base->output->prepare_campaign( $this->campaign ); 262 262 if ( ! $html ) { 263 throw new OMAPI_Shortcodes_Exception( 'Optin o pbject missing campaign html in post_content' );263 throw new OMAPI_Shortcodes_Exception( 'Optin object missing campaign html in post_content' ); 264 264 } 265 265 -
optinmonster/trunk/OMAPI/Type.php
r2419618 r2863427 20 20 */ 21 21 class OMAPI_Type { 22 23 /** 24 * The Post-type slug. 25 */ 26 const SLUG = 'omapi'; 22 27 23 28 /** … … 80 85 81 86 register_post_type( 82 'omapi',87 self::SLUG, 83 88 array( 84 89 'labels' => apply_filters( -
optinmonster/trunk/optin-monster-wp-api.php
r2859837 r2863427 6 6 * Author: OptinMonster Popup Builder Team 7 7 * Author URI: https://optinmonster.com 8 * Version: 2.12. 18 * Version: 2.12.2 9 9 * Text Domain: optin-monster-api 10 10 * Domain Path: languages … … 67 67 * @var string 68 68 */ 69 public $version = '2.12. 1';69 public $version = '2.12.2'; 70 70 71 71 /** … … 395 395 */ 396 396 public function get_optin_by_slug( $slug ) { 397 $optin = get_page_by_path( sanitize_text_field( $slug ), OBJECT, 'omapi');397 $optin = get_page_by_path( sanitize_text_field( $slug ), OBJECT, OMAPI_Type::SLUG ); 398 398 return $this->add_campaign_properties( $optin ); 399 399 } … … 409 409 */ 410 410 public function collect_campaign_data( $campaign ) { 411 $campaign = $this->validate_is_campaign_type( $campaign ); 412 if ( empty( $campaign ) ) { 413 return array( 414 'id' => '', 415 'post' => $campaign, 416 'type' => '', 417 'inline' => false, 418 'post_meta' => array(), 419 ); 420 } 421 411 422 $meta = array(); 412 423 $keys = get_post_meta( $campaign->ID ); … … 457 468 'no_found_rows' => true, 458 469 'nopaging' => true, 459 'post_type' => 'omapi',470 'post_type' => OMAPI_Type::SLUG, 460 471 'posts_per_page' => -1, 461 472 'update_post_term_cache' => false, … … 482 493 */ 483 494 public function add_campaign_properties( $post ) { 484 if ( ! empty( $post ) ) { 495 $post = $this->validate_is_campaign_type( $post ); 496 if ( ! empty( $post->ID ) ) { 485 497 $post->campaign_type = get_post_meta( $post->ID, '_omapi_type', true ); 486 498 $post->enabled = ! ! get_post_meta( $post->ID, '_omapi_enabled', true ); … … 489 501 return $post; 490 502 503 } 504 505 /** 506 * Validates post object to ensure our optin post-type. 507 * 508 * @since 2.12.2 509 * 510 * @param WP_Post $post The post object to check. 511 * 512 * @return WP_Post|null Null if post-type doesn't match. 513 */ 514 public function validate_is_campaign_type( $post ) { 515 if ( ! empty( $post->post_type ) && OMAPI_Type::SLUG !== $post->post_type ) { 516 $post = null; 517 } 518 519 return $post; 491 520 } 492 521 -
optinmonster/trunk/readme.txt
r2859837 r2863427 5 5 Tested up to: 6.1 6 6 Requires PHP: 5.3 7 Stable tag: 2.12. 17 Stable tag: 2.12.2 8 8 License: GNU General Public License v2.0 or later 9 9 … … 462 462 **Most Recent Changes:** 463 463 464 = Popup Builder 2.12.2 = 465 * Security update to ensure OptinMonster shortcodes can only load from the campaign post-type. 466 464 467 = Popup Builder 2.12.1 = 465 468 * Fixed Template preview button text stuck on "Loading Preview". -
optinmonster/trunk/vue/dist/manifest.json
r2859837 r2863427 1 1 { 2 2 "about.css": "/css/about.573e0e35.css", 3 "about.js": "/js/about. c0e8a74f.js",4 "about.js.map": "/js/about. c0e8a74f.js.map",5 "app.js": "/wp-om-app- d9545d29.js",6 "app.js.map": "/wp-om-app- d9545d29.js.map",3 "about.js": "/js/about.6c40bb27.js", 4 "about.js.map": "/js/about.6c40bb27.js.map", 5 "app.js": "/wp-om-app-b78af314.js", 6 "app.js.map": "/wp-om-app-b78af314.js.map", 7 7 "campaign-edit.css": "/css/campaign-edit.c5102a65.css", 8 "campaign-edit.js": "/js/campaign-edit. 60d97d04.js",9 "campaign-edit.js.map": "/js/campaign-edit. 60d97d04.js.map",8 "campaign-edit.js": "/js/campaign-edit.075b1cc0.js", 9 "campaign-edit.js.map": "/js/campaign-edit.075b1cc0.js.map", 10 10 "campaigns.css": "/css/campaigns.e713cf50.css", 11 "campaigns.js": "/js/campaigns. 718530af.js",12 "campaigns.js.map": "/js/campaigns. 718530af.js.map",11 "campaigns.js": "/js/campaigns.e95ba120.js", 12 "campaigns.js.map": "/js/campaigns.e95ba120.js.map", 13 13 "common.css": "/css/common.63e3f1f4.css", 14 "common.js": "/js/common.c0 05e882.js",15 "common.js.map": "/js/common.c0 05e882.js.map",16 "connect.js": "/js/connect. be8c6839.js",17 "connect.js.map": "/js/connect. be8c6839.js.map",14 "common.js": "/js/common.c0fde8d1.js", 15 "common.js.map": "/js/common.c0fde8d1.js.map", 16 "connect.js": "/js/connect.2ee83f61.js", 17 "connect.js.map": "/js/connect.2ee83f61.js.map", 18 18 "dashboard.css": "/css/dashboard.06f1c35c.css", 19 "dashboard.js": "/js/dashboard. cc5d482c.js",20 "dashboard.js.map": "/js/dashboard. cc5d482c.js.map",19 "dashboard.js": "/js/dashboard.18874b93.js", 20 "dashboard.js.map": "/js/dashboard.18874b93.js.map", 21 21 "fonts/element-icons.ttf": "/fonts/element-icons.732389de.ttf", 22 22 "fonts/element-icons.woff": "/fonts/element-icons.535877f5.woff", … … 103 103 "img/youtube.svg": "/img/youtube.202220b6.svg", 104 104 "integrations.css": "/css/integrations.c2747832.css", 105 "integrations.js": "/js/integrations. 07dee6ea.js",106 "integrations.js.map": "/js/integrations. 07dee6ea.js.map",105 "integrations.js": "/js/integrations.da8b8322.js", 106 "integrations.js.map": "/js/integrations.da8b8322.js.map", 107 107 "monsterleads.css": "/css/monsterleads.70434c02.css", 108 "monsterleads.js": "/js/monsterleads. 6bc97cd5.js",109 "monsterleads.js.map": "/js/monsterleads. 6bc97cd5.js.map",108 "monsterleads.js": "/js/monsterleads.18c31389.js", 109 "monsterleads.js.map": "/js/monsterleads.18c31389.js.map", 110 110 "onboarding-wizard.css": "/css/onboarding-wizard.6e7013f7.css", 111 "onboarding-wizard.js": "/js/onboarding-wizard. 6361b4e2.js",112 "onboarding-wizard.js.map": "/js/onboarding-wizard. 6361b4e2.js.map",111 "onboarding-wizard.js": "/js/onboarding-wizard.f7c17fba.js", 112 "onboarding-wizard.js.map": "/js/onboarding-wizard.f7c17fba.js.map", 113 113 "personalization.css": "/css/personalization.2ddffe3b.css", 114 "personalization.js": "/js/personalization. 512dedff.js",115 "personalization.js.map": "/js/personalization. 512dedff.js.map",114 "personalization.js": "/js/personalization.1018b7bc.js", 115 "personalization.js.map": "/js/personalization.1018b7bc.js.map", 116 116 "playbooks.css": "/css/playbooks.49ce5d72.css", 117 "playbooks.js": "/js/playbooks. 5de32e0e.js",118 "playbooks.js.map": "/js/playbooks. 5de32e0e.js.map",117 "playbooks.js": "/js/playbooks.47b5a2c8.js", 118 "playbooks.js.map": "/js/playbooks.47b5a2c8.js.map", 119 119 "settings.css": "/css/settings.87112f6a.css", 120 "settings.js": "/js/settings. 997a94cb.js",121 "settings.js.map": "/js/settings. 997a94cb.js.map",120 "settings.js": "/js/settings.bb78a5ed.js", 121 "settings.js.map": "/js/settings.bb78a5ed.js.map", 122 122 "temp.css": "/css/temp.6c2fb77b.css", 123 "temp.js": "/js/temp. 1f9d04d7.js",124 "temp.js.map": "/js/temp. 1f9d04d7.js.map",123 "temp.js": "/js/temp.dfe3efb6.js", 124 "temp.js.map": "/js/temp.dfe3efb6.js.map", 125 125 "templates.css": "/css/templates.9c7f8497.css", 126 "templates.js": "/js/templates. 02dba996.js",127 "templates.js.map": "/js/templates. 02dba996.js.map",126 "templates.js": "/js/templates.7b779062.js", 127 "templates.js.map": "/js/templates.7b779062.js.map", 128 128 "university.css": "/css/university.cbb2a098.css", 129 "university.js": "/js/university. 8d805941.js",130 "university.js.map": "/js/university. 8d805941.js.map"129 "university.js": "/js/university.e36c11ee.js", 130 "university.js.map": "/js/university.e36c11ee.js.map" 131 131 }
Note: See TracChangeset
for help on using the changeset viewer.