v1.2.0
This commit is contained in:
parent
e80820f416
commit
0e617fa428
12 changed files with 286 additions and 259 deletions
|
|
@ -64,13 +64,78 @@ class Robotstxt_Manager_Admin {
|
|||
wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'robotstxt-manager' ) );
|
||||
}
|
||||
|
||||
$client = Robotstxt_Manager_Core_Client::from_options();
|
||||
$catalog = $client->get_catalog();
|
||||
$local = $this->resolve_local_state( $catalog );
|
||||
$client = Robotstxt_Manager_Core_Client::from_options();
|
||||
$catalog = $client->get_catalog();
|
||||
$local = $this->resolve_local_state( $catalog );
|
||||
$subscriptions = $client->get_subscriptions();
|
||||
|
||||
// Admin notices for subscriptions needing attention.
|
||||
$manager_notices = $this->build_subscription_notices( $catalog, $subscriptions );
|
||||
$manager_subscriptions = $subscriptions;
|
||||
|
||||
require ROBOTSTXT_MANAGER_DIR . 'admin/views/page-catalog.php';
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Builds admin notices for subscriptions that need attention.
|
||||
*
|
||||
* - payment_failed: persistent warning per plugin.
|
||||
* - expiring within 14 days: per-plugin warning.
|
||||
* - expired while the plugin is still installed+active: per-plugin warning.
|
||||
*
|
||||
* @param list<array<string, mixed>> $catalog Catalog entries.
|
||||
* @param array<string, array<string, mixed>> $subscriptions Rows keyed by slug.
|
||||
*
|
||||
* @return list<array{type:string, message:string}>
|
||||
*/
|
||||
private function build_subscription_notices( array $catalog, array $subscriptions ): array {
|
||||
$notices = array();
|
||||
$local = $this->resolve_local_state( $catalog );
|
||||
|
||||
foreach ( $subscriptions as $slug => $sub ) {
|
||||
$raw_status = $sub['status'] ?? '';
|
||||
$raw_expires_at = $sub['expires_at'] ?? '';
|
||||
$status = is_string( $raw_status ) ? $raw_status : '';
|
||||
$expires_at = is_string( $raw_expires_at ) ? $raw_expires_at : '';
|
||||
|
||||
if ( 'payment_failed' === $status ) {
|
||||
$notices[] = array(
|
||||
'type' => 'warning',
|
||||
/* translators: %s: plugin slug. */
|
||||
'message' => sprintf( __( 'The payment for %s failed. Update your payment method from your ROBOTSTXT account page to keep access.', 'robotstxt-manager' ), $slug ),
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( 'expired' === $status ) {
|
||||
$state = $local[ $slug ] ?? array();
|
||||
if ( ! empty( $state['active'] ) ) {
|
||||
$notices[] = array(
|
||||
'type' => 'warning',
|
||||
/* translators: %s: plugin slug. */
|
||||
'message' => sprintf( __( 'The subscription for %s has expired, but the plugin is still active on this site. Renew from your ROBOTSTXT account page to keep receiving updates.', 'robotstxt-manager' ), $slug ),
|
||||
);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( 'active' === $status && '' !== $expires_at ) {
|
||||
$days = (int) floor( ( (int) strtotime( $expires_at ) - time() ) / DAY_IN_SECONDS );
|
||||
|
||||
if ( $days >= 0 && $days <= 14 ) {
|
||||
$notices[] = array(
|
||||
'type' => 'warning',
|
||||
/* translators: 1: plugin slug, 2: days remaining. */
|
||||
'message' => sprintf( _n( 'The subscription for %1$s expires in %2$d day.', 'The subscription for %1$s expires in %2$d days.', $days, 'robotstxt-manager' ), $slug, $days ),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $notices;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles the "Refresh catalog" admin-post action.
|
||||
*
|
||||
|
|
@ -100,6 +165,7 @@ class Robotstxt_Manager_Admin {
|
|||
|
||||
$client = Robotstxt_Manager_Core_Client::from_options();
|
||||
$client->clear_catalog_cache();
|
||||
$client->clear_subscriptions_cache();
|
||||
delete_site_transient( 'update_plugins' );
|
||||
|
||||
$redirect = add_query_arg(
|
||||
|
|
|
|||
Loading…
Reference in a new issue