diff --git a/wp-content/plugins/bp-dedication/includes/bp-dedication-create-dedication.php b/wp-content/plugins/bp-dedication/includes/bp-dedication-create-dedication.php index a4baefd..e7d41bd 100644 --- a/wp-content/plugins/bp-dedication/includes/bp-dedication-create-dedication.php +++ b/wp-content/plugins/bp-dedication/includes/bp-dedication-create-dedication.php @@ -25,10 +25,12 @@ function bp_dedication_create_new_dedication() { if (isset($_POST['friend_ids'])) { $friend_ids = explode(',', $_POST['friend_ids']); - } else { - return false; - } + } + if (isset($_POST['friend_email'])) { + $friend_email = $_POST['friend_email']; + } + if (isset($_POST['video_url'])) { $video_url = $_POST['video_url']; } else { @@ -43,8 +45,8 @@ function bp_dedication_create_new_dedication() { $song_name = $_POST['song_name']; } - if (isset($_POST['private'])) { - if ($_POST['private']) { + if (isset($_POST['private_dedication'])) { + if ($_POST['private_dedication']) { $post_status = 'private'; } else { $post_status = 'publish'; @@ -52,7 +54,19 @@ function bp_dedication_create_new_dedication() { } else { $post_status = 'publish'; } - + + // Para quien va el video ? + if (isset($friend_email) && (is_email($friend_email))) { + // Existe un usuario con ese email? + $user_email = get_user_by('email', $friend_email); + if ($user_email) { + $friend_ids = array(','); + $friend_ids[] = $user_email->ID; + } else { + $friend_ids = array(); + } + } + $videoData = array(); $videoID = getVideoID($video_url); @@ -84,10 +98,16 @@ function bp_dedication_create_new_dedication() { add_post_meta($post_id, 'ghostpool_dedication_song', $song_name); add_post_meta($post_id, 'ghostpool_dedication_url', $videoData['videoURL']); - $friend_info = get_userdata($friend_ids[1]); - add_post_meta($post_id, 'ghostpool_destination_user_id', $friend_info->ID); - add_post_meta($post_id, 'ghostpool_destination_user_name', $friend_info->user_login); - add_post_meta($post_id, 'ghostpool_destination_user_email', $friend_info->user_email); + if (count($friend_ids) > 1) { + $friend_info = get_userdata($friend_ids[1]); + add_post_meta($post_id, 'ghostpool_destination_user_id', $friend_info->ID); + add_post_meta($post_id, 'ghostpool_destination_user_name', $friend_info->user_login); + add_post_meta($post_id, 'ghostpool_destination_user_email', $friend_info->user_email); + } + + if (isset($friend_email) && (is_email($friend_email))) { + add_post_meta($post_id, 'ghostpool_destination_user_email', $friend_email); + } $imageurl = $videoData['thumbnail']; $imageurl = stripslashes($imageurl); diff --git a/wp-content/plugins/bp-dedication/includes/js/dedication-script.js b/wp-content/plugins/bp-dedication/includes/js/dedication-script.js index 16f7c05..77e9890 100644 --- a/wp-content/plugins/bp-dedication/includes/js/dedication-script.js +++ b/wp-content/plugins/bp-dedication/includes/js/dedication-script.js @@ -7,7 +7,7 @@ jQuery(document).ready(function(){ var idFriendVal = j("#friend_ids").val(); var eMailFriendVal = j("#friend_email").val(); var eMailRegExp = /^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/; - + if (idFriendVal != "") { result = true; } else { @@ -28,6 +28,9 @@ jQuery(document).ready(function(){ validacionDestinatario : true } }, + onkeyup: false, + onclick: false, + onfocusout: false, ignore: [], messages: { dedicate_to_input: "Please choose one member name or enter a valid email" diff --git a/wp-content/plugins/most-active-members/most-active-members.php b/wp-content/plugins/most-active-members/most-active-members.php index 48417e1..034c79c 100644 --- a/wp-content/plugins/most-active-members/most-active-members.php +++ b/wp-content/plugins/most-active-members/most-active-members.php @@ -190,8 +190,9 @@ class Top_Members extends WP_Widget { $gravatar_detect = strpos($output,"%gravatar%"); if($gravatar_detect !== false){ - $gravatar = get_avatar($user->ID, $gravatar_size); - $output = str_replace("%gravatar%",$gravatar,$output); + $gravatar = get_avatar($user->ID, $gravatar_size); + $gravatar = str_replace("bpthumb", "bpfull",$gravatar); + $output = str_replace("%gravatar%",$gravatar,$output); } if(($user_is_admin && $exclude_admin == "on") || ($post<1 && $exclude_zero=="on")) diff --git a/wp-content/plugins/wp-content-filter/images/facebook-icon.png b/wp-content/plugins/wp-content-filter/images/facebook-icon.png new file mode 100644 index 0000000..57d3a29 Binary files /dev/null and b/wp-content/plugins/wp-content-filter/images/facebook-icon.png differ diff --git a/wp-content/plugins/wp-content-filter/images/pc-icon.png b/wp-content/plugins/wp-content-filter/images/pc-icon.png new file mode 100644 index 0000000..177dfc7 Binary files /dev/null and b/wp-content/plugins/wp-content-filter/images/pc-icon.png differ diff --git a/wp-content/plugins/wp-content-filter/images/twitter-icon.png b/wp-content/plugins/wp-content-filter/images/twitter-icon.png new file mode 100644 index 0000000..11db7ce Binary files /dev/null and b/wp-content/plugins/wp-content-filter/images/twitter-icon.png differ diff --git a/wp-content/plugins/wp-content-filter/readme.txt b/wp-content/plugins/wp-content-filter/readme.txt new file mode 100644 index 0000000..e7edc47 --- /dev/null +++ b/wp-content/plugins/wp-content-filter/readme.txt @@ -0,0 +1,134 @@ +=== WP Content Filter === +Contributors: dgwyer +Tags: filtered, keywords, options, profanity, swearing, post, admin +Requires at least: 2.7 +Tested up to: 3.3.2 +Stable tag: 2.31 + +Protect your site by filtering out profanity, swearing, abusive comments and other keywords of your choice. Flexible Plugin options available. + +== Description == + +Update: Now filters bbPress titles and content! + +With this Plugin you can block out all profanity, swearing, abusive comments and any other keywords of your choice specified on the Plugin options page. The Plugin now features advanced control over content such as flexible strict filtering options. For example, flagged keywords which are embedded in whole words can now be ignored. + +i.e. 'competition' will now be ignored if you have 'pet' as a flagged keyword. Previously it would ALWAYS appear as 'com***ition'. + +You can select which sections of your WordPress site to filter keywords from including: + +* Posts (including recent posts sidebar widget) +* Post title +* Comments (including recent comments sidebar widget) +* Comment authors +* Tags +* Tag cloud + +Keywords are replaced with wild card characters (set in the Plugin options). Further options retain the first letter of each filtered keyword, remove all letters (wild card characters only), or retain the first and last letter of the filtered keyword. For example, the keyword pluto would be replaced with either p****, *****, or p***o. Keywords can also be filtered using case insensitive, or case sensitive options. + +There is also a setting to preserve current options if the Plugin is ever temporarily deactivated. When the Plugin is reactivated it will either reload the default settings or the previous options will remain. In the next version the option database entries for the Plugin will be removed only if the plugin files are deleted, and not just when the Plugin is simply deactivated which was the case with the pre 2.0 version. + +Please rate it if you find it useful, thanks. + +See our WordPress development site for more information. + +== Installation == + +Instructions for installing the WP Content Filter Plugin. + +1. Download and extract the Plugin zip file. +2. Upload the folder containing the Plugin files to your WordPress Plugins folder (usually ../wp-content/plugins/ folder). +3. Activate the Plugin via the 'Plugins' menu in WordPress. +4. Once activated you go to the Plugin options by clicking the 'WP Content Filter' link under the 'Settings' menu. +5. Enter your required filter keywords and configure other options and your site content will be protected automatically. + +== Frequently Asked Questions == + += How do I specify a character other than '*' to blank out swear words etc? = + +As of version 1.1 you can now set this in the Plugin options page. + += Does the Plugin change the content in the WordPress database? = + +No, the Plugin just filters content directly before it is displayed on the screen. No content in the database is ever altered. + +== Screenshots == + +1. Plugin options available. +2. Example of the Plugin working on a live site, filtering post content, comments, and the comment author name! +3. Activated Plugin on the Manage Plugins page. + +== Changelog == + +*2.31 update* + +* Minor update to Plugin options page. + +*2.3 update* + +* Support for filtering of bbPress title and content. +* Plugin options page updated. + +*2.28 update* + +* New internal function pre-fix used due to clash with another Plugin(s). +* Tested with WordPress 3.2.1. + +*2.27 update* + +* Updated for WordPress 3.1. + +*2.26 update* + +* Minor changes to Plugin options page. +* Tested and updated to work with WordPress 3.0. + +*2.25 update* + +* Ammendments to the Plugin options page. + +*2.20 update* + +* Strict filtering issue now fixed! Flagged keywords which are embedded in whole words can now be ignored with new Plugin options. +* New Plugin support package available. + +*2.11 update* + +* Admin help information labels updated. +* Screenshots resized, and a third one added. + +*2.1 update* + +* Added new filter character option - Blank, which replaces flagged keywords with nothing. i.e. basically just deletes the keyword(s). +* Changed drop down text for other filter character options to be in line with newly added option. +* Small CSS changes to WP Content Filter options page, to be consistent with WordPress options pages. + +*2.05 update* + +* Options table entries now removed when Plugin is deleted via WordPress admin. +* Legacy options entries now checked for and removed by default. + +*2.01 update* + +* Small edit to the menu page code. + +*2.0 update* + +* Overhaul of the Plugin code base. +* New options engine used. +* Options page completely updated. +* Keywords textbox input now validated, and automatically strips out HMTL tags. +* New option to preserve settings or restore defaults if the Plugin is temporarily deactivated and then reactivated. +* Option to delete Option db entries upon deactivation removed. Instead, a future version will delete these entries automatically when the Plugin is deactivated AND deleted. + +*1.2 update* + +* Comment author field, now filtered for keywords. +* Larger input area for entering keywords to be filtered. + +*1.1 update* + +* New option to remove all Plugin database settings when Plugin is deactivated. This is useful if you wish to delete the Plugin; in this case the option will clean up the database automatically. Note: If this option is selected, and the Plugin deactivated/activated then the Plugin options will revert to their defaults (i.e. same effect as installing the Plugin for the first time). So if you wish to retain your settings between updgrades leave this option at its default setting (off). +* Existing admin controls swapped around a bit. +* Can now select the wildcard character used in blanking out keywords (previous was fixed to only an asterisk). +* Choice of letters to retain in filtered keywords, options include: retain first letter (default), retain first and last letter, blank out ALL characters. \ No newline at end of file diff --git a/wp-content/plugins/wp-content-filter/screenshot-1.png b/wp-content/plugins/wp-content-filter/screenshot-1.png new file mode 100644 index 0000000..108983e Binary files /dev/null and b/wp-content/plugins/wp-content-filter/screenshot-1.png differ diff --git a/wp-content/plugins/wp-content-filter/screenshot-2.png b/wp-content/plugins/wp-content-filter/screenshot-2.png new file mode 100644 index 0000000..2ec7a33 Binary files /dev/null and b/wp-content/plugins/wp-content-filter/screenshot-2.png differ diff --git a/wp-content/plugins/wp-content-filter/screenshot-3.png b/wp-content/plugins/wp-content-filter/screenshot-3.png new file mode 100644 index 0000000..5f58b11 Binary files /dev/null and b/wp-content/plugins/wp-content-filter/screenshot-3.png differ diff --git a/wp-content/plugins/wp-content-filter/wp-content-filter.php b/wp-content/plugins/wp-content-filter/wp-content-filter.php new file mode 100644 index 0000000..bb7e15c --- /dev/null +++ b/wp-content/plugins/wp-content-filter/wp-content-filter.php @@ -0,0 +1,350 @@ + "1", "chk_post_content" => "1", "chk_comments" => "1", "txtar_keywords" => "Saturn, Jupiter, Pluto", "rdo_word" => "all", "drp_filter_char" => "star", "rdo_case" => "insen", "chk_default_options_db" => "", "rdo_strict_filtering" => "strict_on"); + update_option('pccf_options', $arr); + } +} + +// Init plugin options to white list our options +function pccf_init(){ + // put the below into a function and add checks all sections (especially radio buttons) have a valid choice (i.e. no section is blank) + // this is primarily to check newly added options have correct initial values + $tmp = get_option('pccf_options'); + if(!$tmp['rdo_strict_filtering']) + { // check strict filtering option has a starting value + $tmp["rdo_strict_filtering"] = "strict_off"; + update_option('pccf_options', $tmp); + } + register_setting( 'pccf_plugin_options', 'pccf_options', 'pccf_validate_options' ); +} + +// Add menu page +function pccf_add_options_page() { + add_options_page('WP Content Filter Options Page', 'WP Content Filter', 'manage_options', __FILE__, 'pccf_render_form'); +} + +// Draw the menu page itself +function pccf_render_form() { + ?> +
+

+

WP Content Filter Options

+

Configure the content filter Plugin options below.

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Keywords to Remove +
Separate keywords with commas +
Strict Filtering +
+
Note: When strict filtering is ON, embedded keywords are no longer filtered. +
Filter main content +
+
+
+
+ +
Word Rendering +
+
+ +
Filter Character + + [ ] Blank - completely removes the filtered keywords from view. +
Case Matching +
+
Note: 'Case Insensitive' matching type is better as it captures more words! +
Database Options + +
Only check this if you want to reset plugin settings upon reactivation +
+

+ +

+
+ +
+

If you use this Plugin on your website please consider making a donation to support continued development. Thanks.  :-)

+
+ +
+

+    +

+
+ +
+ 2) + { + if($wildcard_filter_type == 'first') + { + $tmp_search = substr($sub_search, 0, 1).str_repeat($wildcard, strlen(substr($sub_search, 1))); + } + else if($wildcard_filter_type == 'all') + { + $tmp_search = str_repeat($wildcard, strlen(substr($sub_search, 0))); + } + else + { + $tmp_search = substr($sub_search, 0, 1).str_repeat($wildcard, strlen(substr($sub_search, 2))).substr($sub_search, -1, 1); + } + if($filter_type == "insen") + { + $text = str_ireplace($sub_search, $tmp_search, $text); + } + else + { $text = str_replace($sub_search, $tmp_search, $text); } + } + } + } + else + { + // If strict filtering is ON - use regular expressions for more powerful seach and replace + foreach($search as $sub_search) + { + $sub_search = trim($sub_search); // remove whitespace chars from start/end of string + if(strlen($sub_search) > 2) + { + if($wildcard_filter_type == 'first') + { + $tmp_search = substr($sub_search, 0, 1).str_repeat($wildcard, strlen(substr($sub_search, 1))); + } + else if($wildcard_filter_type == 'all') + { + $tmp_search = str_repeat($wildcard, strlen(substr($sub_search, 0))); + } + else + { + $tmp_search = substr($sub_search, 0, 1).str_repeat($wildcard, strlen(substr($sub_search, 2))).substr($sub_search, -1, 1); + } + if($filter_type == "insen") + { + $text = str_replace_word_i($sub_search, $tmp_search, $text); + } + else + { $text = str_replace_word($sub_search, $tmp_search, $text); } + } + } + } + +return $text; +} + +// case insensitive +function str_replace_word_i($needle,$replacement,$haystack){ + $needle = str_replace('/','\\/', preg_quote($needle)); // allow '/' in keywords + $pattern = "/\b$needle\b/i"; + $haystack = preg_replace($pattern, $replacement, $haystack); + return $haystack; +} + +// case sensitive +function str_replace_word($needle,$replacement,$haystack){ + $needle = str_replace('/','\\/',preg_quote($needle)); // allow '/' in keywords + $pattern = "/\b$needle\b/"; + $haystack = preg_replace($pattern, $replacement, $haystack); + return $haystack; +} + +// Display a Settings link on the main Plugins page +function pccf_plugin_action_links( $links, $file ) { + + if ( $file == plugin_basename( __FILE__ ) ) { + $posk_links = ''.__('Settings').''; + // make the 'Settings' link appear first + array_unshift( $links, $posk_links ); + } + + return $links; +} + +// *************************************** +// *** END - Plugin Core Functions *** +// *************************************** \ No newline at end of file diff --git a/wp-content/themes/score/dedications/index.php b/wp-content/themes/score/dedications/index.php index 3b6079b..2e168db 100644 --- a/wp-content/themes/score/dedications/index.php +++ b/wp-content/themes/score/dedications/index.php @@ -7,6 +7,7 @@ + diff --git a/wp-content/themes/score/dedications/single/new-dedication.php b/wp-content/themes/score/dedications/single/new-dedication.php index 7a7d503..55f4b6e 100644 --- a/wp-content/themes/score/dedications/single/new-dedication.php +++ b/wp-content/themes/score/dedications/single/new-dedication.php @@ -60,7 +60,7 @@ global $bp;
  • - This dedication is private. + This dedication is private.
  • diff --git a/wp-content/themes/score/functions.php b/wp-content/themes/score/functions.php index 9fb5857..d9b2e4a 100644 --- a/wp-content/themes/score/functions.php +++ b/wp-content/themes/score/functions.php @@ -535,4 +535,55 @@ function the_url( $url ) { } add_filter( 'login_headerurl', 'the_url' ); +/* ************************* Other functions ************************** */ + +function htmlwrap(&$str, $maxLength, $char='
    '){ + $count = 0; + $newStr = ''; + $openTag = false; + $lenstr = strlen($str); + for($i=0; $i<$lenstr; $i++){ + $newStr .= $str{$i}; + if($str{$i} == '<'){ + $openTag = true; + continue; + } + if(($openTag) && ($str{$i} == '>')){ + $openTag = false; + continue; + } + if(!$openTag){ + if($str{$i} == ' '){ + if ($count == 0) { + $newStr = substr($newStr,0, -1); + continue; + } else { + $lastspace = $count + 1; + } + } + $count++; + if($count==$maxLength){ + if ($str{$i+1} != ' ' && $lastspace && ($lastspace < $count)) { + $tmp = ($count - $lastspace)* -1; + $newStr = substr($newStr,0, $tmp) . $char . substr($newStr,$tmp); + $count = $tmp * -1; + } else { + $newStr .= $char; + $count = 0; + } + $lastspace = 0; + } + } + } + + return $newStr; +} + +function cutstr($str, $length, $ellipsis=''){ + $cut = (array)explode('\n\n', htmlwrap($str, $length, '\n\n')); + return $cut[0].((strlen($cut) \ No newline at end of file diff --git a/wp-content/themes/score/header.php b/wp-content/themes/score/header.php index c4c1e2f..cd0545f 100644 --- a/wp-content/themes/score/header.php +++ b/wp-content/themes/score/header.php @@ -78,7 +78,7 @@
    @@ -99,6 +99,7 @@ +
     
    @@ -108,7 +109,7 @@
    - + diff --git a/wp-content/themes/score/index.php b/wp-content/themes/score/index.php index ed241b6..7443351 100644 --- a/wp-content/themes/score/index.php +++ b/wp-content/themes/score/index.php @@ -6,15 +6,34 @@ global $gp_settings;
    class="shift-down"> + ID, 'ghostpool_destination_user_id', true); + $to_user = get_user_by('id', $to_user_id); + $to_user_email = get_post_meta($post->ID, 'ghostpool_destination_user_email', true); + $displayed_id = bp_displayed_user_id(); + + // Usuario actual puede ver la dedicatoria? + if ($post->post_status == 'private') { + if (($current_user->ID != $from_user_id) && ($current_user->ID != $to_user_id)) { + continue; // me salto esta dedicatoria + } + } + $contador += 1; + ?> +
    > diff --git a/wp-content/themes/score/lib/admin/inc/theme-widgets.php b/wp-content/themes/score/lib/admin/inc/theme-widgets.php index 1b37197..b92fb91 100644 --- a/wp-content/themes/score/lib/admin/inc/theme-widgets.php +++ b/wp-content/themes/score/lib/admin/inc/theme-widgets.php @@ -14,54 +14,6 @@ class SidebarPosts extends WP_Widget { $this->WP_Widget('sidebar-posts-widget', __('GP Sidebar Posts', 'gp_lang'), $widget_ops); } - function htmlwrap(&$str, $maxLength, $char='
    '){ - $count = 0; - $newStr = ''; - $openTag = false; - $lenstr = strlen($str); - for($i=0; $i<$lenstr; $i++){ - $newStr .= $str{$i}; - if($str{$i} == '<'){ - $openTag = true; - continue; - } - if(($openTag) && ($str{$i} == '>')){ - $openTag = false; - continue; - } - if(!$openTag){ - if($str{$i} == ' '){ - if ($count == 0) { - $newStr = substr($newStr,0, -1); - continue; - } else { - $lastspace = $count + 1; - } - } - $count++; - if($count==$maxLength){ - if ($str{$i+1} != ' ' && $lastspace && ($lastspace < $count)) { - $tmp = ($count - $lastspace)* -1; - $newStr = substr($newStr,0, $tmp) . $char . substr($newStr,$tmp); - $count = $tmp * -1; - } else { - $newStr .= $char; - $count = 0; - } - $lastspace = 0; - } - } - } - - return $newStr; - } - - function cutstr($str, $length, $ellipsis=''){ - $cut = (array)explode('\n\n', $this->htmlwrap($str, $length, '\n\n')); - return $cut[0].((strlen($cut)ID, 'ghostpool_dedication_song', true); $artist_song = $artist . '. ' . $song; $artist_song_span = ''.$artist.''.'. '.$song; - $new_name = $this->cutstr($artist_song_span, 30, '...'); + $new_name = cutstr($artist_song_span, 30, '...'); ?> diff --git a/wp-content/themes/score/lib/scripts/custom.php b/wp-content/themes/score/lib/scripts/custom.php index 4f38ea4..f1c32b7 100644 --- a/wp-content/themes/score/lib/scripts/custom.php +++ b/wp-content/themes/score/lib/scripts/custom.php @@ -102,54 +102,6 @@ jQuery(document).ready(function(){ }); -/*************************** Review Tabs ***************************/ - -jQuery(document).ready(function(){ - - var panelContainer = jQuery('#review-panels'); - - var panelLocation = location.hash.slice(1); - - if(panelLocation == '1'){ - var panelNum = panelLocation; - } else if(panelLocation == '2'){ - var panelNum = panelLocation; - } else if(panelLocation == '3'){ - var panelNum = panelLocation; - } else if(panelLocation == '4'){ - var panelNum = panelLocation; - } else if(panelLocation == '5'){ - var panelNum = panelLocation; - } else if(panelLocation == '6'){ - var panelNum = panelLocation; - } else if(panelLocation == '7'){ - var panelNum = panelLocation; - } else if(panelLocation == '8'){ - var panelNum = panelLocation; - } else if(panelLocation == '9'){ - var panelNum = panelLocation; - } else if(panelLocation == '10'){ - var panelNum = panelLocation; - } else{ - var panelNum = '1'; - } - - panelContainer.find('.review-panel').hide(); - panelContainer.find('.review-panel:nth-child(' + panelNum + ')').fadeIn('slow'); - jQuery('#review-links ul').find('li.tab-link.tab:nth-child(' + panelNum + ')').removeClass('tab').addClass('tab-active'); - - jQuery('#review-links ul').find('li.tab-link').each(function(n){ - jQuery(this).click(function(){ - panelContainer.find('.review-panel').hide(); - panelContainer.find('.review-panel:nth-child(' + (n+1) + ')').fadeIn('slow'); - jQuery(this).parent().find('li.tab-link').removeClass('tab-active').addClass('tab'); - jQuery(this).removeClass('tab').addClass('tab-active'); - }); - }); - -}); - - /*************************** Gallery Shortcode Lightbox Support ***************************/ jQuery(document).ready(function(){ @@ -252,33 +204,6 @@ jQuery(document).ready(function(){ }); -/*************************** Contact Form ***************************/ -jQuery(document).ready(function(){ - - jQuery('#contact-form').submit(function() { - - jQuery('.contact-error').remove(); - var hasError = false; - jQuery('.requiredFieldContact').each(function() { - if(jQuery.trim(jQuery(this).val()) == '') { - jQuery(this).addClass('input-error'); - hasError = true; - } else if(jQuery(this).hasClass('email')) { - var emailReg = /^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/; - if(!emailReg.test(jQuery.trim(jQuery(this).val()))) { - jQuery(this).addClass('input-error'); - hasError = true; - } - } - }); - - }); - - jQuery('#contact-form .contact-submit').click(function() { - jQuery('.loader').css({display:"block"}); - }); - -}); \ No newline at end of file diff --git a/wp-content/themes/score/members/members-loop.php b/wp-content/themes/score/members/members-loop.php index 8317730..e0c2d5f 100644 --- a/wp-content/themes/score/members/members-loop.php +++ b/wp-content/themes/score/members/members-loop.php @@ -39,7 +39,7 @@
  • - +
    diff --git a/wp-content/themes/score/post-loop-dedication.php b/wp-content/themes/score/post-loop-dedication.php index 9e0ece9..d5cd547 100644 --- a/wp-content/themes/score/post-loop-dedication.php +++ b/wp-content/themes/score/post-loop-dedication.php @@ -16,14 +16,39 @@ - + +
    shift-down"> - + ID, 'ghostpool_destination_user_id', true); + $to_user = get_user_by('id', $to_user_id); + $to_user_email = get_post_meta($post->ID, 'ghostpool_destination_user_email', true); + $displayed_id = bp_displayed_user_id(); + + // Usuario actual puede ver la dedicatoria? + if ($post->post_status == 'private') { + if (($current_user->ID != $from_user_id) && ($current_user->ID != $to_user_id)) { + continue; // me salto esta dedicatoria + } + } + $contador += 1; + + $artist = get_post_meta($post->ID, 'ghostpool_dedication_artist', true); + $song = get_post_meta($post->ID, 'ghostpool_dedication_song', true); + $artist_song = $artist . '. ' . $song; + $artist_song_span = ''.$artist.''.'. '.$song; + $new_name = cutstr($artist_song_span, 38, ''); + if ($new_name != $artist_song_span) { + $new_name .= '...'; + } + + ?>
    > @@ -39,7 +64,7 @@
    -

    +

    TO:
    diff --git a/wp-content/themes/score/style-asong2u.css b/wp-content/themes/score/style-asong2u.css index 5c556c4..89ad09e 100644 --- a/wp-content/themes/score/style-asong2u.css +++ b/wp-content/themes/score/style-asong2u.css @@ -369,7 +369,7 @@ ul.navmenu li a.profile:hover { height: 650px; width: 100%; border: 1px solid #349bbc; - background: #f5f1f0; + background: #E7E7E7; } #slider-wrapper .error { @@ -482,6 +482,12 @@ ul.navmenu li a.profile:hover { margin-top: 15px; } +.footer-third { + width: 200px; +} + + + /* Footer Widgets */ #footer-widgets { @@ -493,6 +499,10 @@ ul.navmenu li a.profile:hover { color: #576a7b; } +#footer-widgets > div:first-child { + margin-left: 180px; +} + #footer-widgets h3 { border: 0px; margin-bottom: 0px; @@ -808,6 +818,7 @@ ul.navmenu li a.profile:hover { } /*************************** Others ***************************/ +input[type="submit"], input[type="reset"], input[type="button"], button, #content-wrapper .widget input[type="button"], #content-wrapper .widget input[type="submit"], #content-wrapper .widget input[type="reset"], @@ -844,6 +855,7 @@ a.button { border: 1px outset #34404b; } +input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hover, button:hover, .bp-wrapper #content-wrapper .button:hover, .bp-wrapper #content-wrapper .button.submit:hover, .bp-wrapper #content-wrapper ul.button-nav li a:hover, @@ -866,6 +878,7 @@ a.button:hover { border: 1px outset #7CB9D0; } +input[type="submit"]:active, input[type="reset"]:active, input[type="button"]:active, button:active, .bp-wrapper #content-wrapper .button:active, .bp-wrapper #content-wrapper .button.submit:active, .bp-wrapper #content-wrapper ul.button-nav li a:active, @@ -943,6 +956,7 @@ h3.comments { padding: 0; border: none; color: #576A7B; + overflow: hidden; } .comment-meta { @@ -1006,6 +1020,13 @@ h3.comments { margin: 0; padding: 0; padding-right: 1%; + overflow: hidden; +} + +.category-dedication.post-loop .post-text { + width: 95%; + white-space: nowrap; + overflow: hidden; } .home-page .post-loop { @@ -1030,6 +1051,7 @@ h3.comments { .post-text h2 { font-weight: normal; + white-space: nowrap; } .post-text h2 span { diff --git a/wp-content/themes/score/video-slider.php b/wp-content/themes/score/video-slider.php index 2008dcc..3f19058 100644 --- a/wp-content/themes/score/video-slider.php +++ b/wp-content/themes/score/video-slider.php @@ -67,11 +67,6 @@ if (have_posts()) { $to_user_email = get_post_meta($post->ID, 'ghostpool_destination_user_email', true); $displayed_id = bp_displayed_user_id(); - /*echo "post->ID => " . $post->ID; - echo "from_user_id => " . $from_user_id; - echo "to_user_id => " . $to_user_id; - echo "displayed_id " . $displayed_id;*/ - // En el perfil del usuario sólo mostrar las dedicadas por él y para él. El resto se descartan. if ( $bp->current_component == 'dedications' ) { if (($displayed_id != $from_user_id) && ($displayed_id != $to_user_id)) { @@ -80,7 +75,7 @@ if (have_posts()) { } // Usuario actual puede ver la dedicatoria? - if (get_post_status($post-ID) == 'private') { + if ($post->post_status == 'private') { if (($current_user->ID != $from_user_id) && ($current_user->ID != $to_user_id)) { continue; // me salto esta dedicatoria }