- Cambios para optimizar el uso de memoria

- Quitar meta del generador en la cabecera
- Tarea #1135 -> Mejorar la inserción en Facebook



git-svn-id: https://192.168.0.254/svn/Proyectos.ASong2U_Web/trunk@189 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6

wp-content/plugins/bp-dedication/functions.php

@@ -12,6 +12,30 @@ function bp_get_dedication_slug() {
     return apply_filters( 'bp_get_dedication_slug', $dedication_slug );
 }
 
+function bp_dedication_exist_dedications_from_user( $user_id ) {
+    if ( !$user_id )
+            return false;
+    
+    return (count_user_posts( $user_id ) > 0);
+}
+
+function bp_dedication_exist_dedications_to_user( $user_id ) {
+    if ( !$user_id )
+            return false;
+    
+    $args = array( 
+        'post_status' => array('publish', 'private'),
+        'numberposts' => 1, 
+        'category' => 'dedication',
+        'meta_key' => 'ghostpool_destination_user_id',
+        'meta_value' => $user_id
+        );
+    $posts_array = get_posts( $args );
+    
+    return (!empty($posts_array));
+}
+
+
 function bp_dedication_get_dedications_from_user( $user_id ) {
     if ( !$user_id )
             return false;

wp-content/themes/score/functions.php

@@ -86,6 +86,7 @@ if (function_exists('bp_is_active') && file_exists(ghostpool_bp . 'functions-bud
     require_once(ghostpool_bp . 'search-buddypress.php');
 }
 
+
 /* * ************************* Flags img function *********************** */
 function gp_get_flag_img($country_code = '', $flagsize=32) {
     $src = get_template_directory_uri() . '/lib/images/flags/'.$flagsize.'/';
@@ -834,6 +835,6 @@ function set_mail_content_type() {
 add_filter ("wp_mail_content_type", "set_mail_content_type");
 
 remove_action( 'login_head', 'wp_no_robots', 10 );
-
+remove_action('wp_head', 'wp_generator');
 
 ?>

wp-content/themes/score/lib/inc/fetch-video-data.php

@@ -44,10 +44,10 @@ function gp_ajax_video_data() {
             $args = array(
                 'post_type' => array('post'),
                 'orderby' => $dedication_orderby,
-				'numberposts' => 10,
+                'numberposts' => -1,
+                'posts_per_page' => -1,
                 'post_status' => $post_status,
                 'category_name' => $category_name,
-				'offset' => 1,
             );
         }
         $array = array();
@@ -59,9 +59,13 @@ function gp_ajax_video_data() {
             $listavideos->the_post();
             require(dirname(__FILE__).'/../../loop-dedication-data.php');
                         
-            // Perfil del usuario: sólo mostrar las dedicadas por él y para él. El resto se descartan.
+            // Perfil del usuario: Si tiene ninguna dedicatoria (por él / para él) 
+            // mejor mostrar estas dedicadas. El resto se descartan.
             if ( $bp->current_component == BP_DEDICATION_SLUG ) {
-                if (($displayed_id != $gp_settings['from_user_id']) && ($displayed_id != $gp_settings['to_user_id'])) {
+                $usuario_tiene_dedicatorias = (bp_dedication_exist_dedications_to_user($displayed_id)) ||
+                    (bp_dedication_exist_dedications_from_user($displayed_id));
+                
+                if ($usuario_tiene_dedicatorias && ($displayed_id != $gp_settings['from_user_id']) && ($displayed_id != $gp_settings['to_user_id'])) {
                     continue; // me salto esta dedicatoria
                 }
             }
@@ -84,6 +88,7 @@ function gp_ajax_video_data() {
             $array[$i]['extlink'] = $gp_settings['enc_link'];                
             $array[$i]['artist'] = $gp_settings['artist_short'];
             $array[$i]['song'] = $gp_settings['song_short'];
+            $array[$i]['img_src'] = $gp_settings['img_src'];
             $array[$i]['unreaded'] = $gp_settings['unreaded'];
             
             $array[$i]['from_to_text'] = $gp_settings['from_flag'];
@@ -108,6 +113,7 @@ function gp_ajax_video_data() {
             $salida .= '<span id="postdata-link-' . $video['id'] . '">' . $video['permalink']. '</span>';
             $salida .= '<span id="postdata-extlink-' . $video['id'] . '">' . $video['extlink']. '</span>';
             $salida .= '<span id="postdata-comments-' . $video['id'] . '"></span>';
+            $salida .= '<span id="postdata-imgsrc-' . $video['id'] . '"><img src="' . $video['img_src']. '"/></span>';
             
             if ($video['unreaded']) {
                 $salida .= '<span id="postdata-mark-read-' . $video['id'] . '">';

wp-content/themes/score/lib/scripts/asong2u.js

@@ -127,15 +127,19 @@ function updateInfo() {
         var song = jQuery('#postdata-song-' + id).html();
         var link = jQuery('#postdata-link-' + id).html();
         var enc_link = jQuery('#postdata-extlink-' + id).html();
+        var src_img = jQuery('#postdata-imgsrc-' + id + ' img').attr("src");
 
         var nUrl = oUrl + 'id/' + the_id;
         
         jQuery('#dedicate_this_song_button').attr("href", nUrl);
 
-        // Social networks
+        nUrl = 'http://www.facebook.com/sharer.php?s=100';
-        nUrl = 'https://www.facebook.com/sharer.php?u=' + enc_link;
+        nUrl = nUrl + '&p[url]=' + enc_link;
+        nUrl = nUrl + '&p[title]=' + jQuery('#postdata-title-' + id).text();
+        nUrl = nUrl + '&p[summary]=' + artist + ' ' + song;
+        nUrl = nUrl + '&p[images][0]=' + src_img;
         jQuery('#fsbbtn a').attr("href", nUrl);
-        nUrl = 'http://twitter.com/intent/tweet?source=sharethiscom&url=' + enc_link;
+        nUrl = 'http://twitter.com/intent/tweet?source=asong2u&url=' + enc_link;
         jQuery('#twtbtn a').attr("href", nUrl);
         nUrl = 'https://plusone.google.com/_/+1/confirm?url=' + enc_link;
         jQuery('#gpsbtn a').attr("href", nUrl);

wp-content/themes/score/lib/scripts/asong2u.min.js

@@ -7,10 +7,10 @@ jQuery(".dedication-profile .home_column_my_dedications img.read-more-loader").r
 function(a){a=jQuery(a).find("#content").children();jQuery.each(a,function(){jQuery(this).hasClass("post-loop")&&(jQuery(this).removeClass("post type-post status-publish format-standard hentry category-dedication"),jQuery(this).addClass("home-my-dedications"),jQuery(this).addClass("home-dedicated-2-me"));jQuery(".dedication-profile .home_column_dedicated_2_me img.read-more-loader").remove();jQuery(".dedication-profile .home_column_dedicated_2_me a.read-more").remove();jQuery(".dedication-profile .home_column_dedicated_2_me").append(jQuery(this))})})})});
 var aIndex=-1,oUrl="";
 function updateInfo(){var a=jQuery.fn.videoGallery.getMediaID(),a=jQuery(jQuery("#playlist li").get(a)).attr("id").replace("playlist-element-","");if(aIndex!=a&&0<=a){aIndex=a;""==oUrl&&(oUrl=jQuery("#dedicate_this_song_button").attr("href"));var b=jQuery("#postdata-id-"+a).text(),e=jQuery("#postdata-title-"+a).html(),c=jQuery("#postdata-from-to-"+a).html(),f=jQuery("#postdata-artist-"+a).html(),g=jQuery("#postdata-song-"+a).html(),h=jQuery("#postdata-link-"+a).html(),d=jQuery("#postdata-extlink-"+a).html(),
-b=oUrl+"id/"+b;jQuery("#dedicate_this_song_button").attr("href",b);jQuery("#fsbbtn a").attr("href","https://www.facebook.com/sharer.php?u="+d);jQuery("#twtbtn a").attr("href","http://twitter.com/intent/tweet?source=sharethiscom&url="+d);jQuery("#gpsbtn a").attr("href","https://plusone.google.com/_/+1/confirm?url="+d);jQuery("#mysbtn a").attr("href",'javascript:void(window.open("http://www.myspace.com/Modules/PostTo/Pages/?u='+d+'"+encodeURIComponent(document.location.toString()),"ptm","height=450,width=550").focus())');
+i=jQuery("#postdata-imgsrc-"+a+" img").attr("src"),b=oUrl+"id/"+b;jQuery("#dedicate_this_song_button").attr("href",b);b="http://www.facebook.com/sharer.php?s=100&p[url]="+d+"&p[title]="+jQuery("#postdata-title-"+a).text();b=b+"&p[summary]="+f+" "+g;b=b+"&p[images][0]="+i;jQuery("#fsbbtn a").attr("href",b);jQuery("#twtbtn a").attr("href","http://twitter.com/intent/tweet?source=asong2u&url="+d);jQuery("#gpsbtn a").attr("href","https://plusone.google.com/_/+1/confirm?url="+d);jQuery("#mysbtn a").attr("href",
-jQuery("#dedication-data-panel").hide("fast");jQuery("#dedication-data-panel").slideUp("fast",function(){jQuery("#dedication-data-panel").html(c);jQuery("#dedicationTitle-data-panel").html(c)});jQuery("#dedication-data-panel").slideDown();jQuery("#dedicationFooter_container").slideUp("fast",function(){jQuery("#dedicationArtits").html(f);jQuery("#dedicationSong").html(g)});jQuery("#dedicationFooter_container").slideDown("fast",function(){});jQuery("#dedicationTitle").html(e);shrinkTitle();jQuery("#dedicationTitle a").jTypeWriter();
+'javascript:void(window.open("http://www.myspace.com/Modules/PostTo/Pages/?u='+d+'"+encodeURIComponent(document.location.toString()),"ptm","height=450,width=550").focus())');jQuery("#dedication-data-panel").hide("fast");jQuery("#dedication-data-panel").slideUp("fast",function(){jQuery("#dedication-data-panel").html(c);jQuery("#dedicationTitle-data-panel").html(c)});jQuery("#dedication-data-panel").slideDown();jQuery("#dedicationFooter_container").slideUp("fast",function(){jQuery("#dedicationArtits").html(f);
-jQuery("#dedicationComments_container").slideUp("fast",function(){jQuery("#dedicationComments_container").load(h+" #comments","",function(){init_comments();jQuery("#dedicationComments_container").on("submit","#commentform",function(){prepare_new_comment_home();return!1})})});jQuery("#dedicationComments_container").slideDown();0<jQuery("#postdata-mark-read-"+a).length&&(markAsRead(a),jQuery("#postdata-mark-read-"+a).remove(),jQuery(".post-"+a+".home-dedicated-2-me a .new-label").remove())}}
+jQuery("#dedicationSong").html(g)});jQuery("#dedicationFooter_container").slideDown("fast",function(){});jQuery("#dedicationTitle").html(e);shrinkTitle();jQuery("#dedicationTitle a").jTypeWriter();jQuery("#dedicationComments_container").slideUp("fast",function(){jQuery("#dedicationComments_container").load(h+" #comments","",function(){init_comments();jQuery("#dedicationComments_container").on("submit","#commentform",function(){prepare_new_comment_home();return!1})})});jQuery("#dedicationComments_container").slideDown();
-function markAsRead(a){jQuery.post(mark_as_read_js.ajaxurl,{action:"mark_post_as_read",post_read:a},function(){"1"==mark_as_read_js.show_alerts&&alert(read_message);jQuery("#header .navmenu .profile .sign").text(jQuery("#header .navmenu .profile .sign").text()-1)});return!1}
+0<jQuery("#postdata-mark-read-"+a).length&&(markAsRead(a),jQuery("#postdata-mark-read-"+a).remove(),jQuery(".post-"+a+".home-dedicated-2-me a .new-label").remove())}}function markAsRead(a){jQuery.post(mark_as_read_js.ajaxurl,{action:"mark_post_as_read",post_read:a},function(){"1"==mark_as_read_js.show_alerts&&alert(read_message);jQuery("#header .navmenu .profile .sign").text(jQuery("#header .navmenu .profile .sign").text()-1)});return!1}
 function shrinkTitle(){var a=document.getElementById("dedicationTitle"),b=document.getElementById("dedicationTitle_container");for(a.style.fontSize="42px";a.offsetWidth>b.offsetWidth;)size=parseInt(a.style.fontSize.replace("px","")),size-=1,a.style.fontSize=size+"px";a.style.fontSize-=NaN}
 jQuery(window).ready(function(){0<jQuery("#slider-wrapper").length&&jQuery("#content-wrapper .post-loop .post-thumbnail a").live("click",function(a){a.preventDefault();a=jQuery(this).parent().parent();a=jQuery(a).attr("class").split(" ");jQuery(a).each(function(a,e){var c=e.replace("post-","");if(jQuery.isNumeric(c))return loadVideo(c),jQuery("html, body").animate({scrollTop:0},600),!1});return!1})});
 jQuery(document).ready(function(){jQuery("#sidebar .sidebarposts .top_10 .posts").hide();jQuery("#sidebar .sidebarposts .top_10 h3").click(function(){jQuery("#sidebar .sidebarposts .top_10 .posts").toggle("slow",function(){})})});jQuery(document).ready(function(){jQuery("#my-friends-big-avatars div.see_more").hide();jQuery("#my-friends-big-avatars span.see_more").click(function(){jQuery("#my-friends-big-avatars span.see_more").hide();jQuery("#my-friends-big-avatars div.see_more").toggle("fast",function(){})})});

wp-content/themes/score/loop-dedication-data.php

@@ -17,6 +17,11 @@ if(get_post_meta($post->ID, 'ghostpool_thumbnail_height', true) && get_post_meta
 	$gp_settings['image_height'] = $gp_settings['thumbnail_height'];
 }
 
+$post_thumbnail_img = wp_get_attachment_image_src(get_post_thumbnail_id($post->ID));
+if ($post_thumbnail_img)  
+    $gp_settings['img_src'] = $post_thumbnail_img[0];
+
+
 $gp_settings['enc_link'] = add_query_arg('refid', bp_dedication_encode(get_permalink()), get_option('siteurl') . '/index.php');
 
 // Song data

wp-content/themes/score/video-slider.php

@@ -15,16 +15,26 @@ get_currentuserinfo();
 if ($_ishome || ( $bp->current_component == BP_DEDICATION_SLUG )) {
     $dedication_orderby = "rand";
     $category_name = 'dedication';
-    $post_status = array('publish');
+    
 
+    if (( $bp->current_component == BP_DEDICATION_SLUG )) {
+        $post_status = array('publish', 'private');
+    } else {
+        $post_status = array('publish');        
+    }
+    
     $args = array(
         'post_type' => array('post'),
         'orderby' => $dedication_orderby,
-        //'posts_per_page' => -1,
+        'numberposts' => -1,
-		'numberposts' => 5,
+        'posts_per_page' => -1,
-        'post_status' => $post_status,
         'category_name' => $category_name,
+        'post_status' => $post_status,
     );
+    
+    $usuario_tiene_dedicatorias = (bp_dedication_exist_dedications_to_user($displayed_id)) ||
+        (bp_dedication_exist_dedications_from_user($displayed_id));
+    
     query_posts($args);
 }
 
@@ -60,11 +70,11 @@ if (have_posts()) {
                 <ul id='playlist'>
     <?php
     while (have_posts()) : the_post(); include('loop-dedication-data.php');   
-        
         $displayed_id = bp_displayed_user_id();
         
-        // Perfil del usuario: sólo mostrar las dedicadas por él y para él. El resto se descartan.
+        // Perfil del usuario: Si tiene ninguna dedicatoria (por él / para él) 
-        if ( $bp->current_component == BP_DEDICATION_SLUG ) {
+        // mejor mostrar estas dedicadas. El resto se descartan.
+        if ( $bp->current_component == BP_DEDICATION_SLUG && $usuario_tiene_dedicatorias) {
             if (($displayed_id != $gp_settings['from_user_id']) && ($displayed_id != $gp_settings['to_user_id'])) {
                 continue; // me salto esta dedicatoria
             }
@@ -78,14 +88,16 @@ if (have_posts()) {
                             <span id="postdata-link-<?php the_ID(); ?>"><?php the_permalink(); ?></span>
                             <span id="postdata-extlink-<?php the_ID(); ?>"><?php echo $gp_settings['enc_link']; ?></span>
                             <span id="postdata-comments-<?php the_ID(); ?>"></span>
+                            <span id="postdata-imgsrc-<?php the_ID(); ?>"><img src="<?php echo $gp_settings['img_src']; ?>"/></span>
                             <?php if (($theme_show_new_label) && ($gp_settings['unreaded'])) { ?><span id="postdata-mark-read-<?php the_ID(); ?>"><?php echo mar_read_unread_links('', '', false); ?></span><?php } ?>
-                            <span id="postdata-from-to-<?php the_ID(); ?>">
+                            <span id="postdata-from-to-<?php the_ID(); ?>">                            
                             <?php echo $gp_settings['from_flag']; ?><span>FROM: <?php echo $gp_settings['from_user_link']; ?></span>&nbsp;
                             <?php echo $gp_settings['to_flag']; ?>
                             <span>TO: <?php echo $gp_settings['to_user_link']; ?></span>
                             </span>
                         </li>
         <?php break; endwhile; ?>
+                        <?php _log('Se acabó!'); ?>
                 </ul>
             </div> <!--  componentPlaylist -->
             <div class="slideshow_controls">