version 1.9.0 released

Author: manchumahara

admin/class-cbxwpbookmark-admin.php

@@ -58,9 +58,9 @@ class CBXWPBookmark_Admin {
 	 *
 	 * @since    1.0.0
 	 * @access   private
-	 * @var      string $settings_api settings api of this plugin.
+	 * @var      string $settings settings api of this plugin.
 	 */
-	private $settings_api;
+	private $settings;
 
 	/**
 	 * The ID of this plugin.
@@ -92,16 +92,16 @@ public function __construct( $plugin_name = '', $version = '' ) {
 
 		$this->plugin_basename = plugin_basename( plugin_dir_path( __DIR__ ) . $this->cbxwpbookmark . '.php' );
 
-		$this->settings_api = new CBXWPBookmark_Settings_API();
+		$this->settings = new CBXWPBookmark_Settings_API();
 	}//end constructor
 
 	public function setting_init() {
 		//set the settings
-		$this->settings_api->set_sections( $this->get_settings_sections() );
-		$this->settings_api->set_fields( $this->get_settings_fields() );
+		$this->settings->set_sections( $this->get_settings_sections() );
+		$this->settings->set_fields( $this->get_settings_fields() );
 
 		//initialize settings
-		$this->settings_api->admin_init();
+		$this->settings->admin_init();
 	}//end setting_init
 
 	/**
@@ -508,7 +508,7 @@ public function cbxwpbookmark_bookmark_list_screen() {
 	 * Admin review listing view
 	 */
 	public function display_admin_bookmark_category_page() {
-		$settings = $this->settings_api;
+		$settings = $this->settings;
 
 		global $wpdb;
 
@@ -575,7 +575,7 @@ public function display_plugin_admin_settings() {
 		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		echo cbxwpbookmark_get_template_html( 'admin/setting_display.php', [
 			'ref'      => $this,
-			'settings' => $this->settings_api
+			'settings' => $this->settings
 		] );
 	}//end display_plugin_admin_settings
 
@@ -747,9 +747,6 @@ public function plugin_upgrader_process_complete() {
 		if ($saved_version === false || version_compare($saved_version , CBXWPBOOKMARK_PLUGIN_VERSION, '<')) {
 			CBXWPBookmarkHelper::create_tables();
 
-			//CBXWPBookmarkHelper::cbxbookmark_create_pages();
-			//CBXWPBookmarkHelper::customizer_default_adjust( true );
-
 			add_action('init', [$this, 'plugin_upgrader_process_complete_partial']);
 
 			set_transient( 'cbxwpbookmark_upgraded_notice', 1 );
@@ -830,16 +827,17 @@ public function custom_message_after_plugin_row_proaddon($plugin_file, $plugin_d
 		if(defined('CBXWPBOOKMARKADDON_PLUGIN_NAME')) return;
 
 		$pro_addon_version = CBXWPBookmarkHelper::get_any_plugin_version('cbxwpbookmarkaddon/cbxwpbookmarkaddon.php');
+		$pro_latest_version  = '1.4.7';
 
-
-		if($pro_addon_version != '' && version_compare( $pro_addon_version, '1.4.5', '<' ) ){
+		if($pro_addon_version != '' && version_compare( $pro_addon_version, $pro_latest_version, '<' ) ){
 			// Custom message to display
 
 			//$plugin_setting_url = admin_url( 'admin.php?page=cbxwpbookmark_settings#cbxwpbookmark_licences' );
 			$plugin_manual_update = 'https://codeboxr.com/manual-update-pro-addon/';
 
+
 			/* translators:translators: %s: plugin setting url for licence */
-			$custom_message     = wp_kses(sprintf( __( '<strong>Note:</strong> CBX Bookmark & Favorite Pro Addon is custom plugin. This plugin can not be auto update from dashboard/plugin manager. For manual update please check <a target="_blank" href="%1$s">documentation</a>. <strong style="color: red;">It seems this plugin\'s current version is older than 1.4.5. To get the latest pro addon features, this plugin needs to upgrade to 1.4.4 or later.</strong>', 'cbxwpbookmark' ), esc_url( $plugin_manual_update ) ), ['strong' => ['style' => []],'a' => ['href' => [], 'target' => []]]);
+			$custom_message     = wp_kses(sprintf( __( '<strong>Note:</strong> CBX Bookmark & Favorite Pro Addon is custom plugin. This plugin can not be auto update from dashboard/plugin manager. For manual update please check <a target="_blank" href="%1$s">documentation</a>. <strong style="color: red;">It seems this plugin\'s current version is older than %2$s . To get the latest pro addon features, this plugin needs to upgrade to %2$s or later.</strong>', 'cbxwpbookmark' ), esc_url( $plugin_manual_update ), $pro_latest_version ), ['strong' => ['style' => []],'a' => ['href' => [], 'target' => []]]);
 
 			// Output a row with custom content
 			echo '<tr class="plugin-update-tr">
@@ -868,7 +866,7 @@ public function custom_message_after_plugin_row_mycredaddon($plugin_file, $plugi
 		if(defined('CBXWPBOOKMARKMYCRED_PLUGIN_NAME')) return;
 
 		$pro_addon_version = CBXWPBookmarkHelper::get_any_plugin_version('cbxwpbookmarkmycred/cbxwpbookmarkmycred.php');
-
+		$pro_latest_version  = '1.0.5';
 
 		if($pro_addon_version != '' && version_compare( $pro_addon_version, '1.0.5', '<' ) ){
 			// Custom message to display
@@ -877,7 +875,7 @@ public function custom_message_after_plugin_row_mycredaddon($plugin_file, $plugi
 			$plugin_manual_update = 'https://codeboxr.com/manual-update-pro-addon/';
 
 			/* translators: %s: register url */
-			$custom_message     = wp_kses(sprintf( __( '<strong>Note:</strong> CBX Bookmark & Favorite myCred Addon is custom plugin. This plugin can not be auto update from dashboard/plugin manager. For manual update please check <a target="_blank" href="%1$s">documentation</a>. <strong style="color: red;">It seems this plugin\'s current version is older than 1.0.5. To get the latest pro addon features, this plugin needs to upgrade to 1.0.5 or later.</strong>', 'cbxwpbookmark' ), esc_url( $plugin_manual_update ) ), ['strong' => ['style' => []],'a' => ['href' => [], 'target' => []]]);
+			$custom_message     = wp_kses(sprintf( __( '<strong>Note:</strong> CBX Bookmark & Favorite myCred Addon is custom plugin. This plugin can not be auto update from dashboard/plugin manager. For manual update please check <a target="_blank" href="%1$s">documentation</a>. <strong style="color: red;">It seems this plugin\'s current version is older than %2$s . To get the latest pro addon features, this plugin needs to upgrade to %2$s or later.</strong>', 'cbxwpbookmark' ), esc_url( $plugin_manual_update ), $pro_latest_version ), ['strong' => ['style' => []],'a' => ['href' => [], 'target' => []]]);
 
 			// Output a row with custom content
 			echo '<tr class="plugin-update-tr">
@@ -939,7 +937,7 @@ public function pro_addon_compatibility_campaign() {
 	 */
 	public function plugin_action_links( $links ) {
 		$action_links = [
-			'settings' => '<a style="color:#005ae0 !important; font-weight: bold;" href="' . admin_url( 'admin.php?page=cbxwpbookmark_settings' ) . '" aria-label="' . esc_attr__( 'View settings', 'cbxwpbookmark' ) . '">' . esc_html__( 'Settings', 'cbxwpbookmark' ) . '</a>',
+			'settings' => '<a style="color:#005ae0 !important; font-weight: bold;" href="' . esc_url(admin_url( 'admin.php?page=cbxwpbookmark_settings' )) . '" aria-label="' . esc_attr__( 'View settings', 'cbxwpbookmark' ) . '">' . esc_html__( 'Settings', 'cbxwpbookmark' ) . '</a>',
 		];
 
 		return array_merge( $action_links, $links );
@@ -1074,7 +1072,7 @@ public function plugin_reset() {
 		//before hook
 		do_action( 'cbxwpbookmark_plugin_reset_before' );
 
-		$plugin_resets = wp_unslash( $_POST );
+		$plugin_resets = isset($_POST)? wp_unslash( $_POST ) : [];
 
 		//delete options
 		do_action( 'cbxwpbookmark_plugin_options_deleted_before' );
@@ -1111,6 +1109,7 @@ public function plugin_reset() {
 			do_action( 'cbxwpbookmark_plugin_tables_deleted_after', $table_names );
 			do_action( 'cbxwpbookmark_plugin_tables_deleted' );
 		}
+		//end delete tables
 
 
 		//after hook

assets/css/cbxwpbookmark-admin.css

@@ -3,11 +3,20 @@
 
     $(document).ready(function () {
         if($('#cbxwpbookmark_logs').length){
-            $('#cbxwpbookmark_logs').find('table').removeClass('wp-list-table widefat fixed striped table-view-list').addClass('table table-bordered table-hover table-striped');
+            $('#cbxwpbookmark_logs').find('table').removeClass('table-view-list').addClass('table table-bordered table-hover table-striped');
+            $('.button.action').addClass('primary');
+
+            $('#screen-meta').addClass('cbx-chota cbxwpbookmark-page-wrapper cbxwpbookmark-petitions-wrapper');
+            $('#screen-options-apply').addClass('primary');
         }
 
         if($('#cbxwpbookmark_cats').length){
-            $('#cbxwpbookmark_cats').find('table').removeClass('wp-list-table widefat fixed striped table-view-list').addClass('table table-bordered table-hover table-striped');
+            //$('#cbxwpbookmark_cats').find('table').removeClass('wp-list-table widefat fixed striped table-view-list').addClass('table table-bordered table-hover table-striped');
+            $('#cbxwpbookmark_cats').find('table').removeClass('table-view-list').addClass('table table-bordered table-hover table-striped');
+            $('.button.action').addClass('primary');
+
+            $('#screen-meta').addClass('cbx-chota cbxwpbookmark-page-wrapper cbxwpbookmark-petitions-wrapper');
+            $('#screen-options-apply').addClass('primary');
         }
     });//end dom ready
 })(jQuery);

assets/css/cbxwpbookmark-manage.css

@@ -15,7 +15,7 @@
  * Plugin Name:       CBX Bookmark & Favorite
  * Plugin URI:        https://codeboxr.com/product/cbx-wordpress-bookmark
  * Description:       List/category based bookmark for WordPress, create your own private or public list of favorite posts, page, custom object
- * Version:           1.8.12
+ * Version:           1.9.0
  * Author:            Codeboxr Team
  * Author URI:        https://codeboxr.com
  * License:           GPL-2.0+
@@ -31,7 +31,7 @@
 
 
 defined( 'CBXWPBOOKMARK_PLUGIN_NAME' ) or define( 'CBXWPBOOKMARK_PLUGIN_NAME', 'cbxwpbookmark' );
-defined( 'CBXWPBOOKMARK_PLUGIN_VERSION' ) or define( 'CBXWPBOOKMARK_PLUGIN_VERSION', '1.8.12' );
+defined( 'CBXWPBOOKMARK_PLUGIN_VERSION' ) or define( 'CBXWPBOOKMARK_PLUGIN_VERSION', '1.9.0' );
 defined( 'CBXWPBOOKMARK_BASE_NAME' ) or define( 'CBXWPBOOKMARK_BASE_NAME', plugin_basename( __FILE__ ) );
 defined( 'CBXWPBOOKMARK_ROOT_PATH' ) or define( 'CBXWPBOOKMARK_ROOT_PATH', plugin_dir_path( __FILE__ ) );
 defined( 'CBXWPBOOKMARK_ROOT_URL' ) or define( 'CBXWPBOOKMARK_ROOT_URL', plugin_dir_url( __FILE__ ) );

assets/css/cbxwpbookmark-public.css

@@ -1,5 +1,48 @@
 <?php
 
+if(!function_exists('cbxwpbookmark_is_rest_api_request')){
+	/**
+	 * Check if doing rest request
+	 *
+	 * @return bool
+	 */
+	function cbxwpbookmark_is_rest_api_request() {
+		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
+			return true;
+		}
+
+		if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+			return false;
+		}
+
+		$rest_prefix = trailingslashit( rest_get_url_prefix() );
+		return ( false !== strpos( wp_unslash($_SERVER['REQUEST_URI']), $rest_prefix ) );//phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+	}//end function cbxwpbookmark_is_rest_api_request
+}
+
+if(!function_exists('cbxwpbookmark_doing_it_wrong')){
+	/**
+	 * Wrapper for _doing_it_wrong().
+	 *
+	 * @since  1.0.0
+	 * @param string $function Function used.
+	 * @param string $message Message to log.
+	 * @param string $version Version the message was added in.
+	 */
+	function cbxwpbookmark_doing_it_wrong( $function, $message, $version ) {
+		// @codingStandardsIgnoreStart
+		$message .= ' Backtrace: ' . wp_debug_backtrace_summary();
+
+		if ( wp_doing_ajax() || cbxwpbookmark_is_rest_api_request() ) {
+			do_action( 'doing_it_wrong_run', $function, $message, $version );
+			error_log( "{$function} was called incorrectly. {$message}. This message was added in version {$version}." );
+		} else {
+			_doing_it_wrong( $function, $message, $version );
+		}
+		// @codingStandardsIgnoreEnd
+	}//end function cbxwpbookmark_doing_it_wrong
+}
+
 /**
  * The file that defines the custom fucntions of the plugin
  *
@@ -78,11 +121,11 @@ function cbxbookmark_post_html( $instance, $echo = false ) {
 	 * @return void|string
 	 */
 	function cbxbookmark_mycat_html( $instance, $echo = false ) {
-		$settings_api    = new CBXWPBookmark_Settings_API();
+		$settings    = new CBXWPBookmark_Settings_API();
 		$current_user_id = get_current_user_id();
 
 
-		$bookmark_mode = $settings_api->get_option( 'bookmark_mode', 'cbxwpbookmark_basics', 'user_cat' );
+		$bookmark_mode = $settings->get_field( 'bookmark_mode', 'cbxwpbookmark_basics', 'user_cat' );
 
 		if ( $bookmark_mode == 'user_cat' || $bookmark_mode == 'global_cat' ) {
 			$output = CBXWPBookmarkHelper::cbxbookmark_mycat_html( $instance );
@@ -376,8 +419,7 @@ function cbxwpbookmarks_icon_path() {
 	 * @return string|false The SVG content if found, or false on failure.
 	 * @since 1.0.0
 	 */
-	function cbxwpbookmarks_load_svg( $svg_name = '' ) {
-		//note: code partially generated using chatgpt
+	function cbxwpbookmarks_load_svg( $svg_name = '', $folder = '') {
 		if ( $svg_name == '' ) {
 			return '';
 		}
@@ -400,8 +442,12 @@ function cbxwpbookmarks_load_svg( $svg_name = '' ) {
 		// Sanitize the file name to prevent directory traversal attacks.
 		$svg_name = sanitize_file_name( $svg_name );
 
+		if($folder != ''){
+			$folder = trailingslashit($folder);
+		}
+
 		// Construct the full file path.
-		$file_path = $directory . $svg_name . '.svg';
+		$file_path = $directory. $folder . $svg_name . '.svg';
 		$file_path = apply_filters( 'cbxwpbookmarks_svg_file_path', $file_path, $svg_name );
 
 		// Check if the file exists.

assets/css/cbxwpbookmark-setting.css

@@ -600,9 +600,9 @@ public static function cbxbookmark_post_html( $instance ) {
 		$bookmark_table = $wpdb->prefix . 'cbxwpbookmark';
 		$category_table = $wpdb->prefix . 'cbxwpbookmarkcat';
 
-		$setting = new CBXWPBookmark_Settings_API();
+		$settings = new CBXWPBookmark_Settings_API();
 
-		$bookmark_mode = $setting->get_option( 'bookmark_mode', 'cbxwpbookmark_basics', 'user_cat' );
+		$bookmark_mode = $settings->get_field( 'bookmark_mode', 'cbxwpbookmark_basics', 'user_cat' );
 
 		$limit    = isset( $instance['limit'] ) ? intval( $instance['limit'] ) : 10;
 		$order_by = isset( $instance['orderby'] ) ? esc_attr( $instance['orderby'] ) : 'id';
@@ -722,15 +722,15 @@ public static function cbxbookmark_post_html( $instance ) {
 					echo cbxwpbookmark_get_template_html( 'bookmarkpost/single.php', [
 						'item'           => $item,
 						'instance'       => $instance,
-						'setting'        => $setting,
+						'setting'        => $settings,
 						'action_html'    => $action_html,
 						'sub_item_class' => $sub_item_class, //used in category widget to display sub list
 
 					] );
 
 				} else {
-					//do_action( 'cbxwpbookmark_othertype_item', $item, $instance, $setting, $action_html, $sub_item_class );
-					do_action( 'cbxwpbookmark_item_othertype', $item, $instance, $setting, $action_html, $sub_item_class );
+					//do_action( 'cbxwpbookmark_othertype_item', $item, $instance, $settings, $action_html, $sub_item_class );
+					do_action( 'cbxwpbookmark_item_othertype', $item, $instance, $settings, $action_html, $sub_item_class );
 				}
 
 			}
@@ -760,7 +760,7 @@ public static function cbxbookmark_post_html( $instance ) {
 	public static function cbxbookmark_most_html( $instance, $attr = [] ) {
 		global $wpdb;
 		$bookmark_table       = $wpdb->prefix . 'cbxwpbookmark';
-		$setting              = new CBXWPBookmark_Settings_API();
+		$settings              = new CBXWPBookmark_Settings_API();
 		$allowed_object_types = cbxwpbookmarks_allowed_object_type();
 
 		$object_types = CBXWPBookmarkHelper::object_types( true ); //get plain post type as array
@@ -876,13 +876,13 @@ public static function cbxbookmark_most_html( $instance, $attr = [] ) {
 						echo cbxwpbookmark_get_template_html( 'bookmarkmost/single.php', [
 							'item'            => $item,
 							'instance'        => $instance,
-							'setting'         => $setting,
+							'setting'         => $settings,
 							'li_class'        => $li_class,
 							'show_count_html' => $show_count_html
 						] );
 					} else {
-						//do_action( 'cbxwpbookmark_othertype_mostitem', $item, array_merge( $instance, $attr ), $setting, $li_class, $show_count_html );
-						do_action( 'cbxwpbookmark_mostitem_othertype', $item, array_merge( $instance, $attr ), $setting, esc_attr( $li_class ), $show_count_html );
+						//do_action( 'cbxwpbookmark_othertype_mostitem', $item, array_merge( $instance, $attr ), $settings, $li_class, $show_count_html );
+						do_action( 'cbxwpbookmark_mostitem_othertype', $item, array_merge( $instance, $attr ), $settings, esc_attr( $li_class ), $show_count_html );
 					}
 				}
 			} else {
@@ -2279,16 +2279,16 @@ public static function myBookmarksShareUrl( $attr = [] ) {
 	 * Number field sanitization
 	 *
 	 * @param $number
-	 * @param $setting
+	 * @param $settings
 	 *
 	 * @return int
 	 */
-	public static function sanitize_number_field( $number, $setting ) {
+	public static function sanitize_number_field( $number, $settings ) {
 		// Ensure $number is an absolute integer (whole number, zero or greater).
 		$number = absint( $number );
 
 		// If the input is an absolute integer, return it; otherwise, return the default
-		return ( $number ? $number : $setting->default );
+		return ( $number ? $number : $settings->default );
 	}//end sanitize_number_field
 
 	public static function text_sanitization( $input ) {
@@ -2746,7 +2746,7 @@ public static function setting_reset_html_table() {
 
 
 		if ( sizeof( $table_names ) > 0 ):
-			$table_html .= '<p style="margin-bottom: 15px;" id="cbxscratingreview_info"><strong>' . esc_html__( 'Following database tables will be reset/deleted and then re-created.', 'cbxwpbookmark' ) . '</strong></p>';
+			$table_html .= '<p style="margin-bottom: 15px;" id="cbxwpbookmark_info"><strong>' . esc_html__( 'Following database tables will be reset/deleted and then re-created.', 'cbxwpbookmark' ) . '</strong></p>';
 
 			$table_html .= '<table class="widefat widethin cbxwpbookmark_table_data">
         <thead>