From 6c937c2d2d094eacb464e15135006f59f1b7a962 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 23 Jul 2015 17:06:12 -0400 Subject: [PATCH] Fix bug in the simple plugin --- classes/class.simple-wp-membership.php | 62 +++++++++++++------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/classes/class.simple-wp-membership.php b/classes/class.simple-wp-membership.php index 2502f3d..2613266 100644 --- a/classes/class.simple-wp-membership.php +++ b/classes/class.simple-wp-membership.php @@ -27,7 +27,7 @@ include_once('class.bTransactions.php'); class SimpleWpMembership { public function __construct() { - add_action('admin_menu', array(&$this, 'menu')); + add_action('admin_menu', array(&$this, 'menu')); add_action('init', array(&$this, 'init')); add_filter('the_content', array(&$this, 'filter_content'),11,1); @@ -55,8 +55,8 @@ class SimpleWpMembership { add_action('profile_update', array(&$this, 'sync_with_wp_profile'), 10, 2); add_action('wp_logout', array(&$this, 'wp_logout')); add_action('wp_authenticate', array(&$this, 'wp_login'), 1, 2); - add_action('swpm_logout', array(&$this, 'swpm_logout')); - + add_action('swpm_logout', array(&$this, 'swpm_logout')); + //AJAX hooks add_action('wp_ajax_swpm_validate_email', 'BAjax::validate_email_ajax'); add_action('wp_ajax_nopriv_swpm_validate_email', 'BAjax::validate_email_ajax'); @@ -68,16 +68,16 @@ class SimpleWpMembership { add_action('plugins_loaded', array(&$this, "plugins_loaded")); add_action('password_reset', array(&$this, 'wp_password_reset_hook'), 10, 2); } - function wp_password_reset_hook( $user, $pass ) + function wp_password_reset_hook( $user, $pass ) { $swpm_id = BUtils::get_user_by_user_name($user->user_login); if (!empty($swpm_id)){ $password_hash = BUtils::encrypt_password($pass); global $wpdb; $wpdb->update($wpdb->prefix . "swpm_members_tbl", array('password' => $password_hash), array('member_id' => $swpm_id)); - } + } } - + public function save_attachment_extra($post, $attachment) { $this->save_postdata($post['ID']); return $post; @@ -86,18 +86,18 @@ class SimpleWpMembership { if(is_admin()){//No need to filter on the admin side return $content; } - + $acl = BAccessControl::get_instance(); if (has_post_thumbnail($post_id)){ return $content;} if ($acl->can_i_read_post($post_id)) {return $content;} - - + + if (isset($content['file'])){ $content['file'] = 'restricted-icon.png'; $content['width'] = '400'; $content['height'] = '400'; } - + if (isset($content['sizes'])){ if ($content['sizes']['thumbnail']){ $content['sizes']['thumbnail']['file'] = 'restricted-icon.png'; @@ -114,19 +114,19 @@ class SimpleWpMembership { } return $content; } - + public function filter_attachment_url($content, $post_id){ if(is_admin()){//No need to filter on the admin side return $content; } $acl = BAccessControl::get_instance(); if (has_post_thumbnail($post_id)){return $content;} - + if ($acl->can_i_read_post($post_id)){return $content;} - + return BUtils::get_restricted_image_url(); } - + public function admin_init_hook(){ BSettings::get_instance()->init_config_hooks(); $addon_saved = filter_input(INPUT_POST, 'swpm-addon-settings'); @@ -134,7 +134,7 @@ class SimpleWpMembership { do_action('swpm_addon_settings_save'); } } - + public function hide_adminbar(){ if (!is_user_logged_in()){//Never show admin bar if the user is not even logged in return false; @@ -170,7 +170,7 @@ class SimpleWpMembership { } public function wp_login($username, $password) { - $auth = BAuth::get_instance(); + $auth = BAuth::get_instance(); if (($auth->is_logged_in() &&($auth->userData->user_name == $username))) { return; } @@ -313,7 +313,7 @@ class SimpleWpMembership { $query = "SELECT * FROM " . $wpdb->prefix . "swpm_membership_tbl WHERE id !=1 "; $levels = $wpdb->get_results($query, ARRAY_A); foreach ($levels as $level) { - echo 'is_permitted($id) ? "checked='checked'" : "") . + echo 'is_permitted($id) ? "checked='checked'" : "") . ' name="swpm_protection_level[' . $level['id'] . ']" value="' . $level['id'] . '" /> ' . $level['alias'] . "
"; } } @@ -469,7 +469,7 @@ class SimpleWpMembership { } private function edit_profile() { - $swpm_editprofile_submit = filter_input(INPUT_POST, 'swpm_editprofile_submit'); + $swpm_editprofile_submit = filter_input(INPUT_POST, 'swpm_editprofile_submit'); if (!empty($swpm_editprofile_submit)) { BFrontRegistration::get_instance()->edit(); //todo: do a redirect @@ -481,10 +481,10 @@ class SimpleWpMembership { wp_enqueue_script('password-strength-meter'); wp_enqueue_script('swpm.password-meter', SIMPLE_WP_MEMBERSHIP_URL . '/js/swpm.password-meter.js'); wp_enqueue_style('jquery.tools.dateinput', SIMPLE_WP_MEMBERSHIP_URL . '/css/jquery.tools.dateinput.css'); - wp_enqueue_script('jquery.tools', SIMPLE_WP_MEMBERSHIP_URL . '/js/jquery.tools18.min.js'); + wp_enqueue_script('jquery.tools', SIMPLE_WP_MEMBERSHIP_URL . '/js/jquery.tools18.min.js'); $settings = array('statusChangeEmailHead'=> BSettings::get_instance()->get_value('account-change-email-subject'), 'statusChangeEmailBody'=> BSettings::get_instance()->get_value('account-change-email-body')); - wp_localize_script( 'swpm.password-meter', 'SwpmSettings', $settings ); + wp_localize_script( 'swpm.password-meter', 'SwpmSettings', $settings ); } public function front_library() { @@ -505,7 +505,7 @@ class SimpleWpMembership { return; } $is_free = BSettings::get_instance()->get_value('enable-free-membership'); - $free_level = absint(BSettings::get_instance()->get_value('free-membership-id')); + $free_level = absint(BSettings::get_instance()->get_value('free-membership-id')); $level = isset($atts['level'])? absint($atts['level']): ($is_free? $free_level: null); return BFrontRegistration::get_instance()->regigstration_ui($level); } @@ -533,7 +533,7 @@ class SimpleWpMembership { 'manage_options', 'simple_wp_membership_payments', array(&$this, "payments_menu")); add_submenu_page($menu_parent_slug, __("Add-ons", 'swpm'), __("Add-ons", 'swpm'), 'manage_options', 'simple_wp_membership_addons', array(&$this, "add_ons_menu")); - + do_action('swpm_after_main_admin_menu', $menu_parent_slug); $this->meta_box(); @@ -589,7 +589,7 @@ class SimpleWpMembership { switch ($current_tab) { case 6: include(SIMPLE_WP_MEMBERSHIP_PATH . 'views/admin_addon_settings.php'); - break; + break; case 4: $link_for = filter_input(INPUT_POST, 'swpm_link_for',FILTER_SANITIZE_STRING); $member_id = filter_input(INPUT_POST, 'member_id',FILTER_SANITIZE_NUMBER_INT); @@ -605,11 +605,11 @@ class SimpleWpMembership { break; } } - + public function payments_menu(){ include(SIMPLE_WP_MEMBERSHIP_PATH . 'views/admin_payments_page.php'); } - + public function add_ons_menu(){ include(SIMPLE_WP_MEMBERSHIP_PATH . 'views/admin_add_ons_page.php'); } @@ -622,19 +622,19 @@ class SimpleWpMembership { include_once('class.bInstallation.php'); BInstallation::run_safe_installer(); } - } + } } - + public static function activate() { wp_schedule_event(time(), 'daily', 'swpm_account_status_event'); wp_schedule_event(time(), 'daily', 'swpm_delete_pending_account_event'); include_once('class.bInstallation.php'); BInstallation::run_safe_installer(); } - + public function deactivate() { wp_clear_scheduled_hook('swpm_account_status_event'); - wp_clear_scheduled_hook('swpm_delete_pending_account_event'); + wp_clear_scheduled_hook('swpm_delete_pending_account_event'); } private function verify_and_delete_account(){ include_once(SIMPLE_WP_MEMBERSHIP_PATH . 'classes/class.bMembers.php'); @@ -647,11 +647,11 @@ class SimpleWpMembership { if (empty($password)){ BUtils::account_delete_confirmation_ui(); } - + $nonce_field = filter_input(INPUT_POST, 'account_delete_confirm_nonce'); if (empty($nonce_field) || !wp_verify_nonce($nonce_field, 'swpm_account_delete_confirm')){ BUtils::account_delete_confirmation_ui(BUtils::_("Sorry, Nonce verification failed.")); - } + } if ($auth->match_password($password)){ $auth->delete(); wp_redirect(home_url()); -- 2.17.1