Skip to content

Commit 84f4006

Browse files
manchumaharamanchumahara
committed
plugin check fixed
1 parent d97ae9f commit 84f4006

67 files changed

Lines changed: 4984 additions & 4533 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎assets/css/cbxwpbookmark-public.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cbxwpbookmark.php‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
die;
3030
}
3131

32-
//use Cbx\Bookmark\Helpers\CBXWPBookmarkHelper;
32+
//use CBXWPBookmark\Helpers\CBXWPBookmarkHelper;
3333

3434
defined( 'CBXWPBOOKMARK_PLUGIN_NAME' ) or define( 'CBXWPBOOKMARK_PLUGIN_NAME', 'cbxwpbookmark' );
3535
defined( 'CBXWPBOOKMARK_PLUGIN_VERSION' ) or define( 'CBXWPBOOKMARK_PLUGIN_VERSION', '2.0.0' );
@@ -49,15 +49,14 @@
4949
include_once CBXWPBOOKMARK_ROOT_PATH . 'includes/CBXWPBookmark.php';
5050
}
5151

52-
register_activation_hook( __FILE__, 'activate_cbxwpbookmark' );
53-
register_deactivation_hook( __FILE__, 'deactivate_cbxwpbookmark' );
52+
register_activation_hook( __FILE__, 'cbxwpbookmark_activate' );
53+
register_deactivation_hook( __FILE__, 'cbxwpbookmark_deactivate' );
5454

