WordPress.org
Get WordPress

Plugin Directory

Changeset 713729


Ignore:
Timestamp:
05/16/2013 04:23:45 AM (12 years ago)
Author:
Messenlehner
Message:

Updates for 4.0.1 to work with WP 3.5

Location:
bp-registration-options/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • bp-registration-options/trunk/bp-registration-options.php

    r615824 r713729  
    4545    }
    4646}
    47 
    48 ?>

  • bp-registration-options/trunk/includes/admin.php

    r615824 r713729  
    1717    if(is_admin()){
    1818        global $wpdb, $bp, $wds_bp_member_requests;
    19         $rs = $wpdb->get_results( $wpdb->prepare( "Select ID from ".$wpdb->base_prefix."users where user_status in (2,69)" ) );
     19        $rs = $wpdb->get_results( $wpdb->prepare( 'Select ID from '.$wpdb->base_prefix.'users where user_status in (2,69)' , '') );
    2020        $wds_bp_member_requests = count( $rs );
    2121    }
    … …  
    8080                        wp_delete_user( $user_id );
    8181                    } elseif ( $action == "Approve" ) {
    82                         $sql="update ".$wpdb->base_prefix."users set user_status=0 where ID=$user_id";
    83                         $wpdb->query($wpdb->prepare($sql));
    84                         $sql="update ".$wpdb->base_prefix."bp_activity set hide_sitewide=0 where user_id=$user_id";
    85                         $wpdb->query($wpdb->prepare($sql));
     82                        $sql='update '.$wpdb->base_prefix.'users set user_status=0 where ID=%d';
     83                        $wpdb->query($wpdb->prepare($sql, $user_id));
     84                        $sql='update ' .$wpdb->base_prefix.'bp_activity set hide_sitewide=0 where user_id=%d';
     85                        $wpdb->query($wpdb->prepare($sql, $user_id));
    8686                    }
    8787                    //only send out message if one exists
    … …  
    9696            }
    9797            //reset global
    98             $rs = $wpdb->get_results( $wpdb->prepare( "Select ID from ".$wpdb->base_prefix."users where user_status in (2,69)" ) );
     98            $rs = $wpdb->get_results( $wpdb->prepare( 'Select ID from '.$wpdb->base_prefix.'users where user_status in (2,69)', '' ) );
    9999            $wds_bp_member_requests = count( $rs );
    100100        }
    … …  
    113113function wds_bp_registration_options_admin_messages(){
    114114    global $wds_bp_member_requests;
    115     if ( $wds_bp_member_requests > 0 && isset( $_GET['page'] ) != 'bp_registration_options_member_requests' ) {
     115    if ( $wds_bp_member_requests > 0 && isset( $_GET['page'] ) != 'bp_registration_options_member_requests' && current_user_can('add_users')) {
    116116        $s = '';
    117117        if ( $wds_bp_member_requests != 1 ) {
    118118            $s = 's';
    119119        }
    120         echo '<div class="error"><p>You have <a href="'.site_url().'/wp-admin/admin.php?page=bp_registration_options_member_requests"><strong>'.$wds_bp_member_requests.' new member request'.$s.'</strong></a> that need to be approved or denied. Please <a href="'.site_url().'/wp-admin/admin.php?page=bp_registration_options_member_requests">click here</a> to take action.</p></div>';
     120        echo '<div class="error"><p>You have <a href="'.admin_url('/admin.php?page=bp_registration_options_member_requests').'"><strong>'.$wds_bp_member_requests.' new member request'.$s.'</strong></a> that need to be approved or denied. Please <a href="'.admin_url('/admin.php?page=bp_registration_options_member_requests').'">click here</a> to take action.</p></div>';
    121121    }
    122122}
    … …  
    204204            <tr>
    205205                <td align="right" valign="top">Activate & Profile Alert Message:</td>
    206                 <td><textarea name="activate_message" style="width:500px;height:100px;"><?php echo $activate_message;?></textarea></td>
     206                <td><textarea name="activate_message" style="width:500px;height:100px;"><?php echo stripslashes($activate_message);?></textarea></td>
    207207            </tr>
    208208            <tr>
    209209                <td align="right" valign="top">Account Approved Email:</td>
    210                 <td><textarea name="approved_message" style="width:500px;height:100px;"><?php echo $approved_message;?></textarea></td>
     210                <td><textarea name="approved_message" style="width:500px;height:100px;"><?php echo stripslashes($approved_message);?></textarea></td>
    211211            </tr>
    212212            <tr>
    213213                <td align="right" valign="top">Account Denied Email:</td>
    214                 <td><textarea name="denied_message" style="width:500px;height:100px;"><?php echo $denied_message;?></textarea></td>
     214                <td><textarea name="denied_message" style="width:500px;height:100px;"><?php echo stripslashes($denied_message);?></textarea></td>
    215215            </tr>
    216216            <tr>
    … …  
    248248        if ( $wds_bp_member_requests > 0 ) {
    249249            if (isset($_GET["p"])) { $page  = $_GET["p"]; } else { $page=1; };
     250            $total_pages = ceil($wds_bp_member_requests / 20);
    250251            $start_from = ($page-1) * 20;
    251             $sql = "select ID from ".$wpdb->base_prefix."users where user_status in (2,69) order by user_registered LIMIT $start_from, 20";
    252             $total_pages = ceil($wds_bp_member_requests / 20);
    253             $rs = $wpdb->get_results( $wpdb->prepare( $sql ) );?>
     252            $sql = 'select ID from ' .$wpdb->base_prefix.'users where user_status in (2,69) order by user_registered LIMIT %d, 20';
     253            $rs = $wpdb->get_results( $wpdb->prepare( $sql , $start_from) );?>
    254254            <form method="post" name="bprwg">
    255255            <?php if ( function_exists('wp_nonce_field') ) wp_nonce_field('bp_reg_options_check'); ?>
    … …  
    393393      </table>
    394394      <?php
    395 }?>
     395}

  • bp-registration-options/trunk/includes/core.php

    r615824 r713729  
    3232                if ( $bp->pages->register->slug ) {
    3333                    wp_redirect( site_url().'/'.$bp->pages->register->slug );
     34                    exit();
    3435                } else {
    3536                    exit();
    … …  
    4041                if ( $user->user_status == 69 ) {
    4142                    wp_redirect( $bp->loggedin_user->domain );
     43                    exit;
    4244                }
    4345            }
    … …  
    185187    global $wpdb, $user_ID, $bp_moderate, $bp;
    186188    if ( $bp_moderate ) {
    187         $sql = "update ".$wpdb->base_prefix."bp_activity set hide_sitewide=1 where user_id=$user_ID";
    188         $wpdb->query( $wpdb->prepare( $sql ) );
     189        $sql = 'update '.$wpdb->base_prefix.'bp_activity set hide_sitewide=1 where user_id=%d';
     190        $wpdb->query( $wpdb->prepare( $sql, $user_ID) );
    189191    }
    190192}
    … …  
    206208    }
    207209    if ( $bp_moderate && isset( $_GET['key'] ) || $bp_moderate && $user_ID > 0 ) {
    208         $activate_message = get_option('bprwg_activate_message');
     210        $activate_message = stripslashes(get_option('bprwg_activate_message'));
    209211        echo '<div id="message" class="error"><p>'.$activate_message.'</p></div>';
    210212    }
    … …  
    224226function wds_bp_registration_options_bp_core_activate_account($user_id){
    225227    global $wpdb, $bp_moderate;
    226     if ( $bp_moderate ) {
     228    if ( $bp_moderate &&  $user_id > 0) {
    227229        if ( isset( $_GET['key'] ) ) {
    228             //Hide user created by new user on activation. 
    229             $sql = "update ".$wpdb->base_prefix."users set user_status=69 where ID=$user_id";
    230             $wpdb->query( $wpdb->prepare( $sql ) );
     230            //Hide user created by new user on activation.
     231            $sql = 'update '.$wpdb->base_prefix.'users set user_status=69 where ID=%d';
     232            $wpdb->query( $wpdb->prepare( $sql, $user_id) );
    231233            //Hide activity created by new user
    232             $sql = "update ".$wpdb->base_prefix."bp_activity set hide_sitewide=1 where user_id=$user_id";
    233             $wpdb->query( $wpdb->prepare ($sql ) );
     234            $sql = 'update '.$wpdb->base_prefix.'bp_activity set hide_sitewide=1 where user_id=%d';
     235            $wpdb->query( $wpdb->prepare ($sql, $user_id) );
    234236            //save user ip address
    235237            update_user_meta($user_id, 'bprwg_ip_address', $_SERVER['REMOTE_ADDR']);
    … …  
    238240            $user_name = $user->user_login;
    239241            $user_email = $user->user_email;
    240             $mod_email = $user_name." (".$user_email.") would like to become a member of your website, to accept or reject their request please go to ".get_bloginfo("url")."/wp-admin/admin.php?page=bp-registration-options&view=members \n\n";
     242            $mod_email = $user_name." (".$user_email.") would like to become a member of your website, to accept or reject their request please go to ".admin_url('/admin.php?page=bp_registration_options_member_requests')." \n\n";
    241243            $admin_email = get_bloginfo( 'admin_email' );
    242244            wp_mail( $admin_email, 'New Member Request', $mod_email );
    … …  
    244246    }
    245247}
    246 
    247 ?>
     248function wds_bp_registration_options_bp_before_member_header(){
     249}

  • bp-registration-options/trunk/loader.php

    r615824 r713729  
    44Plugin URI: http://wordpress.org/extend/plugins/bp-registration-options/
    55Description: BuddyPress plugin that allows for new member moderation, if moderation is switched on any new members will be blocked from interacting with any buddypress elements (except editing their own profile and uploading their avatar) and will not be listed in any directory until an admin approves or denies their account.
    6 Version: 4.0
    7 Author: Brian Messenlehner of WebDevStudios
     6Version: 4.0.1
     7Author: Brian Messenlehner of WebDevStudios & Jibbius
    88Author URI: http://webdevstudios.com/about/brian-messenlehner/
    99Licence: GPLv3
    1010*/
    1111
    12 define( 'BP_REGISTRATION_OPTIONS_VERSION', '4.0' );
     12define( 'BP_REGISTRATION_OPTIONS_VERSION', '4.0.1' );
    1313
    1414/**
    … …  
    2323}
    2424add_action( 'bp_include', 'wds_bp_registration_options_init' );
    25 ?>

  • bp-registration-options/trunk/readme.txt

    r615824 r713729  
    11=== BuddyPress Registration Options ===
    22
    3 Contributors: Messenlehner, webdevstudios
     3Contributors: webdevstudios, Messenlehner, jibbius
    44
    55Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3084056
    … …  
    1111Tested up to: 3.5
    1212
    13 Stable tag: 4.0.0
     13Stable tag: 4.0.1
    1414
    1515License: GPLv2
    … …  
    5555
    5656== Changelog ==
     57
     58= 4.0.1 =
     59
     60* Fixes for WP 3.5. Thanks jibbius!
    5761
    5862= 4.0.0 =
Note: See TracChangeset for help on using the changeset viewer.