version 2.0.6 released

Author: manchumahara

README.txt

@@ -3,8 +3,8 @@ Contributors: codeboxr, manchumahara
 Tags: wordpress smtp,wordpress email log,smtp
 Requires at least: 5.3
 Requires PHP: 8.2
-Tested up to: 6.7.1
-Stable tag: 2.0.5
+Tested up to: 6.7.2
+Stable tag: 2.0.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -117,6 +117,12 @@ e.g.
 
 
 == Changelog ==
+= 2.0.6 =
+* [updated] Miscellaneous changes and improvement(+ Some methods moved to helper class)
+* [new] Pro addon V1.0.4 released
+* [updated] WordPress Core V6.7.2 compatible
+* [updated] Language file is now loaded using 'init'  hook
+
 = 2.0.5 =
 * [updated] Miscellaneous changes and improvement
 * [new] Pro addon V1.0.3 released (Mail api support added)

assets/css/comfortsmtp-admin.css

@@ -16,7 +16,7 @@
  * Plugin Name:       Comfort Email SMTP, Logger & Email Api
  * Plugin URI:        https://codeboxr.com/product/cbx-email-logger-for-wordpress/
  * Description:       Various SMTP protocol, Logs email, tracks sent or failed status and more.
- * Version:           2.0.5
+ * Version:           2.0.6
  * Requires at least: 5.3
  * Requires PHP:      8.2
  * Author:            Codeboxr
@@ -35,7 +35,7 @@
 }
 
 defined( 'COMFORTSMTP_PLUGIN_NAME' ) or define( 'COMFORTSMTP_PLUGIN_NAME', 'cbxwpemaillogger' );
-defined( 'COMFORTSMTP_PLUGIN_VERSION' ) or define( 'COMFORTSMTP_PLUGIN_VERSION', '2.0.5' );
+defined( 'COMFORTSMTP_PLUGIN_VERSION' ) or define( 'COMFORTSMTP_PLUGIN_VERSION', '2.0.6' );
 defined( 'COMFORTSMTP_BASE_NAME' ) or define( 'COMFORTSMTP_BASE_NAME', plugin_basename( __FILE__ ) );
 defined( 'COMFORTSMTP_ROOT_PATH' ) or define( 'COMFORTSMTP_ROOT_PATH', plugin_dir_path( __FILE__ ) );
 defined( 'COMFORTSMTP_ROOT_URL' ) or define( 'COMFORTSMTP_ROOT_URL', plugin_dir_url( __FILE__ ) );
@@ -99,7 +99,7 @@ function activate_comfortsmtp() {
 
 	ComfortSmtpHelpers::load_orm();
 
-	ComfortSmtp::activate();
+	ComfortSmtpHelpers::activate();
 }//end function activate_comfortsmtp
 
 register_activation_hook( __FILE__, 'activate_comfortsmtp' );
@@ -109,7 +109,7 @@ function activate_comfortsmtp() {
  * The code that runs during plugin deactivation.
  */
 function deactivate_comfortsmtp() {
-	ComfortSmtp::deactivate();
+	ComfortSmtpHelpers::deactivate();
 }//end function deactivate_comfortsmtp
 
 register_deactivation_hook( __FILE__, 'deactivate_comfortsmtp' );
@@ -120,14 +120,14 @@ function deactivate_comfortsmtp() {
  *
  * @since  1.0
  */
-function comfortsmtp() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+function comfortsmtp_core() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
 	global $comfortsmtp_core;
 	if ( ! isset( $comfortsmtp_core ) ) {
 		$comfortsmtp_core = run_comfortsmtp_core();
 	}
 
 	return $comfortsmtp_core;
-}//end method comfortsmtp
+}//end method comfortsmtp_core
 
 /**
  * Begins execution of the plugin.

assets/css/comfortsmtp-builder.css

@@ -80,145 +80,40 @@ public function __set( string $key, $value ) {
 	}//end magic mathod set
 
 	/**
-	 * Include necessary files
+	 * Cloning is forbidden.
 	 *
-	 * @return void
-	 */
-	private function include_files() {
-		require_once __DIR__ . '/../lib/autoload.php';
-		// include_once __DIR__ . '/ComfortSmtpEmails.php';
-	}//end method include_files
-
-	/**
-	 * On plugin activate
+	 * @since 2.0.5
 	 */
