Changeset 1985236
- Timestamp:
- 12/04/2018 02:43:46 PM (7 years ago)
- Location:
- optinmonster
- Files:
-
- 62 added
- 4 edited
-
tags/1.5.2 (added)
-
tags/1.5.2/OMAPI (added)
-
tags/1.5.2/OMAPI/Actions.php (added)
-
tags/1.5.2/OMAPI/Ajax.php (added)
-
tags/1.5.2/OMAPI/Api.php (added)
-
tags/1.5.2/OMAPI/Content.php (added)
-
tags/1.5.2/OMAPI/Menu.php (added)
-
tags/1.5.2/OMAPI/Output.php (added)
-
tags/1.5.2/OMAPI/Refresh.php (added)
-
tags/1.5.2/OMAPI/Review.php (added)
-
tags/1.5.2/OMAPI/Rules.php (added)
-
tags/1.5.2/OMAPI/Save.php (added)
-
tags/1.5.2/OMAPI/Shortcode.php (added)
-
tags/1.5.2/OMAPI/Type.php (added)
-
tags/1.5.2/OMAPI/Utils.php (added)
-
tags/1.5.2/OMAPI/Validate.php (added)
-
tags/1.5.2/OMAPI/Welcome.php (added)
-
tags/1.5.2/OMAPI/Widget.php (added)
-
tags/1.5.2/assets (added)
-
tags/1.5.2/assets/css (added)
-
tags/1.5.2/assets/css/images (added)
-
tags/1.5.2/assets/css/images/dashboard-icon.png (added)
-
tags/1.5.2/assets/css/images/featured-logos.png (added)
-
tags/1.5.2/assets/css/images/features-ab-testing.png (added)
-
tags/1.5.2/assets/css/images/features-analytics.png (added)
-
tags/1.5.2/assets/css/images/features-builder.png (added)
-
tags/1.5.2/assets/css/images/features-exit-animated.gif (added)
-
tags/1.5.2/assets/css/images/logo-color-large.png (added)
-
tags/1.5.2/assets/css/images/logo-color-large@2x.png (added)
-
tags/1.5.2/assets/css/images/matthewwoodward.png (added)
-
tags/1.5.2/assets/css/images/menu-icon@2x.png (added)
-
tags/1.5.2/assets/css/images/michaelstelzner.png (added)
-
tags/1.5.2/assets/css/images/neilpatel.png (added)
-
tags/1.5.2/assets/css/images/omapi-graph.png (added)
-
tags/1.5.2/assets/css/images/title-icon@2x.png (added)
-
tags/1.5.2/assets/css/images/video-cta-button.png (added)
-
tags/1.5.2/assets/css/select2-spinner.gif (added)
-
tags/1.5.2/assets/css/select2.min.css (added)
-
tags/1.5.2/assets/css/select2.png (added)
-
tags/1.5.2/assets/css/select2x2.png (added)
-
tags/1.5.2/assets/css/settings.css (added)
-
tags/1.5.2/assets/fonts (added)
-
tags/1.5.2/assets/fonts/FontAwesome.otf (added)
-
tags/1.5.2/assets/fonts/archie.eot (added)
-
tags/1.5.2/assets/fonts/archie.svg (added)
-
tags/1.5.2/assets/fonts/archie.ttf (added)
-
tags/1.5.2/assets/fonts/archie.woff (added)
-
tags/1.5.2/assets/fonts/fontawesome-webfont.eot (added)
-
tags/1.5.2/assets/fonts/fontawesome-webfont.svg (added)
-
tags/1.5.2/assets/fonts/fontawesome-webfont.ttf (added)
-
tags/1.5.2/assets/fonts/fontawesome-webfont.woff (added)
-
tags/1.5.2/assets/js (added)
-
tags/1.5.2/assets/js/clipboard.min.js (added)
-
tags/1.5.2/assets/js/helper.js (added)
-
tags/1.5.2/assets/js/jspdf.min.js (added)
-
tags/1.5.2/assets/js/select2.min.js (added)
-
tags/1.5.2/assets/js/settings.js (added)
-
tags/1.5.2/assets/js/tooltip.min.js (added)
-
tags/1.5.2/includes (added)
-
tags/1.5.2/includes/class-am-notification.php (added)
-
tags/1.5.2/optin-monster-wp-api.php (added)
-
tags/1.5.2/readme.txt (added)
-
trunk/assets/css/settings.css (modified) (1 diff)
-
trunk/includes/class-am-notification.php (modified) (7 diffs)
-
trunk/optin-monster-wp-api.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
optinmonster/trunk/assets/css/settings.css
r1492937 r1985236 534 534 .omapi-optin .omapi-links a { 535 535 font-size: 12px; 536 color: #555d66;537 }538 539 .omapi-optin .omapi-links a:hover {540 color: #23282d;541 536 } 542 537 -
optinmonster/trunk/includes/class-am-notification.php
r1936255 r1985236 11 11 * @license GPL-2.0+ 12 12 * @copyright Copyright (c) 2017, Retyp LLC 13 * @version 1.0. 613 * @version 1.0.7 14 14 */ 15 15 class AM_Notification { … … 76 76 public function custom_post_type() { 77 77 register_post_type( 'amn_' . $this->plugin, array( 78 'supports' => false, 78 'can_export' => false, 79 'supports' => false, 80 'capability_type' => 'manage_options' 79 81 ) ); 80 82 } … … 86 88 */ 87 89 public function get_remote_notifications() { 88 if ( ! current_user_can( apply_filters( 'am_notifications_display', 'manage_options') ) ) {90 if ( ! apply_filters( 'am_notifications_display', is_super_admin() ) ) { 89 91 return; 90 92 } … … 181 183 */ 182 184 public function display_notifications() { 183 if ( ! current_user_can( apply_filters( 'am_notifications_display', 'manage_options') ) ) {185 if ( ! apply_filters( 'am_notifications_display', is_super_admin() ) ) { 184 186 return; 185 187 } … … 338 340 } 339 341 break; 342 case 'mi-lite' : 340 343 case 'mi' : 341 $option = get_option( 'monsterinsights_license' ); 342 $key = is_array( $option ) && isset( $option['key'] ) ? $option['key'] : ''; 343 $level = is_array( $option ) && isset( $option['type'] ) ? $option['type'] : ''; 344 345 // Possibly check for a constant. 346 if ( empty( $key ) && defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) { 347 $key = MONSTERINSIGHTS_LICENSE_KEY; 344 if ( version_compare( MONSTERINSIGHTS_VERSION, '6.9.0', '>=' ) ) { 345 if ( MonsterInsights()->license->get_site_license_type() ) { 346 $key = MonsterInsights()->license->get_site_license_key(); 347 $type = MonsterInsights()->license->get_site_license_type(); 348 } else if ( MonsterInsights()->license->get_network_license_type() ) { 349 $key = MonsterInsights()->license->get_network_license_key(); 350 $type = MonsterInsights()->license->get_network_license_type(); 351 } 352 // Check key fallbacks 353 if ( empty( $key ) ) { 354 $key = MonsterInsights()->license->get_license_key(); 355 } 356 } else { 357 $option = get_option( 'monsterinsights_license' ); 358 $key = is_array( $option ) && isset( $option['key'] ) ? $option['key'] : ''; 359 $level = is_array( $option ) && isset( $option['type'] ) ? $option['type'] : ''; 360 // Possibly check for a constant. 361 if ( empty( $key ) && defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) { 362 $key = MONSTERINSIGHTS_LICENSE_KEY; 363 } 348 364 } 349 365 break; … … 367 383 if ( empty( $key ) && empty( $level ) ) { 368 384 $level = 'none'; 385 } 386 387 // Possibly set the level to 'unknown' if a key is entered, but no level can be determined (such as manually entered key) 388 if ( ! empty( $key ) && empty( $level ) ) { 389 $level = 'unknown'; 369 390 } 370 391 … … 399 420 */ 400 421 public function dismiss_notification() { 401 if ( ! current_user_can( apply_filters( 'am_notifications_display', 'manage_options') ) ) {422 if ( ! apply_filters( 'am_notifications_display', is_super_admin() ) ) { 402 423 die; 403 424 } -
optinmonster/trunk/optin-monster-wp-api.php
r1936255 r1985236 6 6 * Author: OptinMonster Team 7 7 * Author URI: https://optinmonster.com 8 * Version: 1.5. 18 * Version: 1.5.2 9 9 * Text Domain: optin-monster-api 10 10 * Domain Path: languages … … 61 61 * @var string 62 62 */ 63 public $version = '1.5. 1';63 public $version = '1.5.2'; 64 64 65 65 /** -
optinmonster/trunk/readme.txt
r1981574 r1985236 5 5 Tested up to: 5.0 6 6 Requires PHP: 5.3 7 Stable tag: 1.5. 17 Stable tag: 1.5.2 8 8 License: GNU General Public License v2.0 or later 9 9 … … 176 176 == Changelog == 177 177 178 = 1.5.2 = 179 * Fixed potential privilege escalation bug. 180 * Bumped for 5.0. 181 178 182 = 1.5.1 = 179 183 * Fixed a possible security issue with admin notices.
Note: See TracChangeset
for help on using the changeset viewer.