wp-plugins/wp-digital-download
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Major improvements: Fix download limits, enhance license display, fix software filenames

Browse Source 
🔧 Bug Fixes:
- Fixed download limits defaulting to 5 instead of 0 for unlimited downloads
- Fixed software license filename sanitization (spaces→dashes, dots→underscores, proper .zip extension)
- Software downloads now show as "Test-Plugin-v2-2-0.zip" instead of "Test Plugin v2.2.0"

✨ UI/UX Enhancements:
- Redesigned license key display to span full table width with FontAwesome copy icons
- Added responsive CSS styling for license key rows
- Integrated FontAwesome CDN for modern copy icons

🏗️ Architecture Improvements:
- Added comprehensive filename sanitization in both download handler and API paths
- Enhanced software license product handling for local package files
- Improved error handling and logging throughout download processes

📦 Infrastructure:
- Added Gitea workflows for automated releases on push to main
- Created comprehensive .gitignore excluding test files and browser automation
- Updated documentation with all recent improvements and technical insights

🔍 Technical Details:
- Software license products served from wp-content/uploads/wpdd-packages/
- Download flow: token → process_download_by_token() → process_download() → deliver_file()
- Dual path coverage for both API downloads and regular file delivery
- Version placeholder system for automated deployment

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
jknapp
2025-09-09 19:16:57 -07:00
parent ce48f1615f
commit a160fe3964
28 changed files with 3709 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
includes/class-wpdd-api.php
View File

@@ -371,8 +371,22 @@ class WPDD_API {
array('%d', '%d', '%d', '%s', '%s', '%s', '%s')
);
// Serve file
$filename = basename($package_path);
// Serve file with proper filename
$original_filename = basename($package_path);
$original_extension = pathinfo($original_filename, PATHINFO_EXTENSION);
// If no extension, assume it's a zip file
if (empty($original_extension)) {
$original_extension = 'zip';
}
// Create sanitized filename using product name and version
$product_name = $product->post_title;
$version = $latest_version->version;
$safe_name = str_replace([' ', '.'], ['-', '_'], $product_name . ' v' . $version);
$safe_name = sanitize_file_name($safe_name);
$filename = $safe_name . '.' . $original_extension;
header('Content-Type: application/zip');
header('Content-Disposition: attachment; filename="' . $filename . '"');
header('Content-Length: ' . filesize($package_path));
@@ -632,6 +646,27 @@ class WPDD_API {
// Update product version meta
update_post_meta($product_id, '_wpdd_current_version', $version);
// Update product files to include the new package
$files = get_post_meta($product_id, '_wpdd_files', true);
if (!is_array($files)) {
$files = array();
}
// Add or update the package file in the files list
$package_file = array(
'id' => 'package_' . $version,
'name' => get_the_title($product_id) . ' v' . $version,
'url' => $package_url
);
// Remove any existing package entries and add the new one as the first file
$files = array_filter($files, function($file) {
return !isset($file['id']) || strpos($file['id'], 'package_') !== 0;
});
array_unshift($files, $package_file);
update_post_meta($product_id, '_wpdd_files', $files);
// Notify customers about update (optional)
self::notify_customers_about_update($product_id, $version);
@@ -782,4 +817,128 @@ class WPDD_API {
// Optional: Send email notifications to customers with active licenses
// This could be a separate scheduled job to avoid timeout issues
}
/**
* Manually sync a software product with its latest Git release
* This can be used to fix products that don't have files or need updates
*/
public static function sync_software_product($product_id, $force_rebuild = false) {
global $wpdb;
// Check if product is software license type
$product_type = get_post_meta($product_id, '_wpdd_product_type', true);
if ($product_type !== 'software_license') {
return array(
'success' => false,
'error' => 'not_software_license',
'message' => __('Product is not a software license product.', 'wp-digital-download')
);
}
// Get Git repository settings
$git_url = get_post_meta($product_id, '_wpdd_git_repository', true);
$git_username = get_post_meta($product_id, '_wpdd_git_username', true);
$git_token = get_post_meta($product_id, '_wpdd_git_token', true);
$current_version = get_post_meta($product_id, '_wpdd_current_version', true);
if (!$git_url) {
return array(
'success' => false,
'error' => 'no_git_url',
'message' => __('No Git repository URL configured.', 'wp-digital-download')
);
}
if (!$current_version) {
return array(
'success' => false,
'error' => 'no_version',
'message' => __('No current version specified. Please set a version in the product settings.', 'wp-digital-download')
);
}
// Check if we already have this version
$existing_version = $wpdb->get_row($wpdb->prepare(
"SELECT * FROM {$wpdb->prefix}wpdd_software_versions
WHERE product_id = %d AND version = %s",
$product_id,
$current_version
));
$package_url = null;
if (!$existing_version || $force_rebuild) {
// Build package from current version
$package_url = self::build_package_from_git($product_id, $git_url, 'v' . $current_version, $git_username, $git_token);
if (!$package_url) {
// Try without 'v' prefix
$package_url = self::build_package_from_git($product_id, $git_url, $current_version, $git_username, $git_token);
}
if (!$package_url) {
return array(
'success' => false,
'error' => 'build_failed',
'message' => __('Failed to build package from repository.', 'wp-digital-download')
);
}
// Insert or update version record
if ($existing_version) {
$wpdb->update(
$wpdb->prefix . 'wpdd_software_versions',
array(
'package_url' => $package_url,
'release_date' => current_time('mysql')
),
array('id' => $existing_version->id),
array('%s', '%s'),
array('%d')
);
} else {
$wpdb->insert(
$wpdb->prefix . 'wpdd_software_versions',
array(
'product_id' => $product_id,
'version' => $current_version,
'package_url' => $package_url,
'git_tag' => 'v' . $current_version,
'release_date' => current_time('mysql')
),
array('%d', '%s', '%s', '%s', '%s')
);
}
} else {
$package_url = $existing_version->package_url;
}
// Update product files to include the package
$files = get_post_meta($product_id, '_wpdd_files', true);
if (!is_array($files)) {
$files = array();
}
// Add or update the package file in the files list
$package_file = array(
'id' => 'package_' . $current_version,
'name' => get_the_title($product_id) . ' v' . $current_version,
'url' => $package_url
);
// Remove any existing package entries and add the new one as the first file
$files = array_filter($files, function($file) {
return !isset($file['id']) || strpos($file['id'], 'package_') !== 0;
});
array_unshift($files, $package_file);
update_post_meta($product_id, '_wpdd_files', $files);
return array(
'success' => true,
'message' => __('Product synced successfully.', 'wp-digital-download'),
'version' => $current_version,
'package_url' => $package_url
);
}
}