-	public static function activate() {
-		//set the current version
-		update_option('comfortsmtp_version', COMFORTSMTP_PLUGIN_VERSION);
-
-
-		( new self() )->migration_and_defaults();
-
-		( new self() )->create_cron_job();
-		//clear old plugin's event hook
-		//wp_clear_scheduled_hook( 'cbxwpemaillogger_daily_event' );
-		set_transient('comfortsmtp_upgraded_notice', 1);
-	}//end method activate
+	public function __clone() {
+		cbxmcratingreview_doing_it_wrong( __FUNCTION__, esc_html__( 'Cloning is forbidden.', 'cbxwpemaillogger' ), '2.0.5' );
+	}//end method clone
 
 	/**
-	 * On plugin deactivate
-	 */
-	public static function deactivate() {
-		wp_clear_scheduled_hook( 'cbxwpemaillogger_daily_event' );
-	}//end method activate
-
-	/**
-	 * On plugin active or reset data set default data for this plugin
+	 * Unserializing instances of this class is forbidden.
 	 *
-	 * @since 1.0.0
+	 * @since 2.0.5
 	 */
-	public function default_data_set() {
-		// create base/main upload directories
-		$this->create_base_upload_directories();
-
-		// add role and custom capability
-		$this->defaultRoleCapability();
-	}//end method default_data_set
+	public function __wakeup() {
+		cbxmcratingreview_doing_it_wrong( __FUNCTION__, esc_html__( 'Unserializing instances of this class is forbidden.', 'cbxwpemaillogger' ), '2.0.5' );
+	}//end method wakeup
 
 	/**
-	 * create base/main upload directories
-	 */
-	public function create_base_upload_directories() {
-		ComfortSmtpHelpers::checkUploadDir();
-	}//end method create_base_upload_directories
-
-	/**
-	 * create cron job
-	 */
-	public function create_cron_job() {
-		$settings = new ComfortSmtpSettings();
-
-		$delete_old_log = $settings->get_option( 'delete_old_log', 'comfortsmtp_log', 'no' );
-
-		if ( $delete_old_log == 'yes' ) {
-			if ( ! wp_next_scheduled( 'cbxwpemaillogger_daily_event' ) ) {
-				wp_schedule_event( time(), 'daily', 'cbxwpemaillogger_daily_event' );
-			}
-		}
-	}//end method create_cron_job
-
-	/**
-	 * On plugin activate
+	 * Include necessary files
+	 *
+	 * @return void
 	 */
-	public static function migration_and_defaults() {
+	private function include_files() {
+		require_once __DIR__ . '/../lib/autoload.php';
+		// include_once __DIR__ . '/ComfortSmtpEmails.php';
+	}//end method include_files
 
-		MigrationManage::run();
 
-		//set default data
-		( new self() )->default_data_set();
 
-		//ComfortSmtpHelpers::upload_folder();
 
-		MigrationManage::migrate_old_options();
-	}//end method activate
 
-	/**
-	 * Create default role and capability on plugin activation and rest
-	 *
-	 * @since 1.0.0
-	 */
-	private function defaultRoleCapability() {
-		//smtp capabilities list
-		$caps = comfortsmtp_all_caps();
 
-		//add the caps to the administrator role
-		$role = get_role( 'administrator' );
 
-		foreach ( $caps as $cap ) {
-			//add cap to the role
-			if ( ! $role->has_cap( $cap ) ) {
-				// add a custom capability
-				$role->add_cap( $cap, true );
 
-			}
 
-			//update the same cap for the current user who is installing or updating if logged in
-			$this->update_user_capability($cap);
-		}
-	}//end method defaultRoleCapability
 
