Changeset 2862982
- Timestamp:
- 02/10/2023 01:36:57 AM (3 years ago)
- Location:
- autopilot
- Files:
-
- 49 added
- 2 deleted
- 4 edited
-
tags/1.0.13 (deleted)
-
tags/1.0.14 (deleted)
-
tags/1.0.16 (added)
-
tags/1.0.16/LICENSE.txt (added)
-
tags/1.0.16/README.txt (added)
-
tags/1.0.16/admin (added)
-
tags/1.0.16/admin/assets (added)
-
tags/1.0.16/admin/assets/ap-logo.png (added)
-
tags/1.0.16/admin/assets/logo-sqr.svg (added)
-
tags/1.0.16/admin/assets/tracking-illustration.png (added)
-
tags/1.0.16/admin/class-autopilot-admin.php (added)
-
tags/1.0.16/admin/css (added)
-
tags/1.0.16/admin/css/autopilot-admin.css (added)
-
tags/1.0.16/admin/index.php (added)
-
tags/1.0.16/admin/js (added)
-
tags/1.0.16/admin/js/autopilot-admin.js (added)
-
tags/1.0.16/admin/partials (added)
-
tags/1.0.16/admin/partials/autopilot-admin-display.php (added)
-
tags/1.0.16/admin/partials/autopilot-help-display.php (added)
-
tags/1.0.16/assets (added)
-
tags/1.0.16/assets/banner-1544x500.png (added)
-
tags/1.0.16/assets/banner-772x250.png (added)
-
tags/1.0.16/assets/icon-128x128.png (added)
-
tags/1.0.16/assets/icon-256x256.png (added)
-
tags/1.0.16/assets/screenshot-1.png (added)
-
tags/1.0.16/assets/screenshot-2.png (added)
-
tags/1.0.16/assets/screenshot-3.png (added)
-
tags/1.0.16/assets/screenshot-4.png (added)
-
tags/1.0.16/assets/screenshot-5.png (added)
-
tags/1.0.16/assets/screenshot-6.png (added)
-
tags/1.0.16/autopilot.php (added)
-
tags/1.0.16/includes (added)
-
tags/1.0.16/includes/class-autopilot-activator.php (added)
-
tags/1.0.16/includes/class-autopilot-deactivator.php (added)
-
tags/1.0.16/includes/class-autopilot-i18n.php (added)
-
tags/1.0.16/includes/class-autopilot-loader.php (added)
-
tags/1.0.16/includes/class-autopilot.php (added)
-
tags/1.0.16/includes/index.php (added)
-
tags/1.0.16/index.php (added)
-
tags/1.0.16/languages (added)
-
tags/1.0.16/languages/autopilot.pot (added)
-
tags/1.0.16/public (added)
-
tags/1.0.16/public/class-autopilot-public.php (added)
-
tags/1.0.16/public/css (added)
-
tags/1.0.16/public/css/autopilot-public.css (added)
-
tags/1.0.16/public/index.php (added)
-
tags/1.0.16/public/js (added)
-
tags/1.0.16/public/js/autopilot-public.js (added)
-
tags/1.0.16/public/partials (added)
-
tags/1.0.16/public/partials/autopilot-public-display.php (added)
-
tags/1.0.16/uninstall.php (added)
-
trunk/README.txt (modified) (2 diffs)
-
trunk/admin/class-autopilot-admin.php (modified) (3 diffs)
-
trunk/autopilot.php (modified) (1 diff)
-
trunk/public/class-autopilot-public.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
autopilot/trunk/README.txt
r2860530 r2862982 2 2 Contributors: rafalautopilot 3 3 Tags: ortto, autopilot, woocommerce, email, marketing, tracking, analytics, conversion, ecommerce, e-commerce, commerce, popups, cdp, marketing automation 4 Stable tag: 1.0.1 54 Stable tag: 1.0.16 5 5 Tested up to: 6.1 6 6 Requires at least: 5.0 … … 114 114 = 1.0.15 = 115 115 * Fix cookie hash 116 117 = 1.0.16 = 118 * Add multi region support -
autopilot/trunk/admin/class-autopilot-admin.php
r2711289 r2862982 94 94 } 95 95 96 // disable plugin for them to reconnect in order to update c apture_js_url97 if ( empty( $this->options["capture_js_url"] ) ) {96 // disable plugin for them to reconnect in order to update configuration 97 if ( empty( $this->options["capture_js_url"] ) || empty( $this->options["capture_api_url"] ) ) { 98 98 $this->options["tracking_key"] = ""; 99 99 update_option( self::OPTION_NAME, $this->options, true ); … … 102 102 $this->is_wc = in_array( 'woocommerce/woocommerce.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ); 103 103 104 $code = $_GET['code'] ?? ""; 105 $uid = $_GET['uid'] ?? ""; 106 $instance = $_GET['instance'] ?? ""; 107 $company_name = $_GET['company_name'] ?? ""; 108 $capture_js_url = $_GET['capture_js_url'] ?? ""; 104 $code = $_GET['code'] ?? ""; 105 $uid = $_GET['uid'] ?? ""; 106 $instance = $_GET['instance'] ?? ""; 107 $company_name = $_GET['company_name'] ?? ""; 108 $capture_api_url = $_GET['capture_api_url'] ?? ""; 109 $capture_js_url = $_GET['capture_js_url'] ?? ""; 109 110 $woocommerce_js_url = $_GET['woocommerce_js_url'] ?? ""; 110 111 111 if ( $code != "" && $this->options['code'] == $code && $uid != "" && $instance != "" && $company_name != "" && $capture_ js_url != "" && $woocommerce_js_url != "" ) {112 if ( $code != "" && $this->options['code'] == $code && $uid != "" && $instance != "" && $company_name != "" && $capture_api_url != "" && $capture_js_url != "" && $woocommerce_js_url != "" ) { 112 113 $this->options["tracking_key"] = $uid; 113 114 $this->options["instance"] = $instance; 114 115 $this->options["company_name"] = $company_name; 116 $this->options["capture_api_url"] = $capture_api_url; 115 117 $this->options["capture_js_url"] = $capture_js_url; 116 118 $this->options["woocommerce_js_url"] = $woocommerce_js_url; … … 330 332 $sanitary_values['tracking_key'] = sanitize_text_field( $input['tracking_key'] ); 331 333 } 334 if ( isset( $input['capture_api_url'] ) ) { 335 $sanitary_values['capture_api_url'] = sanitize_text_field( $input['capture_api_url'] ); 336 } 332 337 if ( isset( $input['capture_js_url'] ) ) { 333 338 $sanitary_values['capture_js_url'] = sanitize_text_field( $input['capture_js_url'] ); -
autopilot/trunk/autopilot.php
r2860530 r2862982 9 9 * Plugin URI: https://wordpress.org/plugins/autopilot 10 10 * Description: Customer data and marketing automation platform. 11 * Version: 1.0.1 511 * Version: 1.0.16 12 12 * Author: Ortto 13 13 * Author URI: https://ortto.app -
autopilot/trunk/public/class-autopilot-public.php
r2860530 r2862982 129 129 $this->options["woocommerce_js_url"] = self::WOOCOMMERCE_SCRIPT_URL; 130 130 } 131 if ( empty( $this->options["capture_api_url"] ) ) { 132 $this->options["capture_api_url"] = self::API_URL; 133 } 131 134 132 135 $ap3Options = [ 133 136 "customer" => $this->customer_to_array(), 134 "api_url" => self::API_URL,137 "api_url" => $this->options["capture_api_url"], 135 138 ] + $this->options; 136 139 … … 233 236 $context = stream_context_create( $options ); 234 237 if ( isset( $customer['email'] ) || $_COOKIE['ap3c'] ) { 235 file_get_contents( self::API_URL . self::WC_EVENT_PATH, false, $context ); 238 $apiURL = $this->options["capture_api_url"]; 239 if ( empty( $apiURL ) ) { 240 $apiURL = self::API_URL; 241 } 242 file_get_contents( $apiURL . self::WC_EVENT_PATH, false, $context ); 236 243 } 237 244 } … … 659 666 $context = stream_context_create( $options ); 660 667 if ( isset( $customer['email'] ) || $_COOKIE['ap3c'] ) { 661 file_get_contents( self::API_URL . self::WC_EVENT_PATH, false, $context ); 668 if ( empty( $this->options["capture_api_url"] ) ) { 669 $this->options["capture_api_url"] = self::API_URL; 670 } 671 $apiURL = $this->options["capture_api_url"]; 672 if ( empty( $apiURL ) ) { 673 $apiURL = self::API_URL; 674 } 675 file_get_contents( $apiURL . self::WC_EVENT_PATH, false, $context ); 662 676 } 663 677 }
Note: See TracChangeset
for help on using the changeset viewer.