From cef361b14aa593e58a0cad91d251070562ddc259 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Wed, 25 Jul 2012 16:20:32 +0000
Subject: [PATCH] =?UTF-8?q?Ticket=20#921=20->=20Filtrar=20la=20p=C3=A1gina?=
 =?UTF-8?q?=20de=20inicio=20para=20no=20repetir=20dedicatorias=20con=20la?=
 =?UTF-8?q?=20misma=20URL=20de=20video?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.ASong2U_Web/trunk@32 cd1a4ea2-8c7f-e448-aada-19d1fee9e1d6
---
 wp-content/themes/score/functions.php         | 23 ++++++-
 wp-content/themes/score/header.php            |  6 +-
 wp-content/themes/score/index.php             | 14 ++++
 .../score/lib/admin/inc/theme-options.php     |  7 ++
 .../score/lib/admin/inc/theme-post-types.php  | 66 -------------------
 wp-content/themes/score/video-slider.php      | 19 +++++-
 6 files changed, 65 insertions(+), 70 deletions(-)

diff --git a/wp-content/themes/score/functions.php b/wp-content/themes/score/functions.php
index d9b2e4a..28e428f 100644
--- a/wp-content/themes/score/functions.php
+++ b/wp-content/themes/score/functions.php
@@ -19,6 +19,10 @@ $dirname = "score"; // Directory Name
 if ( !defined( 'DEDICATION_CATEGORY_SLUG' ) )
     define( 'DEDICATION_CATEGORY_SLUG', 'dedication' );
 
+/* * ************************* Concerts Information ********************* */
+
+if ( !defined( 'CONCERTS_CATEGORY_SLUG' ) )
+    define( 'CONCERTS_CATEGORY_SLUG', 'concerts' );
 
 /* * ************************* File Directories ************************** */
 
@@ -306,9 +310,9 @@ function register_my_menus() {
 
 /* * ************************* Dedication category ********************* */
 
-add_action('init', 'register_dedication_category');
+//add_action('init', 'register_dedication_category');
 function register_dedication_category() {   
-    
+    global $wpdb;
     if (!get_category_by_slug(DEDICATION_CATEGORY_SLUG)) {
         $cat = array(
             'cat_name' => 'Dedication', 
@@ -318,6 +322,21 @@ function register_dedication_category() {
     }
 }
 
+/* * ************************* Concerts category ********************* */
+
+//add_action('init', 'register_concerts_category');
+function register_concerts_category() {   
+    global $wpdb;
+    if (!get_category_by_slug(CONCERTS_CATEGORY_SLUG)) {
+        $cat = array(
+            'cat_name' => 'Concerts', 
+            'category_nicename' => CONCERTS_CATEGORY_SLUG);
+        
+        wp_insert_category($cat);
+    }
+}
+
+
 
 /* * ************************* Other Features ************************** */
 
diff --git a/wp-content/themes/score/header.php b/wp-content/themes/score/header.php
index 5997352..b5b3f06 100644
--- a/wp-content/themes/score/header.php
+++ b/wp-content/themes/score/header.php
@@ -54,7 +54,11 @@
             <!--End Nav-->   
             <?php } ?>
             <ul class="navmenu">
-                <li><a class="events" href="#"><span><?php __( 'Events', 'buddypress' ); ?></span></a></li>
+                <?php 
+                    $category_id = get_cat_ID( 'concerts' );
+                    $category_link = get_category_link( $category_id );
+                ?>
+                <li><a class="events" title="<?php __( 'Concerts', 'buddypress' ); ?>" href="<?php echo esc_url( $category_link ); ?>"><span><?php __( 'Concerts', 'buddypress' ); ?></span></a></li>
                 <li><a title="<?php __( 'Members', 'buddypress' ); ?>" class="friends" href="<?php echo bp_get_members_directory_permalink(); ?>"><span><?php __( 'Members', 'buddypress' ); ?></span></a></li>
                 <li><a title="<?php __( 'Groups', 'buddypress' ); ?>" class="groups " href="<?php echo bp_get_groups_directory_permalink(); ?>"><span><?php __( 'Groups', 'buddypress' ); ?></span></a></li>
                 <li><a class="profile" href="<?php if(function_exists('bp_is_active')) { echo $bp->loggedin_user->domain; } else { echo get_author_posts_url(get_the_author_id()); } ?>"><span><?php _e('Profile', 'gp_lang'); ?></span></a></li>
diff --git a/wp-content/themes/score/index.php b/wp-content/themes/score/index.php
index 7443351..ae02295 100644
--- a/wp-content/themes/score/index.php
+++ b/wp-content/themes/score/index.php
@@ -1,6 +1,7 @@
 <?php get_header();
 
 global $gp_settings;
+$_ishome = (is_home() OR is_front_page());
 
 ?>
 
@@ -9,6 +10,7 @@ global $gp_settings;
 $args = "cat=".$gp_settings['cats']."&caller_get_posts=1&orderby=$orderby&order=$order&gdsr_sort=$gdsr_sort&gdsr_order=$gdsr_order&paged=$paged";
 query_posts($args); 
 $contador = 0;
+$urls_video = array();
 ?>
 
 	
@@ -32,6 +34,18 @@ $contador = 0;
             }
         }
         $contador += 1;
+        
+        $video = get_post_meta($post->ID, 'ghostpool_dedication_url', true);
+        if ($_ishome) {
+            if ($theme_homepage_not_repeat_videos) {
+                // Si la URL del video ya ha salido en una dedicatoria anterior, me la salto
+                if (in_array($video, $urls_video)) {
+                        continue;
+                }
+            }
+        }
+        $urls_video[] = $video;
+        
         ?>
     
 	
