💦 FULL SET: Changeset/ - Complete Album!

Changeset 713729


Ignore:
Timestamp:
05/16/2013 04:23:45 AM (13 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);