78
includes/class-wpdd-creator.php
View File

@@ -86,14 +86,72 @@ class WPDD_Creator {
}
public static function get_creator_balance($user_id) {
return floatval(get_user_meta($user_id, 'wpdd_creator_balance', true));
global $wpdb;
// Get balance from user meta (for backward compatibility and manual adjustments)
$meta_balance = floatval(get_user_meta($user_id, 'wpdd_creator_balance', true));
// If we have the creator_earnings table, calculate from there
$table_exists = $wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}wpdd_creator_earnings'") == $wpdb->prefix . 'wpdd_creator_earnings';
if ($table_exists) {
// Check if payout_status column exists
$columns = $wpdb->get_results("SHOW COLUMNS FROM {$wpdb->prefix}wpdd_creator_earnings");
$has_payout_status = false;
foreach ($columns as $column) {
if ($column->Field == 'payout_status') {
$has_payout_status = true;
break;
}
}
if ($has_payout_status) {
// Calculate available earnings (not pending, not paid)
$available_earnings = $wpdb->get_var($wpdb->prepare(
"SELECT SUM(creator_earning)
FROM {$wpdb->prefix}wpdd_creator_earnings
WHERE creator_id = %d
AND payout_status = 'available'",
$user_id
));
// Calculate balance adjustments
$adjustments_table_exists = $wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}wpdd_balance_adjustments'") == $wpdb->prefix . 'wpdd_balance_adjustments';
$total_adjustments = 0;
if ($adjustments_table_exists) {
$total_adjustments = $wpdb->get_var($wpdb->prepare(
"SELECT SUM(CASE
WHEN adjustment_type = 'add' THEN amount
WHEN adjustment_type = 'subtract' THEN -amount
ELSE 0
END)
FROM {$wpdb->prefix}wpdd_balance_adjustments
WHERE creator_id = %d",
$user_id
));
}
$calculated_balance = floatval($available_earnings) + floatval($total_adjustments);
// Update the meta if different
if (abs($calculated_balance - $meta_balance) > 0.01) {
update_user_meta($user_id, 'wpdd_creator_balance', $calculated_balance);
}
return $calculated_balance;
}
}
// Fall back to meta balance
return $meta_balance;
}
public static function get_creator_total_earnings($user_id) {
global $wpdb;
$total = $wpdb->get_var($wpdb->prepare(
"SELECT SUM(o.total)
"SELECT SUM(o.amount)
FROM {$wpdb->prefix}wpdd_orders o
INNER JOIN {$wpdb->posts} p ON o.product_id = p.ID
WHERE p.post_author = %d
@@ -130,12 +188,20 @@ class WPDD_Creator {
$creator_id = $product->post_author;
$commission_rate = floatval(get_option('wpdd_commission_rate', 0));
$creator_share = $order->total * (1 - ($commission_rate / 100));
$creator_share = $order->amount * (1 - ($commission_rate / 100));
// Update creator balance
$current_balance = self::get_creator_balance($creator_id);
update_user_meta($creator_id, 'wpdd_creator_balance', $current_balance + $creator_share);
// Calculate when earnings will be available (holding period)
$holding_days = intval(get_option('wpdd_earnings_holding_days', 15));
$available_at = ($holding_days > 0) ?
date('Y-m-d H:i:s', strtotime('+' . $holding_days . ' days')) :
current_time('mysql');
$initial_status = ($holding_days > 0) ? 'pending' : 'available';
// Log the earning
$wpdb->insert(
$wpdb->prefix . 'wpdd_creator_earnings',
@@ -143,12 +209,14 @@ class WPDD_Creator {
'creator_id' => $creator_id,
'order_id' => $order_id,
'product_id' => $order->product_id,
'sale_amount' => $order->total,
'sale_amount' => $order->amount,
'commission_rate' => $commission_rate,
'creator_earning' => $creator_share,
'payout_status' => $initial_status,
'available_at' => $available_at,
'created_at' => current_time('mysql')
),
array('%d', '%d', '%d', '%f', '%f', '%f', '%s')
array('%d', '%d', '%d', '%f', '%f', '%f', '%s', '%s', '%s')
);
}

124
includes/class-wpdd-download-handler.php
View File

@@ -87,16 +87,16 @@ class WPDD_Download_Handler {
}
private static function process_download_by_order() {
$download_link_id = intval($_GET['wpdd_download']);
$order_id = intval($_GET['wpdd_download']);
// Debug nonce verification
if (current_user_can('manage_options')) {
error_log('WPDD Debug: Download Link ID: ' . $download_link_id);
error_log('WPDD Debug: Order ID: ' . $order_id);
error_log('WPDD Debug: Nonce received: ' . ($_GET['_wpnonce'] ?? 'none'));
error_log('WPDD Debug: Expected nonce action: wpdd_download_' . $download_link_id);
error_log('WPDD Debug: Expected nonce action: wpdd_download_' . $order_id);
}
if (!wp_verify_nonce($_GET['_wpnonce'] ?? '', 'wpdd_download_' . $download_link_id)) {
if (!wp_verify_nonce($_GET['_wpnonce'] ?? '', 'wpdd_download_' . $order_id)) {
if (current_user_can('manage_options')) {
error_log('WPDD Debug: Nonce verification failed!');
}
@@ -105,18 +105,6 @@ class WPDD_Download_Handler {
global $wpdb;
// First get the download link to find the associated order
$download_link = $wpdb->get_row($wpdb->prepare(
"SELECT * FROM {$wpdb->prefix}wpdd_download_links WHERE id = %d",
$download_link_id
));
if (!$download_link) {
wp_die(__('Invalid download link.', 'wp-digital-download'));
}
$order_id = $download_link->order_id;
// Check by email if guest
if (isset($_GET['customer_email']) && isset($_GET['key'])) {
$email = sanitize_email($_GET['customer_email']);
@@ -436,16 +424,17 @@ class WPDD_Download_Handler {
if ($file_meta && file_exists($file_meta['file_path'])) {
$enable_watermark = get_post_meta($product_id, '_wpdd_enable_watermark', true);
$product_name = get_the_title($product_id);
if ($enable_watermark && self::is_watermarkable($file_meta['file_path'])) {
$watermarked_file = WPDD_Watermark::apply_watermark($file_meta['file_path'], $order);
if ($watermarked_file) {
self::deliver_protected_file($watermarked_file, true);
self::deliver_protected_file($watermarked_file, true, $product_name);
} else {
self::deliver_protected_file($file_meta['file_path']);
self::deliver_protected_file($file_meta['file_path'], false, $product_name);
}
} else {
self::deliver_protected_file($file_meta['file_path']);
self::deliver_protected_file($file_meta['file_path'], false, $product_name);
}
return;
}
@@ -464,16 +453,17 @@ class WPDD_Download_Handler {
if ($file_meta && file_exists($file_meta['file_path'])) {
$enable_watermark = get_post_meta($product_id, '_wpdd_enable_watermark', true);
$product_name = get_the_title($product_id);
if ($enable_watermark && self::is_watermarkable($file_meta['file_path'])) {
$watermarked_file = WPDD_Watermark::apply_watermark($file_meta['file_path'], $order);
if ($watermarked_file) {
self::deliver_protected_file($watermarked_file, true);
self::deliver_protected_file($watermarked_file, true, $product_name);
} else {
self::deliver_protected_file($file_meta['file_path']);
self::deliver_protected_file($file_meta['file_path'], false, $product_name);
}
} else {
self::deliver_protected_file($file_meta['file_path']);
self::deliver_protected_file($file_meta['file_path'], false, $product_name);
}
return;
}
@@ -483,15 +473,32 @@ class WPDD_Download_Handler {
// Regular file handling (backward compatibility)
$enable_watermark = get_post_meta($product_id, '_wpdd_enable_watermark', true);
// Generate proper filename for software license products
$product_type = get_post_meta($product_id, '_wpdd_product_type', true);
$final_filename = $file['name'];
if ($product_type === 'software_license') {
// Check if this is a package file (contains version info)
if (strpos($file['url'], 'wpdd-packages/') !== false && preg_match('/package-v([^\/]+)\.zip$/', $file['url'], $matches)) {
$version = $matches[1];
$product_name = get_the_title($product_id);
// Create sanitized filename using product name and version
$safe_name = str_replace([' ', '.'], ['-', '_'], $product_name . ' v' . $version);
$safe_name = sanitize_file_name($safe_name);
$final_filename = $safe_name . '.zip';
}
}
if ($enable_watermark && self::is_watermarkable($file['url'])) {
$watermarked_file = WPDD_Watermark::apply_watermark($file['url'], $order);
if ($watermarked_file) {
self::deliver_file($watermarked_file, $file['name'], true);
self::deliver_file($watermarked_file, $final_filename, true);
} else {
self::deliver_file($file['url'], $file['name']);
self::deliver_file($file['url'], $final_filename);
}
} else {
self::deliver_file($file['url'], $file['name']);
self::deliver_file($file['url'], $final_filename);
}
}
@@ -606,18 +613,77 @@ class WPDD_Download_Handler {
self::deliver_protected_file($protected_path);
}
private static function deliver_protected_file($file_path, $is_temp = false) {
private static function deliver_protected_file($file_path, $is_temp = false, $product_name = null) {
if (!file_exists($file_path)) {
wp_die(__('File not found.', 'wp-digital-download'));
}
$file_name = basename($file_path);
$file_size = filesize($file_path);
$file_type = wp_check_filetype($file_path);
$file_info = wp_check_filetype($file_path);
// If product name is provided, use it with the original extension
if ($product_name) {
$original_file_name = basename($file_path);
$original_extension = pathinfo($original_file_name, PATHINFO_EXTENSION);
// If no extension found, try to detect it
if (empty($original_extension)) {
// Check if it's a zip file by reading the first few bytes
$handle = fopen($file_path, 'rb');
if ($handle) {
$header = fread($handle, 4);
fclose($handle);
// ZIP files start with PK (0x504B)
if (substr($header, 0, 2) === 'PK') {
$original_extension = 'zip';
$file_info['type'] = 'application/zip';
$file_info['ext'] = 'zip';
}
}
// If still no extension, try wp_check_filetype result
if (empty($original_extension) && !empty($file_info['ext'])) {
$original_extension = $file_info['ext'];
}
}
// Sanitize product name for filename use
// Convert spaces to dashes and dots to underscores, then use standard sanitization
$safe_product_name = str_replace([' ', '.'], ['-', '_'], $product_name);
$safe_product_name = sanitize_file_name($safe_product_name);
$file_name = $safe_product_name . ($original_extension ? '.' . $original_extension : '');
} else {
// Fallback to original logic if no product name provided
$file_name = basename($file_path);
$has_extension = strpos($file_name, '.') !== false;
// If no extension in filename, try to determine from content
if (!$has_extension) {
// Check if it's a zip file by reading the first few bytes
$handle = fopen($file_path, 'rb');
if ($handle) {
$header = fread($handle, 4);
fclose($handle);
// ZIP files start with PK (0x504B)
if (substr($header, 0, 2) === 'PK') {
$file_info['type'] = 'application/zip';
$file_info['ext'] = 'zip';
$file_name .= '.zip';
}
}
}
// If we still don't have an extension but wp_check_filetype detected one, add it
if (!$has_extension && !empty($file_info['ext']) && strpos($file_name, '.' . $file_info['ext']) === false) {
$file_name .= '.' . $file_info['ext'];
}
}
nocache_headers();
header('Content-Type: ' . ($file_type['type'] ?: 'application/octet-stream'));
header('Content-Type: ' . ($file_info['type'] ?: 'application/octet-stream'));
header('Content-Disposition: attachment; filename="' . $file_name . '"');
header('Content-Length: ' . $file_size);
header('Content-Transfer-Encoding: binary');

189
includes/class-wpdd-earnings-processor.php Normal file
View File

@@ -0,0 +1,189 @@
<?php
if (!defined('ABSPATH')) {
exit;
}
class WPDD_Earnings_Processor {
public static function init() {
// Schedule the cron job
add_action('wp', array(__CLASS__, 'schedule_earnings_processing'));
add_action('wpdd_process_pending_earnings', array(__CLASS__, 'process_pending_earnings'));
// Hook to plugin activation/deactivation
register_activation_hook(WPDD_PLUGIN_PATH . 'wp-digital-download.php', array(__CLASS__, 'schedule_earnings_processing'));
register_deactivation_hook(WPDD_PLUGIN_PATH . 'wp-digital-download.php', array(__CLASS__, 'clear_scheduled_earnings_processing'));
}
public static function schedule_earnings_processing() {
if (!wp_next_scheduled('wpdd_process_pending_earnings')) {
// Run every hour to check for earnings that should be made available
wp_schedule_event(time(), 'hourly', 'wpdd_process_pending_earnings');
}
}
public static function clear_scheduled_earnings_processing() {
wp_clear_scheduled_hook('wpdd_process_pending_earnings');
}
public static function process_pending_earnings() {
global $wpdb;
// Find all earnings that are pending and past their available_at date
$pending_earnings = $wpdb->get_results(
"SELECT * FROM {$wpdb->prefix}wpdd_creator_earnings
WHERE payout_status = 'pending'
AND available_at <= NOW()
AND available_at IS NOT NULL"
);
if (empty($pending_earnings)) {
return; // Nothing to process
}
// Update all pending earnings to available
$updated = $wpdb->query(
"UPDATE {$wpdb->prefix}wpdd_creator_earnings
SET payout_status = 'available'
WHERE payout_status = 'pending'
AND available_at <= NOW()
AND available_at IS NOT NULL"
);
if ($updated > 0) {
// Log the processing
error_log("WPDD: Processed $updated pending earnings to available status");
// Update creator balances for affected creators
$affected_creators = $wpdb->get_col(
"SELECT DISTINCT creator_id
FROM {$wpdb->prefix}wpdd_creator_earnings
WHERE payout_status = 'available'
AND available_at <= NOW()"
);
foreach ($affected_creators as $creator_id) {
// Trigger balance recalculation
$current_balance = WPDD_Creator::get_creator_balance($creator_id);
update_user_meta($creator_id, 'wpdd_creator_balance', $current_balance);
}
}
}
/**
* Manually process a specific earning (for admin override)
*/
public static function release_earning_immediately($earning_id) {
global $wpdb;
$result = $wpdb->update(
$wpdb->prefix . 'wpdd_creator_earnings',
array(
'payout_status' => 'available',
'available_at' => current_time('mysql')
),
array(
'id' => $earning_id,
'payout_status' => 'pending'
),
array('%s', '%s'),
array('%d', '%s')
);
if ($result) {
// Get the creator and update their balance
$earning = $wpdb->get_row($wpdb->prepare(
"SELECT creator_id FROM {$wpdb->prefix}wpdd_creator_earnings WHERE id = %d",
$earning_id
));
if ($earning) {
$current_balance = WPDD_Creator::get_creator_balance($earning->creator_id);
update_user_meta($earning->creator_id, 'wpdd_creator_balance', $current_balance);
}
}
return $result > 0;
}
/**
* Cancel/refund a specific earning (for order cancellations)
*/
public static function cancel_earning($earning_id, $reason = 'Order cancelled/refunded') {
global $wpdb;
// Get the earning details
$earning = $wpdb->get_row($wpdb->prepare(
"SELECT * FROM {$wpdb->prefix}wpdd_creator_earnings WHERE id = %d",
$earning_id
));
if (!$earning) {
return false;
}
// Only cancel if not already paid out
if ($earning->payout_status === 'paid') {
return false; // Cannot cancel paid earnings
}
// Update to cancelled status
$result = $wpdb->update(
$wpdb->prefix . 'wpdd_creator_earnings',
array(
'payout_status' => 'cancelled',
'available_at' => null
),
array('id' => $earning_id),
array('%s', '%s'),
array('%d')
);
if ($result) {
// Log the cancellation
$wpdb->insert(
$wpdb->prefix . 'wpdd_balance_adjustments',
array(
'creator_id' => $earning->creator_id,
'adjustment_type' => 'subtract',
'amount' => $earning->creator_earning,
'previous_balance' => WPDD_Creator::get_creator_balance($earning->creator_id),
'new_balance' => WPDD_Creator::get_creator_balance($earning->creator_id) - $earning->creator_earning,
'reason' => $reason . ' (Order #' . $earning->order_id . ')',
'adjusted_by' => get_current_user_id(),
'created_at' => current_time('mysql')
),
array('%d', '%s', '%f', '%f', '%f', '%s', '%d', '%s')
);
// Update creator balance
$current_balance = WPDD_Creator::get_creator_balance($earning->creator_id);
update_user_meta($earning->creator_id, 'wpdd_creator_balance', $current_balance - $earning->creator_earning);
}
return $result > 0;
}
/**
* Get earnings summary for a creator
*/
public static function get_earnings_summary($creator_id) {
global $wpdb;
$summary = $wpdb->get_row($wpdb->prepare(
"SELECT
COUNT(*) as total_earnings,
SUM(CASE WHEN payout_status = 'pending' THEN creator_earning ELSE 0 END) as pending_amount,
SUM(CASE WHEN payout_status = 'available' THEN creator_earning ELSE 0 END) as available_amount,
SUM(CASE WHEN payout_status = 'paid' THEN creator_earning ELSE 0 END) as paid_amount,
SUM(CASE WHEN payout_status = 'cancelled' THEN creator_earning ELSE 0 END) as cancelled_amount,
SUM(creator_earning) as total_amount
FROM {$wpdb->prefix}wpdd_creator_earnings
WHERE creator_id = %d",
$creator_id
));
return $summary;
}
}

211
includes/class-wpdd-email.php Normal file
View File

@@ -0,0 +1,211 @@
<?php
/**
* Email handler class for WP Digital Download
* Handles email sending with logging and SMTP configuration
*/
if (!defined('ABSPATH')) {
exit;
}
class WPDD_Email {
public static function init() {
// Configure SMTP if enabled
if (get_option('wpdd_smtp_enabled')) {
add_action('phpmailer_init', array(__CLASS__, 'configure_smtp'));
}
}
/**
* Send email with logging
*
* @param string $to Email address to send to
* @param string $subject Email subject
* @param string $message Email message (HTML)
* @param string $email_type Type of email for logging (e.g., 'order_confirmation', 'download_link', etc.)
* @param array $headers Optional email headers
* @return bool Whether email was sent successfully
*/
public static function send($to, $subject, $message, $email_type = 'general', $headers = array()) {
global $wpdb;
// Set default headers if not provided
if (empty($headers)) {
$from_email = get_option('wpdd_from_email', get_option('admin_email'));
$from_name = get_option('wpdd_from_name', get_bloginfo('name'));
$headers = array(
'From: ' . $from_name . ' <' . $from_email . '>',
'Content-Type: text/html; charset=UTF-8'
);
}
// Send the email
$sent = wp_mail($to, $subject, $message, $headers);
// Log the email
$table_name = $wpdb->prefix . 'wpdd_email_logs';
// Create table if it doesn't exist
if ($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name) {
self::create_email_logs_table();
}
// Get error message if failed
$error_message = '';
if (!$sent) {
global $phpmailer;
if (isset($phpmailer) && is_object($phpmailer) && !empty($phpmailer->ErrorInfo)) {
$error_message = $phpmailer->ErrorInfo;
}
}
// Insert log entry
$wpdb->insert(
$table_name,
array(
'to_email' => $to,
'subject' => $subject,
'message' => $message,
'status' => $sent ? 'sent' : 'failed',
'email_type' => $email_type,
'error_message' => $error_message,
'sent_at' => current_time('mysql')
),
array('%s', '%s', '%s', '%s', '%s', '%s', '%s')
);
return $sent;
}
/**
* Configure SMTP settings for PHPMailer
*/
public static function configure_smtp($phpmailer) {
$phpmailer->isSMTP();
$phpmailer->Host = get_option('wpdd_smtp_host');
$phpmailer->Port = get_option('wpdd_smtp_port', 587);
$phpmailer->SMTPAuth = true;
$phpmailer->Username = get_option('wpdd_smtp_username');
$phpmailer->Password = get_option('wpdd_smtp_password');
$phpmailer->SMTPSecure = get_option('wpdd_smtp_encryption', 'tls');
$phpmailer->From = get_option('wpdd_from_email', get_option('admin_email'));
$phpmailer->FromName = get_option('wpdd_from_name', get_bloginfo('name'));
// Enable debugging for failed sends
if (defined('WP_DEBUG') && WP_DEBUG) {
$phpmailer->SMTPDebug = 2;
$phpmailer->Debugoutput = 'error_log';
}
}
/**
* Create email logs table if it doesn't exist
*/
private static function create_email_logs_table() {
global $wpdb;
$table_name = $wpdb->prefix . 'wpdd_email_logs';
$charset_collate = $wpdb->get_charset_collate();
$sql = "CREATE TABLE IF NOT EXISTS $table_name (
id bigint(20) NOT NULL AUTO_INCREMENT,
to_email varchar(100) NOT NULL,
subject varchar(255) NOT NULL,
message longtext NOT NULL,
status varchar(20) NOT NULL DEFAULT 'sent',
email_type varchar(50) DEFAULT 'general',
error_message text DEFAULT NULL,
sent_at datetime DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
KEY to_email (to_email),
KEY status (status),
KEY email_type (email_type),
KEY sent_at (sent_at)
) $charset_collate;";
require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
dbDelta($sql);
}
/**
* Send order confirmation email
*/
public static function send_order_confirmation($order_id) {
global $wpdb;
$order = $wpdb->get_row($wpdb->prepare(
"SELECT * FROM {$wpdb->prefix}wpdd_orders WHERE id = %d",
$order_id
));
if (!$order) {
return false;
}
$product = get_post($order->product_id);
if (!$product) {
return false;
}
$subject = sprintf(__('Order Confirmation - %s', 'wp-digital-download'), $product->post_title);
$message = sprintf(
__('<h2>Thank you for your purchase!</h2>
<p>Your order has been confirmed.</p>
<h3>Order Details:</h3>
<ul>
<li><strong>Order ID:</strong> #%d</li>
<li><strong>Product:</strong> %s</li>
<li><strong>Amount:</strong> %s</li>
<li><strong>Date:</strong> %s</li>
</ul>
<p>You can download your purchase from your account page.</p>
<p>Thank you for your business!</p>', 'wp-digital-download'),
$order->id,
esc_html($product->post_title),
wpdd_format_price($order->amount, $order->currency),
$order->purchase_date
);
return self::send($order->customer_email, $subject, $message, 'order_confirmation');
}
/**
* Send download link email
*/
public static function send_download_link($order_id, $download_link) {
global $wpdb;
$order = $wpdb->get_row($wpdb->prepare(
"SELECT * FROM {$wpdb->prefix}wpdd_orders WHERE id = %d",
$order_id
));
if (!$order) {
return false;
}
$product = get_post($order->product_id);
if (!$product) {
return false;
}
$subject = sprintf(__('Your Download Link - %s', 'wp-digital-download'), $product->post_title);
$message = sprintf(
__('<h2>Your Download is Ready!</h2>
<p>Click the link below to download your purchase:</p>
<p><a href="%s" style="display: inline-block; padding: 10px 20px; background: #0073aa; color: white; text-decoration: none; border-radius: 3px;">Download Now</a></p>
<h3>Product:</h3>
<p>%s</p>
<p><em>Note: This download link will expire. Please download your file as soon as possible.</em></p>
<p>Thank you!</p>', 'wp-digital-download'),
esc_url($download_link),
esc_html($product->post_title)
);
return self::send($order->customer_email, $subject, $message, 'download_link');
}
}

24
includes/class-wpdd-install.php
View File

@@ -104,11 +104,17 @@ class WPDD_Install {
sale_amount decimal(10,2) NOT NULL,
commission_rate decimal(5,2) NOT NULL,
creator_earning decimal(10,2) NOT NULL,
payout_id bigint(20) DEFAULT NULL,
payout_status varchar(20) DEFAULT 'pending',
available_at datetime DEFAULT NULL,
created_at datetime DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
KEY creator_id (creator_id),
KEY order_id (order_id),
KEY product_id (product_id)
KEY product_id (product_id),
KEY payout_id (payout_id),
KEY payout_status (payout_status),
KEY available_at (available_at)
) $charset_collate;";
$sql[] = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpdd_payouts (
@@ -146,6 +152,22 @@ class WPDD_Install {
) $charset_collate;";
// Software Licensing Tables
$sql[] = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpdd_email_logs (
id bigint(20) NOT NULL AUTO_INCREMENT,
to_email varchar(100) NOT NULL,
subject varchar(255) NOT NULL,
message longtext NOT NULL,
status varchar(20) NOT NULL DEFAULT 'sent',
email_type varchar(50) DEFAULT 'general',
error_message text DEFAULT NULL,
sent_at datetime DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
KEY to_email (to_email),
KEY status (status),
KEY email_type (email_type),
KEY sent_at (sent_at)
) $charset_collate;";
$sql[] = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpdd_licenses (
id bigint(20) NOT NULL AUTO_INCREMENT,
license_key varchar(64) NOT NULL,

29
includes/class-wpdd-license-manager.php
View File

@@ -10,7 +10,7 @@ class WPDD_License_Manager {
* Initialize the license manager
*/
public static function init() {
add_action('wpdd_order_completed', array(__CLASS__, 'generate_license_for_order'), 10, 2);
add_action('wpdd_order_completed', array(__CLASS__, 'generate_license_for_order'), 10, 1);
}
/**
@@ -28,12 +28,28 @@ class WPDD_License_Manager {
/**
* Generate license for completed order
*/
public static function generate_license_for_order($order_id, $order) {
public static function generate_license_for_order($order_id) {
global $wpdb;
error_log('WPDD License Debug: generate_license_for_order called for order ID: ' . $order_id);
// Get the order details
$order = $wpdb->get_row($wpdb->prepare(
"SELECT * FROM {$wpdb->prefix}wpdd_orders WHERE id = %d",
$order_id
));
if (!$order) {
error_log('WPDD License Debug: Order not found for ID: ' . $order_id);
return;
}
// Check if product is software license type
$product_type = get_post_meta($order->product_id, '_wpdd_product_type', true);
error_log('WPDD License Debug: Product type for product ' . $order->product_id . ': ' . $product_type);
if ($product_type !== 'software_license') {
error_log('WPDD License Debug: Product type is not software_license, skipping license generation');
return;
}
@@ -44,9 +60,12 @@ class WPDD_License_Manager {
));
if ($existing) {
error_log('WPDD License Debug: License already exists for order ' . $order_id . ', license ID: ' . $existing);
return;
}
error_log('WPDD License Debug: Generating new license for order ' . $order_id);
// Generate unique license key
$license_key = self::generate_license_key();
@@ -81,6 +100,12 @@ class WPDD_License_Manager {
array('%s', '%d', '%d', '%d', '%s', '%s', '%d', '%s', '%s')
);
if ($wpdb->insert_id) {
error_log('WPDD License Debug: License created successfully with ID: ' . $wpdb->insert_id . ', license key: ' . $license_key);
} else {
error_log('WPDD License Debug: Failed to create license. Last error: ' . $wpdb->last_error);
}
// Send license key to customer
self::send_license_email($order, $license_key);

2
includes/class-wpdd-metaboxes.php
View File

@@ -316,7 +316,7 @@ class WPDD_Metaboxes {
<?php _e('Download Limit', 'wp-digital-download'); ?>
</label>
<input type="number" id="wpdd_download_limit" name="wpdd_download_limit"
value="<?php echo esc_attr($download_limit ?: 5); ?>" min="0" />
value="<?php echo esc_attr($download_limit ?: 0); ?>" min="0" />
<span class="description">
<?php _e('Number of times a customer can download after purchase. 0 = unlimited', 'wp-digital-download'); ?>
</span>

22
includes/class-wpdd-orders.php
View File

@@ -180,8 +180,26 @@ class WPDD_Orders {
private static function generate_download_link($order_id) {
global $wpdb;
// Get the order to find the product
$order = $wpdb->get_row($wpdb->prepare(
"SELECT * FROM {$wpdb->prefix}wpdd_orders WHERE id = %d",
$order_id
));
if (!$order) {
return false;
}
// Get download limit from product settings
$download_limit = get_post_meta($order->product_id, '_wpdd_download_limit', true);
$download_limit = $download_limit ?: 0; // Default to 0 (unlimited) if not set
// Get download expiry from product settings
$download_expiry = get_post_meta($order->product_id, '_wpdd_download_expiry', true);
$download_expiry = $download_expiry ?: 30; // Default to 30 days if not set
$token = wp_hash(uniqid() . $order_id . time());
$expires_at = date('Y-m-d H:i:s', strtotime('+7 days'));
$expires_at = date('Y-m-d H:i:s', strtotime('+' . $download_expiry . ' days'));
$wpdb->insert(
$wpdb->prefix . 'wpdd_download_links',
@@ -189,7 +207,7 @@ class WPDD_Orders {
'order_id' => $order_id,
'token' => $token,
'expires_at' => $expires_at,
'max_downloads' => 5,
'max_downloads' => $download_limit,
'created_at' => current_time('mysql')
),
array('%d', '%s', '%s', '%d', '%s')

8
includes/class-wpdd-paypal-payouts.php
View File

@@ -116,6 +116,9 @@ class WPDD_PayPal_Payouts {
$batch_id = 'WPDD_' . $payout->id . '_' . time();
// Ensure currency is set, fallback to USD if empty
$currency = !empty($payout->currency) ? $payout->currency : 'USD';
$payout_data = array(
'sender_batch_header' => array(
'sender_batch_id' => $batch_id,
@@ -127,7 +130,7 @@ class WPDD_PayPal_Payouts {
'recipient_type' => 'EMAIL',
'amount' => array(
'value' => number_format($payout->amount, 2, '.', ''),
'currency' => $payout->currency
'currency' => $currency
),
'receiver' => $payout->paypal_email,
'note' => 'Payout for your sales on ' . get_bloginfo('name'),
@@ -136,6 +139,9 @@ class WPDD_PayPal_Payouts {
)
);
// Log the payout data for debugging
error_log('WPDD PayPal Payout Data: ' . json_encode($payout_data));
$response = wp_remote_post(
$base_url . '/v1/payments/payouts',
array(

63
includes/class-wpdd-paypal.php
View File

@@ -109,12 +109,23 @@ class WPDD_PayPal {
$paypal_order = self::api_request('/v2/checkout/orders', $order_data, 'POST');
if (isset($paypal_order['id'])) {
$_SESSION['wpdd_paypal_order_' . $paypal_order['id']] = array(
'product_id' => $product_id,
'amount' => $final_price,
'customer_email' => sanitize_email($_POST['customer_email'] ?? ''),
'customer_name' => sanitize_text_field($_POST['customer_name'] ?? '')
);
// Ensure session is available before storing data
if (WP_Digital_Download::ensure_session()) {
$_SESSION['wpdd_paypal_order_' . $paypal_order['id']] = array(
'product_id' => $product_id,
'amount' => $final_price,
'customer_email' => sanitize_email($_POST['customer_email'] ?? ''),
'customer_name' => sanitize_text_field($_POST['customer_name'] ?? '')
);
} else {
// Fallback: use WordPress options table with short expiry
set_transient('wpdd_paypal_order_' . $paypal_order['id'], array(
'product_id' => $product_id,
'amount' => $final_price,
'customer_email' => sanitize_email($_POST['customer_email'] ?? ''),
'customer_name' => sanitize_text_field($_POST['customer_name'] ?? '')
), 600); // 10 minutes
}
wp_send_json_success(array('orderID' => $paypal_order['id']));
} else {
@@ -134,7 +145,17 @@ class WPDD_PayPal {
$capture_response = self::api_request('/v2/checkout/orders/' . $paypal_order_id . '/capture', array(), 'POST');
if (isset($capture_response['status']) && $capture_response['status'] === 'COMPLETED') {
$session_data = $_SESSION['wpdd_paypal_order_' . $paypal_order_id] ?? array();
// Try to get data from session first, then fallback to transient
$session_data = array();
if (WP_Digital_Download::ensure_session() && isset($_SESSION['wpdd_paypal_order_' . $paypal_order_id])) {
$session_data = $_SESSION['wpdd_paypal_order_' . $paypal_order_id];
} else {
// Try transient fallback
$session_data = get_transient('wpdd_paypal_order_' . $paypal_order_id);
if ($session_data === false) {
$session_data = array();
}
}
// Add error logging for debugging session issues
if (empty($session_data)) {
@@ -212,7 +233,11 @@ class WPDD_PayPal {
update_post_meta($session_data['product_id'], '_wpdd_sales_count',
intval(get_post_meta($session_data['product_id'], '_wpdd_sales_count', true)) + 1);
unset($_SESSION['wpdd_paypal_order_' . $paypal_order_id]);
// Clean up stored data (both session and transient)
if (WP_Digital_Download::ensure_session() && isset($_SESSION['wpdd_paypal_order_' . $paypal_order_id])) {
unset($_SESSION['wpdd_paypal_order_' . $paypal_order_id]);
}
delete_transient('wpdd_paypal_order_' . $paypal_order_id);
wp_send_json_success(array(
'redirect_url' => add_query_arg(
@@ -267,8 +292,26 @@ class WPDD_PayPal {
private static function generate_download_link($order_id) {
global $wpdb;
// Get the order to find the product
$order = $wpdb->get_row($wpdb->prepare(
"SELECT * FROM {$wpdb->prefix}wpdd_orders WHERE id = %d",
$order_id
));
if (!$order) {
return false;
}
// Get download limit from product settings
$download_limit = get_post_meta($order->product_id, '_wpdd_download_limit', true);
$download_limit = $download_limit ?: 0; // Default to 0 (unlimited) if not set
// Get download expiry from product settings
$download_expiry = get_post_meta($order->product_id, '_wpdd_download_expiry', true);
$download_expiry = $download_expiry ?: 30; // Default to 30 days if not set
$token = wp_hash(uniqid() . $order_id . time());
$expires_at = date('Y-m-d H:i:s', strtotime('+7 days'));
$expires_at = date('Y-m-d H:i:s', strtotime('+' . $download_expiry . ' days'));
$wpdb->insert(
$wpdb->prefix . 'wpdd_download_links',
@@ -276,7 +319,7 @@ class WPDD_PayPal {
'order_id' => $order_id,
'token' => $token,
'expires_at' => $expires_at,
'max_downloads' => 5,
'max_downloads' => $download_limit,
'created_at' => current_time('mysql')
),
array('%d', '%s', '%s', '%d', '%s')

30
includes/class-wpdd-shortcodes.php
View File

@@ -356,9 +356,11 @@ class WPDD_Shortcodes {
}
$orders = $wpdb->get_results($wpdb->prepare(
"SELECT o.*, p.post_title as product_name
"SELECT o.*, p.post_title as product_name, l.license_key,
(SELECT COUNT(*) FROM {$wpdb->prefix}wpdd_downloads d WHERE d.order_id = o.id) as download_count
FROM {$wpdb->prefix}wpdd_orders o
LEFT JOIN {$wpdb->posts} p ON o.product_id = p.ID
LEFT JOIN {$wpdb->prefix}wpdd_licenses l ON o.id = l.order_id
WHERE o.customer_email = %s
AND o.status = 'completed'
ORDER BY o.purchase_date DESC",
@@ -370,9 +372,11 @@ class WPDD_Shortcodes {
// Get orders by user ID or email (to include guest purchases before account creation)
$orders = $wpdb->get_results($wpdb->prepare(
"SELECT o.*, p.post_title as product_name
"SELECT o.*, p.post_title as product_name, l.license_key,
(SELECT COUNT(*) FROM {$wpdb->prefix}wpdd_downloads d WHERE d.order_id = o.id) as download_count
FROM {$wpdb->prefix}wpdd_orders o
LEFT JOIN {$wpdb->posts} p ON o.product_id = p.ID
LEFT JOIN {$wpdb->prefix}wpdd_licenses l ON o.id = l.order_id
WHERE (o.customer_id = %d OR o.customer_email = %s)
AND o.status = 'completed'
ORDER BY o.purchase_date DESC",
@@ -409,6 +413,7 @@ class WPDD_Shortcodes {
<?php foreach ($orders as $order) : ?>
<?php
$download_limit = get_post_meta($order->product_id, '_wpdd_download_limit', true);
$download_limit = $download_limit ?: 0; // Convert empty string to 0 (unlimited)
$download_expiry = get_post_meta($order->product_id, '_wpdd_download_expiry', true);
$is_expired = false;
@@ -417,7 +422,9 @@ class WPDD_Shortcodes {
$is_expired = current_time('mysql') > $expiry_date;
}
$can_download = !$is_expired && ($download_limit == 0 || $order->download_count < $download_limit);
// Ensure download_count is a number
$current_downloads = (int) $order->download_count;
$can_download = !$is_expired && ($download_limit == 0 || $current_downloads < $download_limit);
?>
<tr>
<td><?php echo esc_html($order->order_number); ?></td>
@@ -431,9 +438,9 @@ class WPDD_Shortcodes {
<td>
<?php
if ($download_limit > 0) {
echo sprintf('%d / %d', $order->download_count, $download_limit);
echo sprintf('%d / %d', $current_downloads, $download_limit);
} else {
echo $order->download_count;
echo sprintf('%d / %s', $current_downloads, __('unlimited', 'wp-digital-download'));
}
?>
</td>
@@ -470,6 +477,19 @@ class WPDD_Shortcodes {
<?php endif; ?>
</td>
</tr>
<?php if (!empty($order->license_key)) : ?>
<tr class="wpdd-license-row">
<td colspan="6" class="wpdd-license-cell">
<div class="wpdd-license-info">
<small><?php _e('License Key:', 'wp-digital-download'); ?></small>
<code class="wpdd-license-key"><?php echo esc_html($order->license_key); ?></code>
<button type="button" class="wpdd-copy-license" data-license="<?php echo esc_attr($order->license_key); ?>" title="<?php _e('Copy to clipboard', 'wp-digital-download'); ?>">
<i class="fas fa-copy"></i>
</button>
</div>
</td>
</tr>
<?php endif; ?>
<?php endforeach; ?>
</tbody>
</table>