-	/**
-	 * Add any capability to the current user
-	 *
-	 * @param $capability_to_add
-	 *
-	 * @return void
-	 */
-	private function update_user_capability( $capability_to_add ) {
-		// Check if a user is logged in.
-		if ( is_user_logged_in() ) {
-			// Get the current user object.
-			$user = wp_get_current_user();
-
-			// Check if the user already has the capability.
-			if ( ! $user->has_cap( $capability_to_add ) ) {
-				// Add the capability.
-				$user->add_cap( $capability_to_add );
-
-				// Optional: Log the capability addition (for debugging or auditing).
-				//error_log( 'Added capability "' . $capability_to_add . '" to user: ' . $user->user_login );
-
-				// Optional: Force a refresh of the user's capabilities (sometimes needed).
-				wp_cache_delete( $user->ID, 'users' );
-				wp_cache_delete( 'user_meta', $user->ID );
-
-			} else {
-				// Optional: Log that the user already has the capability.
-				//error_log( 'User: ' . $user->user_login . ' already has capability: ' . $capability_to_add );
-			}
-		} else {
-			// Optional: Handle the case where no user is logged in.
-			//error_log( 'No user is logged in.' );
-		}
-	}//end method update_user_capability
 }//end class ComfortSmtp

assets/css/comfortsmtp-settings.css

