asc/tonys-sportspress-enhancements
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Prefix generic function names, normalize style in featured-image-generator

Browse Source 
- Rename generate_bisected_image, handle_image_request, serve_image,
  save_image_to_cache, add_image_generator_endpoint to tony_sportspress_*
  to avoid global namespace collisions
- Guard $team1/$team2 against null before accessing ->post_modified
- Unify the two logo-placement loops into a single foreach
- Normalize indentation to tabs throughout
- Fix missing space before => in sp-event-export normalize_request_args

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Anthony Correa
2026-04-06 08:39:09 -05:00
parent 7cde030f0e
commit 7fc040d87a
2 changed files with 199 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

368
includes/featured-image-generator.php
View File

@@ -11,204 +11,214 @@ if ( ! defined( 'ABSPATH' ) ) {
exit;
}
function generate_bisected_image($color1, $color2, $logo1_path, $logo2_path) {
$width = 1200;
$height = 628;
$x_margin = 0.1 * ($width / 2); // 10% of half the width
$y_margin = 0.1 * $height; // 10% of the height
$image = imagecreatetruecolor($width, $height);
/**
* Register the head-to-head rewrite endpoint.
*
* @return void
*/
function tony_sportspress_add_image_generator_endpoint() {
add_rewrite_endpoint( 'head-to-head', EP_ROOT, true );
}
add_action( 'init', 'tony_sportspress_add_image_generator_endpoint' );
// Allocate colors
$rgb1 = sscanf($color1, "#%02x%02x%02x");
$rgb2 = sscanf($color2, "#%02x%02x%02x");
$color1_alloc = imagecolorallocate($image, $rgb1[0], $rgb1[1], $rgb1[2]);
$color2_alloc = imagecolorallocate($image, $rgb2[0], $rgb2[1], $rgb2[2]);
/**
* Serve the generated matchup image on template_redirect.
*
* @return void
*/
function tony_sportspress_handle_image_request() {
if ( ! isset( $_GET['post'] ) ) {
return;
}
// Fill halves with a 15-degree angled bisection
$points1 = [
0, 0,
0, $height,
$width*.40, $height,
$width*.60, 0,
];
$points2 = [
$width, 0,
$width, $height,
$width*.40, $height,
$width*.60, 0,
];
imagefilledpolygon($image, $points1, $color1_alloc);
imagefilledpolygon($image, $points2, $color2_alloc);
$post_id = absint( $_GET['post'] );
if ( $post_id <= 0 ) {
return;
}
// Add logos with resizing and positioning if paths are not empty
if (!empty($logo1_path)) {
$logo1 = imagecreatefrompng($logo1_path);
$logo1_width = imagesx($logo1);
$logo1_height = imagesy($logo1);
$post = get_post( $post_id );
if ( ! $post || $post->post_type !== 'sp_event' ) {
return;
}
// Calculate max dimensions for logo 1
$max_width = ($width / 2) - (2 * $x_margin);
$max_height = $height - (2 * $y_margin);
$team_ids = get_post_meta( $post_id, 'sp_team', false );
if ( count( $team_ids ) < 2 ) {
return;
}
// Resize logo 1
$new_logo1_width = $logo1_width;
$new_logo1_height = $logo1_height;
if ($logo1_width > $max_width || $logo1_height > $max_height) {
$aspect_ratio1 = $logo1_width / $logo1_height;
if ($logo1_width / $max_width > $logo1_height / $max_height) {
$new_logo1_width = $max_width;
$new_logo1_height = $max_width / $aspect_ratio1;
} else {
$new_logo1_height = $max_height;
$new_logo1_width = $max_height * $aspect_ratio1;
}
}
$team1_id = (int) $team_ids[0];
$team2_id = (int) $team_ids[1];
// Center logo 1
$logo1_x = (int) ($width / 4) - ($new_logo1_width / 2);
$logo1_y = (int) ($height / 2) - ($new_logo1_height / 2);
imagecopyresampled($image, $logo1, $logo1_x, $logo1_y, 0, 0, $new_logo1_width, $new_logo1_height, $logo1_width, $logo1_height);
imagedestroy($logo1);
}
$team1 = get_post( $team1_id );
$team2 = get_post( $team2_id );
if (!empty($logo2_path)) {
$logo2 = imagecreatefrompng($logo2_path);
$logo2_width = imagesx($logo2);
$logo2_height = imagesy($logo2);
if ( ! $team1 || ! $team2 ) {
return;
}
// Calculate max dimensions for logo 2
$max_width = ($width / 2) - (2 * $x_margin);
$max_height = $height - (2 * $y_margin);
$team1_modified = strtotime( $team1->post_modified );
$team2_modified = strtotime( $team2->post_modified );
$cache_key = "team_image_{$team1_id}_{$team1_modified}-{$team2_id}_{$team2_modified}";
// Resize logo 2
$new_logo2_width = $logo2_width;
$new_logo2_height = $logo2_height;
if ($logo2_width > $max_width || $logo2_height > $max_height) {
$aspect_ratio2 = $logo2_width / $logo2_height;
if ($logo2_width / $max_width > $logo2_height / $max_height) {
$new_logo2_width = $max_width;
$new_logo2_height = $max_width / $aspect_ratio2;
} else {
$new_logo2_height = $max_height;
$new_logo2_width = $max_height * $aspect_ratio2;
}
}
$cached_path = get_transient( $cache_key );
if ( $cached_path && file_exists( $cached_path ) ) {
tony_sportspress_serve_image( $cached_path );
exit;
}
// Center logo 2
$logo2_x = (int) (3 * $width / 4) - ($new_logo2_width / 2);
$logo2_y = (int) ($height / 2) - ($new_logo2_height / 2);
imagecopyresampled($image, $logo2, $logo2_x, $logo2_y, 0, 0, $new_logo2_width, $new_logo2_height, $logo2_width, $logo2_height);
imagedestroy($logo2);
}
$default_color = '#FFFFFF';
$team1_colors = get_post_meta( $team1_id, 'sp_colors', true );
$team2_colors = get_post_meta( $team2_id, 'sp_colors', true );
$team1_color = ! empty( $team1_colors['primary'] ) ? $team1_colors['primary'] : $default_color;
$team2_color = ! empty( $team2_colors['primary'] ) ? $team2_colors['primary'] : $default_color;
// Start output buffering to capture the image data
ob_start();
imagepng($image); // Output the image as PNG
$image_data = ob_get_clean(); // Get the image data from the buffer
// Validate hex colors.
if ( ! preg_match( '/^#[a-fA-F0-9]{6}$/', $team1_color ) ) {
$team1_color = $default_color;
}
if ( ! preg_match( '/^#[a-fA-F0-9]{6}$/', $team2_color ) ) {
$team2_color = $default_color;
}
// Clean up memory
imagedestroy($image);
$team1_logo_url = get_the_post_thumbnail_url( $team1_id, 'full' );
$team2_logo_url = get_the_post_thumbnail_url( $team2_id, 'full' );
return $image_data;
// Skip if both teams have no distinguishable color or logo.
if ( $team1_color === $default_color && empty( $team1_logo_url )
&& $team2_color === $default_color && empty( $team2_logo_url ) ) {
return;
}
$team1_logo = get_attached_file( get_post_thumbnail_id( $team1_id ) );
$team2_logo = get_attached_file( get_post_thumbnail_id( $team2_id ) );
$image_data = tony_sportspress_generate_bisected_image( $team1_color, $team2_color, $team1_logo, $team2_logo );
$image_path = tony_sportspress_save_image_to_cache( $image_data, $cache_key );
set_transient( $cache_key, $image_path, DAY_IN_SECONDS * 30 );
tony_sportspress_serve_image( $image_path );
exit;
}
add_action( 'template_redirect', 'tony_sportspress_handle_image_request' );
/**
* Send a cached PNG image file to the browser.
*
* @param string $image_path Absolute path to the image file.
* @return void
*/
function tony_sportspress_serve_image( $image_path ) {
header( 'Content-Type: image/png' );
if ( file_exists( $image_path ) ) {
status_header( 200 );
} else {
status_header( 404 );
exit( 'Image not found.' );
}
while ( ob_get_level() ) {
ob_end_clean();
}
readfile( $image_path ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_readfile
}
function add_image_generator_endpoint() {
add_rewrite_endpoint('head-to-head', EP_ROOT, true);
}
add_action('init', 'add_image_generator_endpoint');
/**
* Write raw image data to the uploads directory and return the file path.
*
* @param string $image_data Raw PNG data.
* @param string $cache_key Cache key used as the filename stem.
* @return string
*/
function tony_sportspress_save_image_to_cache( $image_data, $cache_key ) {
$upload_dir = wp_get_upload_dir();
$file_path = $upload_dir['path'] . '/' . $cache_key . '.png';
function handle_image_request() {
if (!isset($_GET['post'])) return;
file_put_contents( $file_path, $image_data ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_file_put_contents
$post_id = absint( $_GET['post'] );
if ( $post_id <= 0 ) return;
$post = get_post($post_id);
// Verify post type
if (!$post || $post->post_type !== 'sp_event') return;
// Get associated teams from post meta
$team_ids = get_post_meta($post_id, 'sp_team', false); // false to get an array of values
// Ensure we have exactly two teams
if (count($team_ids) < 2) return;
$team1_id = $team_ids[0];
$team2_id = $team_ids[1];
$team1 = get_post($team1_id);
$team2 = get_post($team2_id);
$team1_postmodified = strtotime($team1->post_modified);
$team2_postmodified = strtotime($team2->post_modified);
$cache_key = "team_image_{$team1_id}_{$team1_postmodified}-{$team2_id}_{$team2_postmodified}";
$cached_image_path = get_transient($cache_key);
if ($cached_image_path && file_exists($cached_image_path)) {
serve_image($cached_image_path);
exit;
}
// Get team colors and logos
$team1_colors = get_post_meta($team1_id, 'sp_colors', true);
$team2_colors = get_post_meta($team2_id, 'sp_colors', true);
$default_color = '#FFFFFF'; // Default color (black)
$team1_color = !empty($team1_colors['primary']) ? $team1_colors['primary'] : $default_color;
$team2_color = !empty($team2_colors['primary']) ? $team2_colors['primary'] : $default_color;
// Security check for hex color
$team1_color = preg_match('/^#[a-fA-F0-9]{6}$/', $team1_color) ? $team1_color : '#FFFFFF';
$team2_color = preg_match('/^#[a-fA-F0-9]{6}$/', $team2_color) ? $team2_color : '#FFFFFF';
$team1_logo_url = get_the_post_thumbnail_url($team1_id, 'full');
$team2_logo_url = get_the_post_thumbnail_url($team2_id, 'full');
// Check if both team colors are default and both logos are empty
if (($team1_color === $default_color && empty($team1_logo_url)) && ($team2_color === $default_color && empty($team2_logo_url))) {
return; // Do nothing if both teams have no valid color or logo
}
$team1_logo_thumbnail_id = get_post_thumbnail_id($team1_id, 'full');
$team2_logo_thumbnail_id = get_post_thumbnail_id($team2_id, 'full');
$team1_logo = get_attached_file($team1_logo_thumbnail_id);
$team2_logo = get_attached_file($team2_logo_thumbnail_id);
// Generate the image if no valid cache exists
$image_data = generate_bisected_image($team1_color, $team2_color, $team1_logo, $team2_logo);
$image_path = save_image_to_cache($image_data, $cache_key);
set_transient($cache_key, $image_path, DAY_IN_SECONDS * 30); // Cache for 30 days
serve_image($image_path);
exit;
}
add_action('template_redirect', 'handle_image_request');
function serve_image($image_path) {
header('Content-Type: image/png');
if (file_exists($image_path)) {
status_header( 200 );
} else {
status_header( 404 );
die("Image not found.");
}
// Clear all output buffering to prevent any extra output
while (ob_get_level()) {
ob_end_clean();
}
readfile($image_path);
return $file_path;
}
function save_image_to_cache($image_data, $cache_key) {
$upload_dir = wp_get_upload_dir();
$file_path = $upload_dir['path'] . '/' . $cache_key . '.png';
/**
* Generate a bisected two-color PNG with optional team logos.
*
* @param string $color1 Hex color for the left half (e.g. #FF0000).
* @param string $color2 Hex color for the right half.
* @param string $logo1_path Absolute path to team 1 PNG logo (or empty).
* @param string $logo2_path Absolute path to team 2 PNG logo (or empty).
* @return string Raw PNG image data.
*/
function tony_sportspress_generate_bisected_image( $color1, $color2, $logo1_path, $logo2_path ) {
$width = 1200;
$height = 628;
$x_margin = 0.1 * ( $width / 2 );
$y_margin = 0.1 * $height;
$image = imagecreatetruecolor( $width, $height );
// Assuming $image_data is raw image data
file_put_contents($file_path, $image_data);
$rgb1 = sscanf( $color1, '#%02x%02x%02x' );
$rgb2 = sscanf( $color2, '#%02x%02x%02x' );
$color1_alloc = imagecolorallocate( $image, $rgb1[0], $rgb1[1], $rgb1[2] );
$color2_alloc = imagecolorallocate( $image, $rgb2[0], $rgb2[1], $rgb2[2] );
return $file_path;
}
// Left trapezoid.
imagefilledpolygon(
$image,
array( 0, 0, 0, $height, $width * 0.40, $height, $width * 0.60, 0 ),
$color1_alloc
);
// Right trapezoid.
imagefilledpolygon(
$image,
array( $width, 0, $width, $height, $width * 0.40, $height, $width * 0.60, 0 ),
$color2_alloc
);
$max_logo_width = ( $width / 2 ) - ( 2 * $x_margin );
$max_logo_height = $height - ( 2 * $y_margin );
foreach ( array(
array( 'path' => $logo1_path, 'center_x' => $width / 4 ),
array( 'path' => $logo2_path, 'center_x' => 3 * $width / 4 ),
) as $logo ) {
if ( empty( $logo['path'] ) ) {
continue;
}
$src = imagecreatefrompng( $logo['path'] );
if ( ! $src ) {
continue;
}
$src_w = imagesx( $src );
$src_h = imagesy( $src );
$dst_w = $src_w;
$dst_h = $src_h;
if ( $src_w > $max_logo_width || $src_h > $max_logo_height ) {
$ratio = $src_w / $src_h;
if ( $src_w / $max_logo_width > $src_h / $max_logo_height ) {
$dst_w = $max_logo_width;
$dst_h = $max_logo_width / $ratio;
} else {
$dst_h = $max_logo_height;
$dst_w = $max_logo_height * $ratio;
}
}
$dst_x = (int) ( $logo['center_x'] - $dst_w / 2 );
$dst_y = (int) ( $height / 2 - $dst_h / 2 );
imagecopyresampled( $image, $src, $dst_x, $dst_y, 0, 0, (int) $dst_w, (int) $dst_h, $src_w, $src_h );
imagedestroy( $src );
}
ob_start();
imagepng( $image );
$image_data = (string) ob_get_clean();
imagedestroy( $image );
return $image_data;
}

20
includes/sp-event-export.php
View File

@@ -181,16 +181,16 @@ function tse_sp_event_export_normalize_request_args( $source = null ) {
$field_ids = isset( $source['field_id'] ) ? tse_sp_event_export_parse_id_list( wp_unslash( $source['field_id'] ) ) : array();
return array(
'team_id' => isset( $team_ids[0] ) ? $team_ids[0] : 0,
'team_ids' => $team_ids,
'season_id' => isset( $season_ids[0] ) ? $season_ids[0] : 0,
'season_ids'=> $season_ids,
'league_id' => isset( $league_ids[0] ) ? $league_ids[0] : 0,
'league_ids'=> $league_ids,
'field_id' => isset( $field_ids[0] ) ? $field_ids[0] : 0,
'field_ids' => $field_ids,
'format' => $format,
'columns' => isset( $source['columns'] ) ? tse_sp_event_export_sanitize_columns( $format, wp_unslash( $source['columns'] ) ) : tse_sp_event_export_get_default_columns( $format ),
'team_id' => isset( $team_ids[0] ) ? $team_ids[0] : 0,
'team_ids' => $team_ids,
'season_id' => isset( $season_ids[0] ) ? $season_ids[0] : 0,
'season_ids' => $season_ids,
'league_id' => isset( $league_ids[0] ) ? $league_ids[0] : 0,
'league_ids' => $league_ids,
'field_id' => isset( $field_ids[0] ) ? $field_ids[0] : 0,
'field_ids' => $field_ids,
'format' => $format,
'columns' => isset( $source['columns'] ) ? tse_sp_event_export_sanitize_columns( $format, wp_unslash( $source['columns'] ) ) : tse_sp_event_export_get_default_columns( $format ),
);
}