Merge pull request #18 from mycred/2.5.3

2.5.3
mycred · Aug 23, 2023 · e94cbeb · e94cbeb
2 parents 4cc2c94 + 7893bfb
commit e94cbeb
Show file tree

Hide file tree

Showing 145 changed files with 12,261 additions and 4,571 deletions.
diff --git a/addons/badges/includes/mycred-badge-functions.php b/addons/badges/includes/mycred-badge-functions.php
@@ -663,8 +663,10 @@ function mycred_display_users_badges( $user_id = NULL, $width = MYCRED_BADGE_WID
 				else if( $badge->main_image !== false )
 					$badge_image = $badge->get_image( 'main' );
 
-				if ( !empty( $badge_image ) )
-					echo wp_kses_post( apply_filters( 'mycred_the_badge', $badge_image, $badge_id, $badge, $user_id ) );
+				if ( !empty( $badge_image ) ) {
+					// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+					echo apply_filters( 'mycred_the_badge', $badge_image, $badge_id, $badge, $user_id );
+				}
 
 			}
 
@@ -960,93 +962,6 @@ function mycred_get_level_image_url( $setup ) {
     }
 endif;
 
-/**
- * Cretae Evidence page
- * @since 2.1
- * @version 1.0
- */
-if ( ! function_exists( 'mycred_get_evidence_page_id' ) ) :
-	function mycred_get_evidence_page_id() {
-
-		$evidencePageId = 0;
-
-		$badges = mycred_get_addon_settings( 'badges' );
-
-        //If Open badge enabled
-        if ( isset( $badges['open_badge'] ) && $badges['open_badge'] == '1' ) {
-
-            $canCreatePage = true;
-
-            $evidence_page_refrence = mycred_get_option( 'open_badge_evidence_page', 0 );
-
-            if ( ! empty( $badges['open_badge_evidence_page'] ) || ! empty( $evidence_page_refrence ) ) {
-
-            	$pageId = intval( $evidence_page_refrence );
-
-            	if ( ! empty( $badges['open_badge_evidence_page'] ) ) {
-
-            		$pageId = intval( $badges['open_badge_evidence_page'] );
-
-            	}
-
-                if ( get_post_status( $pageId ) == 'publish' ) {
-
-                    $canCreatePage  = false;
-                    $evidencePageId = $pageId;
-
-                }
-
-            }
-
-            if ( $canCreatePage ) {
-
-                $postData = array(
-                    'post_content'   => '[' . MYCRED_SLUG . '_badge_evidence]',
-                    'post_title'     => 'Badge Evidence',
-                    'post_status'    => 'publish',
-                    'post_type'      => 'page',
-                    'comment_status' => 'closed',
-                    'post_name'      => 'Badge Evidence'
-                );
-
-                $pageId = wp_insert_post( $postData );
-
-                $evidencePageId = intval( $pageId );
-
-                mycred_update_option( 'open_badge_evidence_page', $evidencePageId );
-
-                mycred_set_badge_evidence_page( $evidencePageId );
-
-            }
-
-        }
-
-        return $evidencePageId;
-
-    }
-endif;
-
-/**
- * Set Evidence page
- * @since 2.1
- * @version 1.0
- */
-if ( ! function_exists( 'mycred_set_badge_evidence_page' ) ) :
-	function mycred_set_badge_evidence_page( $page_id ) {
-
-		$settings = mycred_get_option( 'mycred_pref_core' );
-
-		if ( isset( $settings[ 'badges' ] ) ) {
-
-			$settings[ 'badges' ][ 'open_badge_evidence_page' ] = intval( $page_id );
-
-			mycred_update_option( 'mycred_pref_core', $settings );
-
-		}
-
-	}
-endif;
-
 /**
  * Get badges list
  * @since 2.1.1
@@ -1224,50 +1139,6 @@ function mycred_badge_show_congratulation_msg( $user_id, $badge, $settings = NUL
 	}
 endif;
 
-/**
- * Returns Badge main image with share icons.
- * @since 2.2
- * @version 1.0
- */
-if ( ! function_exists( 'mycred_badge_show_main_image_with_social_icons' ) ) :
-	function mycred_badge_show_main_image_with_social_icons( $user_id, $badge, $mycred = NULL ) {
-
-		$content = '';
-
-		$image_url = $badge->get_earned_image( $user_id );
-
-		if ( ! empty( $image_url ) ) {
-
-			$content .= '<div class="mycred-badge-image-wrapper">';
-
-			$content .= '<img src="' . $image_url . '" class="mycred-badge-image" alt="Badge Image">';
-
-			if ( empty( $mycred ) ) $mycred = mycred();
-
-			//If user has earned badge, show user sharing badge option
-            if( 
-            	$badge->user_has_badge( $user_id ) && 
-            	! empty( $mycred->core["br_social_share"]["enable_open_badge_ss"] ) 
-            ) {
-
-                $facebook_url  = "http://www.facebook.com/sharer.php?u=".get_permalink()."&p[images][0]=$image_url";
-                $twitter_url   = "https://twitter.com/share?url=".get_permalink()."";
-                $linkedin_url  = "http://www.linkedin.com/shareArticle?url=".get_permalink()."";
-                $pinterest_url = "https://pinterest.com/pin/create/bookmarklet/?media=$image_url&amp;url=".get_permalink()."";
-
-                $content .= mycred_br_get_social_icons( $facebook_url, $twitter_url, $linkedin_url, $pinterest_url );
-
-            } 
-
-            $content .= '</div>';
-
-		}
-
-		return apply_filters( 'mycred_badge_show_main_image_with_social_icons', $content, $badge, $mycred );
-
-	}
-endif;
-
 /**
  * Returns Badge description.
  * @since 2.2

diff --git a/addons/badges/includes/mycred-badge-object.php b/addons/badges/includes/mycred-badge-object.php
@@ -106,15 +106,13 @@ protected function populate( $object = NULL, $level_id = NULL ) {
 
 			// Indicate open badge
 			if ( absint( mycred_get_post_meta( $this->post_id, 'open_badge', true ) ) === 1 ) {
-
-				$badge_setting = mycred_get_addon_settings( 'badges' );
+				$badge_setting = mycred_get_option( 'mycred_pref_core' );
 
-				if ( isset( $badge_setting['open_badge'] ) && $badge_setting['open_badge'] === 1 ) {
+				if ( isset( $badge_setting['open_badge'] ) && absint($badge_setting['open_badge']['is_enabled'] ) === 1 ) {
 
 					$this->open_badge = true;
 
 				}
-
 			}
 
 			// If we requested a particular level
@@ -806,7 +804,7 @@ public function get_earned_image( $user_id ) {
 				if ( ! file_exists( $open_badge_directory . $filename ) ) {
 
 					$mycred_Open_Badge = new mycred_Open_Badge();
-					$mycred_Open_Badge->bake_users_image( $user_id, $badge_id );
+					$mycred_Open_Badge->bake_users_image( $user_id, $badge_id, $image_url, $this->title, $this->open_badge );
 
 				}
 

diff --git a/addons/badges/includes/mycred-badge-shortcodes.php b/addons/badges/includes/mycred-badge-shortcodes.php
@@ -83,7 +83,9 @@ function mycred_render_my_badges( $atts, $content = '' ) {
             }
 
             echo '</div>';
+
             do_action( 'mycred_add_share_and_embed_button', $badge, $badge_id );
+
         }
 
         echo '</div>';
@@ -247,54 +249,6 @@ function mycred_render_badges_list( $atts = '' ) {
         <?php
         $content = ob_get_clean();
 
-        return $content;
+        return apply_filters( 'mycred_badges_list', $content, $atts );
     }
 endif;
-
-/**
- * Renders Badge's Evidence ShortCode
- * @param string $atts
- * @since 2.1
- * @version 1.0
- */
-if ( !function_exists( 'mycred_render_badge_evidence' ) ) :
-    function mycred_render_badge_evidence( $atts = '' ) {
-
-        $content = '<div class="mycred-evidence-page">Evidence not found</div>'; 
-
-        if ( isset( $_GET['uid'] ) && isset( $_GET['bid'] ) ) {
-
-            $user_id  = intval( $_GET['uid'] );
-            $badge_id = intval( $_GET['bid'] );
-
-            $user_info = get_userdata( $user_id );
-            $badge     = mycred_get_badge( $badge_id );
-
-            if ( $user_info && $badge && $badge->open_badge ) {
-
-                $issued_on = mycred_get_user_meta( $user_id, MYCRED_BADGE_KEY . $badge_id, '_issued_on', true );
-
-                $content = '<div class="mycred-evidence-page">
-                                <div class="mycred-left">
-                                    <img src="' . $badge->get_earned_image( $user_id ) . '" alt="">
-                                </div>
-                                <div class="mycred-left intro">
-                                    <h4 class="mycred-remove-margin">' . $badge->title . '</h4>
-                                    <div class="mycred-remove-margin">
-                                        <p>Name: '. $user_info->display_name .'</p>
-                                        <p>Email: ' . $user_info->user_email . '</p>
-                                        <p>Issued On: ' . date( 'Y-m-d\TH:i:sP', $issued_on ) . '</p>
-                                        <p><span class="dashicons dashicons-yes-alt"></span> <span class="icon-txt"> Verified</span></p>
-                                    </div>
-                                </div>
-                                <div class="mycred-clear"></div>
-                            </div>';
-
-            }
-
-
-        }
-
-        return $content;
-    }
-endif;