WordPress.org
Get WordPress

Plugin Directory

Changeset 713712


Ignore:
Timestamp:
05/16/2013 02:53:48 AM (12 years ago)
Author:
Messenlehner
Message:
  • Fix: Fixed bug that prevented unlocking achievements attached to unlocked steps.
  • Fix: Check if group component is turned on before querying groups.
Location:
badgeos-community-add-on/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • badgeos-community-add-on/trunk/badgeos-community.php

    r710053 r713712  
    66 * Tags: buddypress
    77 * Author: Credly
    8  * Version: 1.0.1
     8 * Version: 1.0.2
    99 * Author URI: https://credly.com/
    1010 * License: GNU AGPL

  • badgeos-community-add-on/trunk/includes/bp-activity.php

    r707200 r713712  
    1515 * @since 1.0.0
    1616 */
    17 function badgeos_award_achievement_bp_activity( $user_id, $achievement_id ){
     17function badgeos_award_achievement_bp_activity( $user_id, $achievement_id ) {
    1818
    19     if( !$user_id || !$achievement_id )
     19    if ( ! $user_id || ! $achievement_id )
    2020        return false;
    2121
    22     $post = get_post($achievement_id);
     22    $post = get_post( $achievement_id );
    2323    $type = $post->post_type;
    2424
    2525    // Don't make activity posts for step post type
    26     if( 'step' == $type )
     26    if ( 'step' == $type )
    2727        return false;
    2828
    … …  
    3030    $achievement_type = get_page_by_title( $type, 'OBJECT', 'achievement-type' );
    3131    $can_bp_activity = get_post_meta( $achievement_type->ID, '_badgeos_create_bp_activty', true );
    32     if( $can_bp_activity )
     32    if ( ! $can_bp_activity )
    3333        return false;
    3434
    … …  
    4444    // Insert the activity
    4545    bp_activity_add( array(
    46         'action'       => sprintf( __( '%1$s earned a %2$s: %3$s', 'badgeos-community' ), bp_core_get_userlink( $user_id ), $post_type_singular_name, '<a href="' . get_permalink( $achievement_id ) . '">' . $post->post_title . '</a>' ),
    47         'content'      => $content,
    48         'component'    => 'badgeos',
    49         'type'         => 'activity_update',
    50         'primary_link' => get_permalink( $achievement_id ),
    51         'user_id'      => $user_id
    52     ) );
     46            'action'       => sprintf( __( '%1$s earned a %2$s: %3$s', 'badgeos-community' ), bp_core_get_userlink( $user_id ), $post_type_singular_name, '<a href="' . get_permalink( $achievement_id ) . '">' . $post->post_title . '</a>' ),
     47            'content'      => $content,
     48            'component'    => 'badgeos',
     49            'type'         => 'activity_update',
     50            'primary_link' => get_permalink( $achievement_id ),
     51            'user_id'      => $user_id
     52        ) );
    5353
    5454}

  • badgeos-community-add-on/trunk/includes/bp-members.php

    r710053 r713712  
    2929
    3030    $achievement_types = badgeos_get_user_earned_achievement_types( bp_displayed_user_id() );
     31    // Eliminate step cpt from array
     32    if ( ( $key = array_search( 'step', $achievement_types ) ) !== false ) {
     33        unset( $achievement_types[$key] );
     34        $achievement_types = array_values( $achievement_types );
     35    }
    3136    if ( is_array( $achievement_types ) ) {
    32         foreach( $achievement_types as $achievement_type){
     37        foreach ( $achievement_types as $achievement_type ) {
    3338            $name = get_post_type_object( $achievement_type )->labels->name;
    34             $slug = str_replace(' ', '-', strtolower( $name ) );
     39            $slug = str_replace( ' ', '-', strtolower( $name ) );
    3540            if ( $slug && strpos( $_SERVER[REQUEST_URI], $slug ) ) {
    3641                $type = $achievement_type;
    3742            }
    3843        }
    39         if( !$type ) {
     44        if ( ! $type )
    4045            $type = $achievement_types[0];
    41         }
    4246    }
    4347
    … …  
    5054        'user_id'     => bp_displayed_user_id(),
    5155    );
    52     echo badgeos_achievements_list_shortcode($atts);
     56    echo badgeos_achievements_list_shortcode( $atts );
    5357}
    5458
    … …  
    7478 * @since 1.0.0
    7579 */
    76 function badgeos_bp_core_general_settings_before_submit(){
     80function badgeos_bp_core_general_settings_before_submit() {
    7781    $credly_user_enable = get_user_meta( bp_displayed_user_id(), 'credly_user_enable', true );?>
    7882    <label for="credly"><?php _e( 'Badge Sharing', 'badgeos-community' ); ?></label>
    7983    <input type="checkbox" value="true" <?php checked( $credly_user_enable, 'true' ); ?> name="credly_user_enable">
    80     <?php echo _e('Send eligible earned badges to Credly','badgeos-community');
    81 }
    82 add_action('bp_core_general_settings_before_submit','badgeos_bp_core_general_settings_before_submit');
     84    <?php echo _e( 'Send eligible earned badges to Credly', 'badgeos-community' );
     85}
     86add_action( 'bp_core_general_settings_before_submit', 'badgeos_bp_core_general_settings_before_submit' );
    8387
    8488/**
    … …  
    8791 * @since 1.0.0
    8892 */
    89 function badgeos_bp_core_general_settings_after_save(){
     93function badgeos_bp_core_general_settings_after_save() {
    9094    $credly_enable = get_user_meta( bp_displayed_user_id(), 'credly_user_enable', true );
    9195    $credly_enable2 = ( ! empty( $_POST['credly_user_enable'] ) && $_POST['credly_user_enable'] == 'true' ? 'true' : 'false' );
    92     if( $credly_enable != $credly_enable2 ){
     96    if ( $credly_enable != $credly_enable2 ) {
    9397        bp_core_add_message( __( 'Your settings have been saved.', 'buddypress' ), 'success' );
    9498        update_user_meta( bp_displayed_user_id(), 'credly_user_enable', $credly_enable2 );
    9599    }
    96100}
    97 add_action('bp_core_general_settings_after_save','badgeos_bp_core_general_settings_after_save');
     101add_action( 'bp_core_general_settings_after_save', 'badgeos_bp_core_general_settings_after_save' );
    98102
    99103
    … …  
    117121    public function setup_globals( $args = '' ) {
    118122        parent::setup_globals( array(
    119             'has_directory' => true,
    120             'root_slug'     => 'achievements',
    121             'slug'          => 'achievements',
    122         ) );
     123                'has_directory' => true,
     124                'root_slug'     => 'achievements',
     125                'slug'          => 'achievements',
     126            ) );
    123127    }
    124128
    … …  
    143147            'posts_per_page' => -1
    144148        );
    145         $query = new WP_Query($args);
    146         if( $query->have_posts() ) {
    147             while ($query->have_posts()) : $query->the_post();
    148                 $arr_achivement_types[$query->post->post_name] = $query->post->ID;
    149             endwhile;
     149        $query = new WP_Query( $args );
     150        if ( $query->have_posts() ) {
     151            while ( $query->have_posts() ) : $query->the_post();
     152            $arr_achivement_types[$query->post->post_name] = $query->post->ID;
     153            endwhile;
    150154        }
    151155
    152156        // Loop achievement types current user has earned
    153157        $achievement_types = badgeos_get_user_earned_achievement_types( bp_displayed_user_id() );
    154         foreach( $achievement_types as $achievement_type){
     158        foreach ( $achievement_types as $achievement_type ) {
    155159
    156160            $achievement_object = get_post_type_object( $achievement_type );
    157             $name = is_object( $achievement_object ) ? $achievement_object->labels->name : '';
    158             $slug = str_replace(' ', '-', strtolower( $name ) );
     161            $name = is_object( $achievement_object ) ? $achievement_object->labels->name : '';
     162            $slug = str_replace( ' ', '-', strtolower( $name ) );
    159163            // Get post_id of earned achievement type slug
    160164            $post_id = isset( $arr_achivement_types[$achievement_type] ) ? $arr_achivement_types[$achievement_type] : 0;
    161             if( $post_id ) {
     165            if ( $post_id ) {
    162166
    163167                //check if this achievement type can be shown on the member profile page
    … …  
    166170
    167171                    // Only run once to set main nav and defautl sub nav
    168                     if( empty( $main ) ) {
     172                    if ( empty( $main ) ) {
    169173                        // Add to the main navigation
    170174                        $main_nav = array(
    … …  
    202206 *
    203207 * @since  1.0.0
    204  * @param  string $user_content The list item output for the given user
    205  * @param  integer $user_id     The given user's ID
     208 * @param string $user_content The list item output for the given user
     209 * @param integer $user_id      The given user's ID
    206210 * @return string               The updated user output
    207211 */

  • badgeos-community-add-on/trunk/includes/rules-engine.php

    r710053 r713712  
    7878    // If we're not dealing with a step, bail here
    7979    if ( 'step' != get_post_type( $achievement_id ) )
    80         return;
     80        return $return;
    8181
    8282    // Grab our step requirements
    … …  
    113113    // If we're not dealing with a step, bail here
    114114    if ( 'step' != get_post_type( $achievement_id ) )
    115         return;
     115        return $return;
    116116
    117117    // Grab our step requirements

  • badgeos-community-add-on/trunk/includes/steps-ui.php

    r707146 r713712  
    8686
    8787    // Loop through all existing BP groups and include them here
    88     $current_selection = get_post_meta( $step_id, '_badgeos_group_id', true );
    89     $bp_groups = groups_get_groups( array( 'show_hidden' => true, 'per_page' => 300 ) );
    90     if ( !empty( $bp_groups ) ) {
    91         foreach ( $bp_groups['groups'] as $group ) {
    92             echo '<option' . selected( $current_selection, $group->id, false ) . ' value="' . $group->id . '">' . $group->name . '</option>';
     88    if ( bp_is_active( 'groups' ) ) {
     89        $current_selection = get_post_meta( $step_id, '_badgeos_group_id', true );
     90        $bp_groups = groups_get_groups( array( 'show_hidden' => true, 'per_page' => 300 ) );
     91        if ( !empty( $bp_groups ) ) {
     92            foreach ( $bp_groups['groups'] as $group ) {
     93                echo '<option' . selected( $current_selection, $group->id, false ) . ' value="' . $group->id . '">' . $group->name . '</option>';
     94            }
    9395        }
    9496    }
    95 
    9697    echo '</select>';
    9798

  • badgeos-community-add-on/trunk/readme.txt

    r710053 r713712  
    55Requires at least: WordPress 3.5, BuddyPress 1.7 & BadgeOS 1.0.2
    66Tested up to: 3.5.1
    7 Stable tag: 1.0.1
     7Stable tag: 1.0.2
    88License: GNU AGPLv3
    99License URI: http://www.gnu.org/licenses/agpl-3.0.html
    … …  
    165165== Changelog ==
    166166
     167= 1.0.2 =
     168* Fix: Fixed bug that prevented unlocking achievements attached to unlocked steps.
     169* Fix: Check if group component is turned on before querying groups.
     170
    167171= 1.0.1 =
    168172* New: Added .po and .mo files for internationalization
Note: See TracChangeset for help on using the changeset viewer.