diff --git a/wp-content/themes/score/lib/admin/inc/theme-options.php b/wp-content/themes/score/lib/admin/inc/theme-options.php
index 3b70848..915a502 100644
--- a/wp-content/themes/score/lib/admin/inc/theme-options.php
+++ b/wp-content/themes/score/lib/admin/inc/theme-options.php
@@ -367,6 +367,13 @@ array("name" => __('Video Slider Settings', 'gp_lang'),
         "id" => $shortname . "_homepage_cats",
         "std" => get_category_by_slug(BP_DEDICATION_SLUG),
         "type" => "text"),
+    array(
+        "name" => __('Repeat videos', 'gp_lang'),
+        "desc" => __('Repeat videos on dedications.', 'gp_lang'),
+        "id" => $shortname . "_homepage_not_repeat_videos",
+        "std" => "0",
+        "options" => array(__('Enable', 'gp_lang'), __('Disable', 'gp_lang')),
+        "type" => "radio"),    
     array("type" => "divider"),
     array(
         "name" => __('Layout', 'gp_lang'),
diff --git a/wp-content/themes/score/lib/admin/inc/theme-post-types.php b/wp-content/themes/score/lib/admin/inc/theme-post-types.php
index 55a3f91..15c5adc 100644
--- a/wp-content/themes/score/lib/admin/inc/theme-post-types.php
+++ b/wp-content/themes/score/lib/admin/inc/theme-post-types.php
@@ -1,69 +1,3 @@
 <?php
-// Custom Post Types
-
-/*function post_type_dedication() {
-
-    register_post_type('dedication', array(
-        'labels' => array(
-            'name' => __('Dedications', 'gp_lang'),
-            'singular_name' => __('Dedication', 'gp_lang'),
-            'all_items' => __('All Dedications', 'gp_lang'),
-            'add_new_item' => __('Add New Dedication', 'gp_lang'),
-            'edit_item' => __('Edit Dedication', 'gp_lang'),
-            'new_item' => __('New Dedication', 'gp_lang'),
-            'view_item' => __('View Dedication', 'gp_lang'),
-            'search_items' => __('Search Dedications', 'gp_lang'),
-            'menu_name' => __('Dedications', 'gp_lang')
-        ),
-        'public' => true,
-        'exclude_from_search' => false,
-        'show_ui' => true,
-        'show_in_nav_menus' => false,
-        '_builtin' => false,
-        '_edit_link' => 'post.php?post=%d',
-        'capability_type' => 'post',
-        'hierarchical' => false,
-        'rewrite' => array("slug" => "dedication"),
-        'menu_position' => 20,
-        'with_front' => true,
-        'supports' => array('title', 'thumbnail', 'author', 'custom-fields')
-    ));
-
-    add_filter("manage_edit-dedication_columns", "dedication_edit_columns");
-    add_action("manage_posts_custom_column", "dedication_custom_columns");
-
-    function dedication_edit_columns($columns) {
-        $columns = array(
-            "cb" => "<input type=\"checkbox\" />",
-            "title" => __('Title', 'gp_lang'),
-            "author" => __('Author', 'gp_lang'),
-            "dedication_url" => __('Video URL', 'gp_lang'),
-            "dedication_image" => __('Image', 'gp_lang'),
-            "date" => __('Date', 'gp_lang')
-        );
-
-        return $columns;
-    }
-
-    function dedication_custom_columns($column) {
-        global $post;
-        require(ghostpool_inc . 'options.php');
-        switch ($column) {
-            case "dedication_url":
-                echo get_post_meta($post->ID, 'ghostpool_dedication_url', true);
-                break;
-            case "dedication_image":
-                if (has_post_thumbnail()) {
-                    $image = vt_resize(get_post_thumbnail_id(), '', 50, 50, true);
-                    echo '<img src="' . $image[url] . '" width="' . $image[width] . '" alt="" />';
-                }
-
-                break;
-        }
-    }
-
-}
-
-add_action('init', 'post_type_dedication');*/
 
 ?>
\ No newline at end of file
diff --git a/wp-content/themes/score/video-slider.php b/wp-content/themes/score/video-slider.php
index 3f19058..7db6ad7 100644
--- a/wp-content/themes/score/video-slider.php
+++ b/wp-content/themes/score/video-slider.php
@@ -3,12 +3,18 @@
 
 require(ghostpool_inc . 'options.php');
 
+$_ishome = (is_home() OR is_front_page());
+
 if ( is_user_logged_in() ):
 
+global $gp_settings;
 global $current_user, $bp;
 get_currentuserinfo();
 
-if (is_home() || is_front_page() || ( $bp->current_component == 'dedications' )) {
+?>
+<?php
+
+if ($_ishome || ( $bp->current_component == 'dedications' )) {
     $posts_per_page = $theme_video_slides;
 
     $dedication_orderby = "date";
@@ -33,6 +39,7 @@ if (is_singular()) {
 
 if (have_posts()) {
     $slide_counter = 0;
+    $urls_video = array();
 ?>    
 
     <!--Begin Slider Wrapper-->
@@ -85,6 +92,16 @@ if (have_posts()) {
             $artist = get_post_meta($post->ID, 'ghostpool_dedication_artist', true);
             $song = get_post_meta($post->ID, 'ghostpool_dedication_song', true);
 
+            if ($_ishome) {
+                if ($theme_homepage_not_repeat_videos) {
+                    // Si la URL del video ya ha salido en una dedicatoria anterior, me la salto
+                    if (in_array($video, $urls_video)) {
+                            continue;
+                    }
+                }
+            }
+            $urls_video[] = $video;
+            
             // Video Type	
             $vimeo = strpos($video, "vimeo.com");
             $yt1 = strpos($video, "youtube.com");