Merge branch 'v2.8'

Author: jakubboucek

src/Access.php

@@ -76,15 +76,6 @@ public function check_access() {
 			return;
 		}
 
-		$post_groups = $this->get_post_groups();
-
-		// If the post is protected and user is not logged in, redirect him to login
-		if ( $post_groups && ! is_user_logged_in() ) {
-			nocache_headers();
-			wp_safe_redirect( wp_login_url( site_url( $_SERVER['REQUEST_URI'] ) ) );
-			exit();
-		}
-
 		// Check if current user has access to the post, if not, redirect him to defined URL or home if the URL is not set
 		if ( ! $this->user_can_view_post() && ! is_home() && ! is_front_page() ) {
 			$no_access_url = remove_query_arg( [ 'redirect_to' ], $this->get_no_access_redirect_url() );
@@ -174,16 +165,23 @@ public function user_can_view_post( $post_id = '', $user_id = '' ) {
 						continue;
 					}
 				}
+				$subscription_date = $membership->groups[ $post_group ]['subscription_date'];
 
 				if ( $days_to_access = $this->get_post_days_to_access() ) {
-					$subscription_date = $membership->groups[ $post_group ]['subscription_date'];
 					// Get the date of subscription to the group
 					if ( $subscription_date > date( 'Y-m-d', strtotime( "now -$days_to_access days" ) ) ) {
 						// if the user does not have access YET, just break the loop here, as the user might have multiple subscriptions
 						continue;
 					}
 				}
 
+				if ( $expire_days_after_registration = $this->get_expire_days_after_registration() ) {
+					if ( $subscription_date < date( 'Y-m-d', strtotime( "now - $expire_days_after_registration" ) ) ) {
+						// if the access already expired, just break the loop here, as the user might have multiple subscriptions
+						continue;
+					}
+				}
+
 				// Check if the user has a valid membership.
 				if ( ! $membership->is_valid_for_group( $post_group ) ) {
 					continue;
@@ -261,6 +259,24 @@ public function get_post_days_to_access( $post_id = '' ) {
 		return get_post_meta( $post_id, SIMPLESHOP_PREFIX . 'days_to_access', true );
 	}
 
+	/**
+	 * Get the number of days the user has to be subscribed to have access to the post
+	 *
+	 * @param  string  $post_id
+	 *
+	 * @return mixed
+	 */
+	public function get_expire_days_after_registration( $post_id = '' ) {
+		global $post;
+
+		if ( ! $post_id ) {
+			$post_id = $post->ID;
+		}
+
+		return get_post_meta( $post_id, SIMPLESHOP_PREFIX . 'expire_days_after_registration', true );
+	}
+
+
 	/**
 	 * Get the URL to redirect the user if he has no access
 	 *

src/Metaboxes.php

@@ -118,6 +118,18 @@ public function page_metaboxes() {
 				]
 			);
 
+			$cmb->add_field(
+				[
+					'name' => __( 'Allow access only for specific number of days (days after registration to the member section)', 'simpleshop-cz' ),
+					'desc' => __(
+						'Allow access only for specific number of days after registration. For example: If the registration to the member section is on January 1st and you set 14 days, the user will be able to access the page until January 14th included.',
+						'simpleshop-cz'
+					),
+					'id'   => $this->prefix . 'expire_days_after_registration',
+					'type' => 'text',
+				]
+			);
+
 			$cmb->add_field(
 				[
 					'name'        => __( 'Allow access from this date', 'simpleshop-cz' ),

src/Settings.php

@@ -73,6 +73,7 @@ public function register_hooks() {
 		add_action( 'cmb2_admin_init', [ $this, 'add_options_page_metabox' ] );
 		add_filter( 'cmb2_render_disconnect_button', [ $this, 'field_type_disconnect_button' ], 10, 5 );
 		add_action( 'admin_init', [ $this, 'maybe_disconnect_simpleshop' ] );
+		add_action( 'admin_print_styles', [ $this, 'maybe_display_messages' ] );
 	}
 
 	public function field_type_disconnect_button(
@@ -131,10 +132,10 @@ public function add_options_page() {
 	 */
 	public function admin_page_display() {
 		?>
-        <div class="wrap cmb2-options-page <?php echo $this->key; ?>">
-            <h2><?php echo esc_html( get_admin_page_title() ); ?></h2>
+		<div class="wrap cmb2-options-page <?php echo $this->key; ?>">
+			<h2><?php echo esc_html( get_admin_page_title() ); ?></h2>
 			<?php cmb2_metabox_form( $this->metabox_id, $this->key ); ?>
-        </div>
+		</div>
 		<?php
 	}
 
@@ -372,7 +373,7 @@ public function settings_notices( $object_id, $updated ) {
 
 		$vyfakturuj_api = $this->loader->get_api_client( $api_email, $api_key );
 		try {
-			$result = $this->loader->init_plugin_activation($vyfakturuj_api);
+			$result = $this->loader->init_plugin_activation( $vyfakturuj_api );
 			if ( isset( $result['status'] ) && $result['status'] === 'success' ) {
 				update_option( 'ssc_valid_api_keys', 1 );
 			} else {
@@ -471,4 +472,26 @@ public function ssc_get_option( $key = '', $default = null ) {
 	public function is_settings_page() {
 		return is_admin() && ! empty( $_GET['page'] ) && 'ssc_options' === $_GET['page'];
 	}
+
+	public function maybe_display_messages() {
+		if ( ! empty( $_POST['object_id'] ) ) {
+			if ( ! empty( $_POST['ssc_api_endpoint_url'] ) ) {
+				add_action( 'admin_notices', [ $this, 'custom_api_endpoint_notice' ] );
+			}
+		} else {
+			if ( $this->ssc_get_option( 'ssc_api_endpoint_url' ) ) {
+				add_action( 'admin_notices', [ $this, 'custom_api_endpoint_notice' ] );
+			}
+		}
+
+	}
+
+	public function custom_api_endpoint_notice() {
+		$url = empty( $_POST['ssc_api_endpoint_url'] ) ? $this->ssc_get_option( 'ssc_api_endpoint_url' ) : esc_attr( $_POST['ssc_api_endpoint_url'] );
+		?>
+		<div class="notice notice-warning">
+			<p><?php printf( __( "Warning: You have set custom SimpleShop API Endpoint URL: '%s'", 'simpleshop-cz' ), $url ); ?></p>
+		</div>
+		<?php
+	}
 }