Changeset 2622887
- Timestamp:
- 11/01/2021 04:39:44 PM (4 years ago)
- Location:
- wecantrack
- Files:
-
- 27 added
- 7 edited
-
tags/1.2.12 (added)
-
tags/1.2.12/README.md (added)
-
tags/1.2.12/WecantrackAdmin.php (added)
-
tags/1.2.12/WecantrackApp.php (added)
-
tags/1.2.12/WecantrackAppRedirectPage.php (added)
-
tags/1.2.12/WecantrackHelper.php (added)
-
tags/1.2.12/css (added)
-
tags/1.2.12/css/admin.css (added)
-
tags/1.2.12/images (added)
-
tags/1.2.12/images/favicon.png (added)
-
tags/1.2.12/images/favicon2.png (added)
-
tags/1.2.12/images/wct-logo-normal.svg (added)
-
tags/1.2.12/index.php (added)
-
tags/1.2.12/js (added)
-
tags/1.2.12/js/.gitignore (added)
-
tags/1.2.12/js/admin.js (added)
-
tags/1.2.12/js/advanced_settings.js (added)
-
tags/1.2.12/js/redirect_page.js (added)
-
tags/1.2.12/license.txt (added)
-
tags/1.2.12/locale (added)
-
tags/1.2.12/readme.txt (added)
-
tags/1.2.12/views (added)
-
tags/1.2.12/views/advanced_settings.php (added)
-
tags/1.2.12/views/redirect_page.php (added)
-
tags/1.2.12/views/settings.php (added)
-
tags/1.2.12/wecantrack.php (added)
-
tags/1.2.12/wecantrack.pot (added)
-
trunk/WecantrackAdmin.php (modified) (3 diffs)
-
trunk/WecantrackApp.php (modified) (2 diffs)
-
trunk/WecantrackHelper.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/views/advanced_settings.php (modified) (3 diffs)
-
trunk/wecantrack.php (modified) (4 diffs)
-
trunk/wecantrack.pot (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
wecantrack/trunk/WecantrackAdmin.php
r2562891 r2622887 65 65 add_option('wecantrack_referrer_cookie_status', 1); 66 66 } 67 if(!get_option('wecantrack_storage')) { 68 add_option('wecantrack_storage'); 69 } 67 70 } 68 71 … … 105 108 public function advanced_settings_response() { 106 109 WecantrackHelper::nonce_check($_POST['wecantrack_form_nonce']); 110 $storage = json_decode(get_option('wecantrack_storage'), true); 111 if (!$storage) { 112 $storage = []; 113 } 107 114 108 115 $referrer_cookie_status = sanitize_text_field($_POST['wecantrack_referrer_cookie_status']); 116 $ssl_status = sanitize_text_field($_POST['wecantrack_ssl_status']); 117 118 if ($ssl_status == 0) { 119 $storage['disable_ssl'] = true; 120 } else if ($ssl_status == 1) { 121 unset($storage['disable_ssl']); 122 } 123 update_option('wecantrack_storage', json_encode($storage)); 124 109 125 if ($referrer_cookie_status == 0 || $referrer_cookie_status == 1) { 110 126 update_option('wecantrack_referrer_cookie_status', $referrer_cookie_status); 111 127 } 128 112 129 echo json_encode(['msg'=>'ok']); 113 130 wp_die(); … … 254 271 'x-wp-version' => WECANTRACK_VERSION 255 272 ), 273 'sslverify' => WecantrackHelper::get_sslverify_option() 256 274 )); 257 275 -
wecantrack/trunk/WecantrackApp.php
r2564199 r2622887 307 307 ), 308 308 'body' => json_encode($post_data), 309 'sslverify' => WecantrackHelper::get_sslverify_option() 309 310 )); 310 311 … … 402 403 403 404 if ($expired || !isset($domain_patterns['origins']) || $forceRefresh) { 404 $response = wp_remote_get(WECANTRACK_API_BASE_URL . '/api/v1/domain_patterns?api_key=' . $api_key); 405 $response = wp_remote_get(WECANTRACK_API_BASE_URL . '/api/v1/domain_patterns?api_key=' . $api_key, array( 406 'sslverify' => WecantrackHelper::get_sslverify_option() 407 )); 408 405 409 $status = wp_remote_retrieve_response_code($response); 406 410 if ($status == 200) { -
wecantrack/trunk/WecantrackHelper.php
r2468989 r2622887 132 132 return $domainURL['scheme'].'://'.$domainURL['host']; 133 133 } 134 135 public static function get_sslverify_option() 136 { 137 $storage = json_decode(get_option('wecantrack_storage'), true); 138 return !empty($storage['disable_ssl']) ? false : true; 139 } 134 140 } -
wecantrack/trunk/readme.txt
r2564204 r2622887 5 5 Tested up to: 5.8 6 6 Requires PHP: 5.6.20 7 Stable tag: 1.2.1 17 Stable tag: 1.2.12 8 8 License: GPLv3 9 9 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html … … 60 60 61 61 == Changelog == 62 63 = 1.2.12 - 27th October 2021 = 64 * Overridable ssl verify option 62 65 63 66 = 1.2.11 - 14th July 2021 = -
wecantrack/trunk/views/advanced_settings.php
r2562891 r2622887 2 2 //nonce 3 3 $wecantrack_nonce = wp_create_nonce('wecantrack_nonce'); 4 $wecantrack_storage = json_decode(get_option('wecantrack_storage'), true); 4 5 5 6 //plugins status … … 11 12 $wecantrack_referrer_cookie_disabled = 'checked="checked"'; 12 13 } 14 15 $wecantrack_ssl_status_enabled = empty($wecantrack_storage['disable_ssl']) ? 'checked="checked"' : null; 16 $wecantrack_ssl_status_disabled = !empty($wecantrack_storage['disable_ssl']) ? 'checked="checked"' : null; 13 17 ?> 14 18 … … 51 55 </tr> 52 56 57 <tr class="wecantrack-plugin-status"> 58 <th scope="row"> 59 <label for=""><?php echo esc_html__('Verify SSL', 'wecantrack'); ?></label> 60 </th> 61 62 <td> 63 <fieldset> 64 <p> 65 <label> 66 <input name="wecantrack_ssl_status" type="radio" value="1" <?php echo $wecantrack_ssl_status_enabled ?>> 67 <?php echo esc_html__('Enable', 'wecantrack'); ?> 68 </label> 69 70 <label> 71 <input name="wecantrack_ssl_status" type="radio" value="0" <?php echo $wecantrack_ssl_status_disabled ?>> 72 <?php echo esc_html__('Disable', 'wecantrack'); ?> 73 </label> 74 </p> 75 </fieldset> 76 77 <p class="description">Verify SSL when making WCT API Request in the backend. If you have certification issues that you or your host is not able to solve you may set this to disable as a workaround.</p> 78 </td> 79 </tr> 80 53 81 </tbody> 54 82 </table> -
wecantrack/trunk/wecantrack.php
r2564199 r2622887 7 7 Plugin URI: https://wecantrack.com/wordpress 8 8 Description: Integrate all you affiliate sales in Google Analytics, Google Ads, Facebook, Data Studio and more! 9 Version: 1.2.1 19 Version: 1.2.12 10 10 Author: wecantrack.com 11 11 Author URI: https://wecantrack.com … … 17 17 if(!defined('ABSPATH')) { die('You are not allowed to call this page directly.'); } 18 18 19 define('WECANTRACK_VERSION', '1.2.1 1');19 define('WECANTRACK_VERSION', '1.2.12'); 20 20 define('WECANTRACK_PLUGIN_NAME', 'wecantrack'); 21 21 define('WECANTRACK_PATH', WP_PLUGIN_DIR.'/'.WECANTRACK_PLUGIN_NAME); … … 56 56 add_option('wecantrack_website_options', null, null); 57 57 add_option('wecantrack_version', null, null); 58 add_option('wecantrack_storage', null, null); 58 59 } 59 60 … … 76 77 delete_option('wecantrack_website_options'); 77 78 delete_option('wecantrack_version'); 79 delete_option('wecantrack_storage'); 78 80 } -
wecantrack/trunk/wecantrack.pot
r2562891 r2622887 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: WeCanTrack 1.2.1 0\n"5 "Project-Id-Version: WeCanTrack 1.2.12\n" 6 6 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wecantrack\n" 7 7 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 10 10 "Content-Type: text/plain; charset=UTF-8\n" 11 11 "Content-Transfer-Encoding: 8bit\n" 12 "POT-Creation-Date: 2021- 07-12T13:46:31+00:00\n"12 "POT-Creation-Date: 2021-10-26T21:35:34+00:00\n" 13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14 14 "X-Generator: WP-CLI 2.4.0\n" … … 35 35 msgstr "" 36 36 37 #: views/advanced_settings.php:3 137 #: views/advanced_settings.php:35 38 38 msgid "Use WCT referrer cookie" 39 39 msgstr "" 40 40 41 #: views/advanced_settings.php:39 41 #: views/advanced_settings.php:43 42 #: views/advanced_settings.php:67 42 43 #: views/redirect_page.php:51 43 44 #: views/settings.php:79 … … 45 46 msgstr "" 46 47 47 #: views/advanced_settings.php:44 48 #: views/advanced_settings.php:48 49 #: views/advanced_settings.php:72 48 50 #: views/redirect_page.php:56 49 51 #: views/settings.php:84 … … 51 53 msgstr "" 52 54 53 #: views/advanced_settings.php:57 55 #: views/advanced_settings.php:59 56 msgid "Verify SSL" 57 msgstr "" 58 59 #: views/advanced_settings.php:85 54 60 #: views/redirect_page.php:104 55 61 #: views/settings.php:109 … … 133 139 msgstr "" 134 140 135 #: WecantrackAdmin.php:2 11141 #: WecantrackAdmin.php:228 136 142 msgid "Something went wrong with the request" 137 143 msgstr "" 138 144 139 #: WecantrackAdmin.php:2 12145 #: WecantrackAdmin.php:229 140 146 msgid "Added at least 1 active network account" 141 147 msgstr "" 142 148 143 #: WecantrackAdmin.php:2 13149 #: WecantrackAdmin.php:230 144 150 msgid "You have not added at least 1 active network account. To add a network, click here." 145 151 msgstr "" 146 152 147 #: WecantrackAdmin.php:2 16153 #: WecantrackAdmin.php:233 148 154 msgid "verified" 149 155 msgstr "" 150 156 151 #: WecantrackAdmin.php:2 17157 #: WecantrackAdmin.php:234 152 158 msgid "Invalid API Key" 153 159 msgstr "" 154 160 155 #: WecantrackAdmin.php:2 18161 #: WecantrackAdmin.php:235 156 162 msgid "Invalid Request" 157 163 msgstr "" 158 164 159 #: WecantrackAdmin.php:2 19165 #: WecantrackAdmin.php:236 160 166 msgid "Valid API Key" 161 167 msgstr "" 162 168 163 #: WecantrackAdmin.php:2 20169 #: WecantrackAdmin.php:237 164 170 msgid "Your changes have been saved" 165 171 msgstr "" 166 172 167 #: WecantrackAdmin.php:2 21173 #: WecantrackAdmin.php:238 168 174 msgid "Something went wrong." 169 175 msgstr ""
Note: See TracChangeset
for help on using the changeset viewer.