5555
/**
5656
* The code that runs during plugin activation.
5757
* This action is documented in includes/class-cbxwpbookmark-activator.php
5858
*/
59-
function activate_cbxwpbookmark() {
60-
59+
function cbxwpbookmark_activate() {
6160
$wp_version = CBXWPBOOKMARK_WP_MIN_VERSION;
6261
$php_version = CBXWPBOOKMARK_PHP_MIN_VERSION;
6362

@@ -82,16 +81,16 @@ function activate_cbxwpbookmark() {
8281
CBXWPBookmarkHelper::activate();
8382

8483
CBXWPBookmarkHelper::customizer_default_adjust( true );
85-
}//end memthod activate_cbxwpbookmark
84+
}//end memthod cbxwpbookmark_activate
8685

8786
/**
8887
* The code that runs during plugin deactivation.
8988
* This action is documented in includes/class-cbxwpbookmark-deactivator.php
9089
*/
91-
function deactivate_cbxwpbookmark() {
90+
function cbxwpbookmark_deactivate() {
9291
//require_once plugin_dir_path( __FILE__ ) . 'includes/class-cbxwpbookmark-deactivator.php';
9392
CBXWPBookmarkHelper::deactivate();
94-
}//end method deactivate_cbxwpbookmark
93+
}//end method cbxwpbookmark_deactivate
9594

9695
/**
9796
* Checking wp version
@@ -135,7 +134,7 @@ function cbxwpbookmark_core() { // phpcs:ignore WordPress.NamingConventions.Vali
135134
global $cbxwpbookmark_core;
136135

137136
if ( ! isset( $cbxwpbookmark_core ) ) {
138-
$cbxwpbookmark_core = run_cbxwpbookmark_core();
137+
$cbxwpbookmark_core = cbxwpbookmark_run_core();
139138
}
140139

141140
return $cbxwpbookmark_core;
@@ -158,8 +157,8 @@ function cbxwpbookmark_core() { // phpcs:ignore WordPress.NamingConventions.Vali
158157
*
159158
* @since 1.7.13
160159
*/
161-
function run_cbxwpbookmark_core() {
160+
function cbxwpbookmark_run_core() {
162161
return CBXWPBookmark::instance();
163-
}//end function run_cbxwpbookmark_core
162+
}//end function cbxwpbookmark_run_core
164163

165-
$GLOBALS['cbxwpbookmark_core'] = run_cbxwpbookmark_core();
164+
$GLOBALS['cbxwpbookmark_core'] = cbxwpbookmark_run_core();

‎composer.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"autoload": {
1414
"psr-4": {
15-
"Cbx\\Bookmark\\": "includes/"
15+
"CBXWPBookmark\\": "includes/"
1616
},
1717
"files": [
1818
"includes/Helpers/cbxwpbookmark-functions.php",
@@ -24,5 +24,7 @@
2424
"symfony/console": "*",
2525
"symfony/translation": "*",
2626
"symfony/translation-contracts": "*"
27+
},
28+
"config": {
2729
}
2830
}

‎includes/Api/CbxRoute.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace Cbx\Bookmark\Api;
2+
namespace CBXWPBookmark\Api;
33

44
// If this file is called directly, abort.
55
if ( ! defined( 'ABSPATH' ) ) {
@@ -10,7 +10,7 @@
1010

1111
/**
1212
* Class CbxRoute
13-
* @package Cbx\Bookmark\Api
13+
* @package CBXWPBookmark\Api
1414
* @since 1.0.0
1515
*/
1616
class CbxRoute {

‎includes/Api/routes.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
exit; // Exit if accessed directly.
55
}
66

7-
use Cbx\Bookmark\Api\CbxRoute;
8-
use Cbx\Bookmark\Controllers\BookmarkController;
9-
use Cbx\Bookmark\Controllers\BookmarkFrontController;
10-
use Cbx\Bookmark\Controllers\CategoryController;
11-
use Cbx\Bookmark\Controllers\CategoryFrontController;
12-
use Cbx\Bookmark\Controllers\AdminDashboardController;
13-
use Cbx\Bookmark\Controllers\FrontDashboardController;
7+
use CBXWPBookmark\Api\CbxRoute;
8+
use CBXWPBookmark\Controllers\BookmarkController;
9+
use CBXWPBookmark\Controllers\BookmarkFrontController;
10+
use CBXWPBookmark\Controllers\CategoryController;
11+
use CBXWPBookmark\Controllers\CategoryFrontController;
12+
use CBXWPBookmark\Controllers\AdminDashboardController;
13+
use CBXWPBookmark\Controllers\FrontDashboardController;
1414

1515
//routes admin
1616
CbxRoute::middleware( 'cbxwpbookmark_log_manage' )->get( 'v1/admin/get-bookmarks', [ BookmarkController::class, 'index' ] );

‎includes/CBXWPBookmark.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

3-
use Cbx\Bookmark\Api\CbxRoute;
4-
//use Cbx\Bookmark\Helpers\CBXWPBookmarkHelper;
5-
use Cbx\Bookmark\CBXWPBookmarkAdmin;
6-
use Cbx\Bookmark\CBXWPBookmarkPublic;
7-
use Cbx\Bookmark\CBXWPBookmarkMisc;
8-
use Cbx\Bookmark\CBXWPBookmarkBlocks;
9-
use Cbx\Bookmark\CBXWPBookmarkShortcodes;
10-
use Cbx\Bookmark\Customizer\CBXWPBookmarkCustomizer;
3+
use CBXWPBookmark\Api\CbxRoute;
4+
//use CBXWPBookmark\Helpers\CBXWPBookmarkHelper;
5+
use CBXWPBookmark\CBXWPBookmarkAdmin;
6+
use CBXWPBookmark\CBXWPBookmarkPublic;
7+
use CBXWPBookmark\CBXWPBookmarkMisc;
8+
use CBXWPBookmark\CBXWPBookmarkBlocks;
9+
use CBXWPBookmark\CBXWPBookmarkShortcodes;
10+
use CBXWPBookmark\Customizer\CBXWPBookmarkCustomizer;
1111

1212
/**
1313
* The file that defines the core plugin class

‎includes/CBXWPBookmarkAdmin.php‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
namespace Cbx\Bookmark;
2+
namespace CBXWPBookmark;
33

4-
use Cbx\Bookmark\CBXWPBookmarkSettings;
5-
//use Cbx\Bookmark\Helpers\CBXWPBookmarkHelper;
4+
use CBXWPBookmark\CBXWPBookmarkSettings;
5+
//use CBXWPBookmark\Helpers\CBXWPBookmarkHelper;
66

77
// If this file is called directly, abort.
88
if ( ! defined( 'WPINC' ) ) {
@@ -809,10 +809,6 @@ public function add_edit_category() {
809809
public function cbxwpbookmark_autocreate_page() {
810810
check_ajax_referer( 'cbxbookmarknonce', 'security' );
811811

812-
if ( ! class_exists( 'CBXWPBookmark_Activator' ) ) {
813-
require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-cbxwpbookmark-activator.php';
814-
}
815-
816812
//create pages
817813
\CBXWPBookmarkHelper::cbxbookmark_create_pages(); //create the shortcode page
818814

@@ -840,8 +836,6 @@ public function plugin_upgrader_process_complete() {
840836

841837
// Update the saved version
842838
update_option('cbxwpbookmark_version', CBXWPBOOKMARK_PLUGIN_VERSION);
843-
844-
//deactivate mycred addon
845839
}
846840
}//end plugin_upgrader_process_complete
847841

@@ -970,6 +964,7 @@ public function pro_addon_compatibility_campaign() {
970964
}
971965

972966
//if the pro addon is active or installed
967+
//phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
973968
if ( in_array( 'cbxwpbookmarkaddon/cbxwpbookmarkaddon.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) || defined( 'CBXWPBOOKMARKADDON_PLUGIN_NAME' ) ) {
974969
//plugin is activated
975970

@@ -986,18 +981,6 @@ public function pro_addon_compatibility_campaign() {
986981
/* translators: %s: bookmark product description url */
987982
echo '<div style="border-left-color: #005ae0;" class="notice notice-success is-dismissible"><p>' . sprintf( wp_kses( __( '<a target="_blank" href="%s">CBX Bookmark Pro Addon</a> has extended features, settings, widgets and shortcodes. try it - Codeboxr Team', 'cbxwpbookmark' ), [ 'a' => [ 'href' => [], 'target' => [] ] ] ), 'https://codeboxr.com/product/cbx-wordpress-bookmark/' ) . '</p></div>';
988983
}
989-
990-
991-
//if the mycred addon is active or installed
992-
if ( in_array( 'cbxwpbookmarkmycred/cbxwpbookmarkmycred.php.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) || defined( 'CBXWPBOOKMARKMYCRED_PLUGIN_NAME' ) ) {
993-
//plugin is activated
994-
995-
//$plugin_version = CBXWPBOOKMARKMYCRED_PLUGIN_VERSION;
996-
} else {
997-
/* translators: %s: bookmark mycred plugin description url */
998-
echo '<div style="border-left-color: #005ae0;" class="notice notice-success is-dismissible"><p>' . sprintf( wp_kses( __( '<a target="_blank" href="%s">CBX Bookmark myCred Addon</a> has myCred integration. try it - Codeboxr Team', 'cbxwpbookmark' ), [ 'a' => [ 'href' => [], 'target' => [] ] ] ), 'https://codeboxr.com/product/cbx-bookmark-mycred-addon/' ) . '</p></div>';
999-
}
1000-
1001984
}//end pro_addon_compatibility_campaign
1002985

1003986

@@ -1042,6 +1025,7 @@ public function plugin_row_meta( $links_array, $plugin_file_name, $plugin_data,
10421025
$links_array[] = '<a target="_blank" style="color:#005ae0 !important; font-weight: bold;" href="https://codeboxr.com/doc/cbxwpbookmark-doc/" aria-label="' . esc_attr__( 'Documentation', 'cbxwpbookmark' ) . '">' . esc_html__( 'Documentation', 'cbxwpbookmark' ) . '</a>';
10431026

10441027

1028+
//phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
10451029
if ( in_array( 'cbxwpbookmarkaddon/cbxwpbookmarkaddon.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) || defined( 'CBXWPBOOKMARKADDON_PLUGIN_NAME' ) ) {
10461030

10471031
} else {
@@ -1175,8 +1159,10 @@ public function plugin_reset() {
11751159
global $wpdb;
11761160

11771161
foreach ( $table_names as $table_name ) {
1162+
$escaped_table = esc_sql( $table_name );
1163+
11781164
//phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.DirectDatabaseQuery.SchemaChange, WordPress.DB.PreparedSQL.InterpolatedNotPrepared
1179-
$query_result = $wpdb->query( "DROP TABLE IF EXISTS {$table_name}" );
1165+
$query_result = $wpdb->query( "DROP TABLE IF EXISTS `{$escaped_table}`" );
11801166
}
11811167

11821168
do_action( 'cbxwpbookmark_plugin_tables_deleted_after', $table_names );

‎includes/CBXWPBookmarkBlocks.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
2-
namespace Cbx\Bookmark;
2+
namespace CBXWPBookmark;
33

4-
use Cbx\Bookmark\Widgets\Block\CBXWPBookmarkBtnBlock;
5-
use Cbx\Bookmark\Widgets\Block\CBXWPBookmarkCategoryBlock;
6-
use Cbx\Bookmark\Widgets\Block\CBXWPBookmarkMostBlock;
7-
use Cbx\Bookmark\Widgets\Block\CBXWPBookmarkMyBookmarkBlock;
4+
use CBXWPBookmark\Widgets\Block\CBXWPBookmarkBtnBlock;
5+
use CBXWPBookmark\Widgets\Block\CBXWPBookmarkCategoryBlock;
6+
use CBXWPBookmark\Widgets\Block\CBXWPBookmarkMostBlock;
7+
use CBXWPBookmark\Widgets\Block\CBXWPBookmarkMyBookmarkBlock;
88

99
// If this file is called directly, abort.
1010
if ( ! defined( 'WPINC' ) ) {

‎includes/CBXWPBookmarkMisc.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?php
2-
namespace Cbx\Bookmark;
2+
namespace CBXWPBookmark;
33

44
// If this file is called directly, abort.
55
if ( ! defined( 'ABSPATH' ) ) {
66
exit; // Exit if accessed directly.
77
}
88

9-
//use Cbx\Bookmark\Helpers\CBXWPBookmarkHelper;
9+
//use CBXWPBookmark\Helpers\CBXWPBookmarkHelper;
1010

1111
/**
1212
* Class CBXWPBookmarkMisc
13-
* @package Cbx\Bookmark
13+
* @package CBXWPBookmark
1414
* @since 1.0.0
1515
*/
1616
class CBXWPBookmarkMisc {

0 commit comments

Comments
 (0)