@@ -499,6 +499,7 @@ public function insert_log( $atts ) {
 
 		$to = $atts['to'];
 		if ( ! is_array( $to ) ) {
+            if(is_null($to)) $to = '';
 			$to = explode( ',', $to );
 		}
 
@@ -1031,7 +1032,7 @@ public function plugin_upgrader_process_complete() {
 			ComfortSmtpHelpers::load_orm();
 
 			// Run the upgrade routine
-			comfortsmtp()->migration_and_defaults();
+			ComfortSmtpHelpers::migration_and_defaults();
 
 			// Update the saved version
 			update_option( 'comfortsmtp_version', COMFORTSMTP_PLUGIN_VERSION );
@@ -1046,36 +1047,35 @@ public function plugin_upgrader_process_complete() {
 	public function plugin_activate_upgrade_notices() {
 		$activation_notice_shown = false;
 
+
+		$kiss_html_arr = [
+			'strong' => [],
+			'a'      => [
+				'href'  => [],
+				'class' => []
+			]
+		];
+
 		// Check the transient to see if we've just activated the plugin
 		if ( get_transient( 'comfortsmtp_activated_notice' ) ) {
 			echo '<div class="notice notice-success is-dismissible" style="border-color: #6648fe !important;">';
 
+            echo '<p>';
+
 			//phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage
-			echo '<p><img alt="icon" style="float: left; display: inline-block; margin-right: 20px;" src="' . esc_url( plugins_url( 'assets/images/icon_c_48.png',
-					dirname( __FILE__ ) ) ) . '"/>';
-
-			/* translators: 1: plugin version 2. team url  */
-			echo wp_kses( sprintf( __( 'Thanks for installing/deactivating <strong>CBX Email SMTP & Logger</strong> V%1$s - <a href="%2$s" target="_blank">Codeboxr Team</a>',
-				'cbxwpemaillogger' ), esc_attr( COMFORTSMTP_PLUGIN_VERSION ), 'https://codeboxr.com' ), [
-				'strong' => [],
-				'a'      => [
-					'href'  => [],
-					'class' => []
-				]
-			] );
+			echo '<img alt="icon" style="float: left; display: inline-block; margin-right: 20px;" src="' . esc_url( plugins_url( 'assets/images/icon_c_48.png',
+					dirname( __FILE__ ) ) ) . '" />';
+
+			/* translators: 1: plugin version 2. codeboxr website url  */
+            echo sprintf(wp_kses(__( 'Thanks for installing/deactivating <strong>CBX Email SMTP & Logger</strong> V%1$s - <a href="%2$s" target="_blank">Codeboxr Team</a>',
+	            'cbxwpemaillogger' ), $kiss_html_arr), esc_attr( COMFORTSMTP_PLUGIN_VERSION ), 'https://codeboxr.com');
 
 			echo '</p>';
 
 			/* translators: 1: Settings url 2. plugin url  */
-			echo '<p>' . wp_kses( sprintf( __( 'Check Plugin <a href="%1$s">Setting</a> and <a href="%2$s" target="_blank"><span class="dashicons dashicons-external"></span> Documentation</a>',
-					'cbxwpemaillogger' ), esc_attr( admin_url( 'admin.php?page=comfortsmtp_settings' ) ),
-					'https://codeboxr.com/product/cbx-email-logger-for-wordpress/' ), [
-					'strong' => [],
-					'a'      => [
-						'href' => [],
-						'span' => []
-					]
-				] ) . '</p>';
+			echo '<p>' . sprintf( wp_kses(__( 'Check Plugin <a href="%1$s">Setting</a> and <a href="%2$s" target="_blank"><span class="dashicons dashicons-external"></span> Documentation</a>',
+					'cbxwpemaillogger' ), $kiss_html_arr), esc_attr( admin_url( 'admin.php?page=comfortsmtp_settings' ) ),
+					'https://codeboxr.com/product/cbx-email-logger-for-wordpress/' ) . '</p>';
 			echo '</div>';
 
 
@@ -1092,33 +1092,27 @@ public function plugin_activate_upgrade_notices() {
 			if(!$activation_notice_shown){
 				echo '<div class="notice notice-success is-dismissible" style="border-color: #6648fe !important;">';
 
+                echo '<p>';
+
 				//phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage
-				echo '<p><img alt="icon" style="float: left; display: inline-block;  margin-right: 20px;" src="' . esc_url( plugins_url( 'assets/images/icon_c_48.png',
+				echo '<img alt="icon" style="float: left; display: inline-block;  margin-right: 20px;" src="' . esc_url( plugins_url( 'assets/images/icon_c_48.png',
 						dirname( __FILE__ ) ) ) . '"/>';
 
 				/* translators: 1: plugin version 2. team url  */
-				echo wp_kses( sprintf( __( 'Thanks for upgrading <strong>CBX Email SMTP & Logger</strong> V%1$s - <a href="%2$s" target="_blank">Codeboxr Team</a>',
-					'cbxwpemaillogger' ), esc_attr( COMFORTSMTP_PLUGIN_VERSION ), 'https://codeboxr.com' ), [
-					'strong' => [],
-					'a'      => [
-						'href'  => [],
-						'class' => []
-					]
-				] );
+				echo sprintf(wp_kses(__( 'Thanks for upgrading <strong>CBX Email SMTP & Logger</strong> V%1$s - <a href="%2$s" target="_blank">Codeboxr Team</a>',
+					'cbxwpemaillogger' ), $kiss_html_arr), esc_attr( COMFORTSMTP_PLUGIN_VERSION ), 'https://codeboxr.com' ) ;
 
 				echo '</p>';
 
 
+                echo '<p>';
+
 				/* translators: 1: Settings url 2. plugin url  */
-				echo '<p>' . wp_kses( sprintf( __( 'Check Plugin <a href="%1$s">Setting</a> and <a href="%2$s" target="_blank"><span class="dashicons dashicons-external"></span> Documentation</a>',
-						'cbxwpemaillogger' ), esc_attr( admin_url( 'admin.php?page=comfortsmtp_settings' ) ),
-						'https://codeboxr.com/product/cbx-email-logger-for-wordpress/' ), [
-						'strong' => [],
-						'a'      => [
-							'href' => [],
-							'span' => []
-						]
-					] ) . '</p>';
+				echo sprintf(wp_kses( __( 'Check Plugin <a href="%1$s">Setting</a> and <a href="%2$s" target="_blank"><span class="dashicons dashicons-external"></span> Documentation</a>',
+					'cbxwpemaillogger' ), $kiss_html_arr), esc_attr( admin_url( 'admin.php?page=comfortsmtp_settings' ) ),
+						'https://codeboxr.com/product/cbx-email-logger-for-wordpress/' );
+
+				echo '</p>';
 
 				echo '</div>';
 

assets/icons/icon_help.svg

@@ -31,7 +31,8 @@ private function define_common_hooks() {
 		$route = $this->api_routes;
 		$helper = new ComfortSmtpHelpers();
 
-		add_action( 'plugins_loaded', [ $this, 'load_plugin_textdomain' ] );
+		//add_action( 'plugins_loaded', [ $this, 'load_plugin_textdomain' ] );
+		add_action( 'init', [ $this, 'load_plugin_textdomain' ] );
 		add_filter( 'script_loader_tag', [ $this, 'add_module_to_script' ], 10, 3 );
 
 		add_action( 'rest_api_init', [ $route, 'init' ] );