Change visibility of multiple methods from private to protected across admin classes

- Admin_Notices_API::is_notice_dismissed()
- Admin_Notices::register_db_update_notice(), register_notices(), register_fulltext_index_notice(), register_missing_table_notice()
- Admin::get_admin_banner_config()
- Settings_Wizard::build_step_settings()
- Statistics_Table::get_network_popular_searches(), get_orderby_clause()
- Add static cache to Dashboard::get_data() to prevent duplicate queries
- Remove inline script from Tools_Page (bsearchAdd

Author: ajaydsouza

includes/admin/class-admin-notices-api.php

@@ -198,7 +198,7 @@ public function handle_notice_dismissal() {
 	 * @param string $notice_id Notice ID.
 	 * @return bool Whether the notice has been dismissed.
 	 */
-	private function is_notice_dismissed( $notice_id ) {
+	protected function is_notice_dismissed( $notice_id ) {
 		$notice = $this->notices[ $notice_id ] ?? null;
 
 		if ( ! $notice ) {

includes/admin/class-admin-notices.php

@@ -70,7 +70,7 @@ public function update_db_check() {
 	 *
 	 * @since 4.2.0
 	 */
-	private function register_db_update_notice() {
+	protected function register_db_update_notice() {
 		$is_upgrader_page = isset( $_GET['page'] ) && 'bsearch-upgrader' === $_GET['page']; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
 		if ( $is_upgrader_page ) {
@@ -138,7 +138,7 @@ function () use ( $message ) {
 	 *
 	 * @since 4.2.0
 	 */
-	private function register_notices() {
+	protected function register_notices() {
 		// Only register notices if the API is available.
 		if ( ! $this->admin_notices_api ) {
 			return;
@@ -153,7 +153,7 @@ private function register_notices() {
 	 *
 	 * @since 4.2.0
 	 */
-	private function register_fulltext_index_notice() {
+	protected function register_fulltext_index_notice() {
 		// Check if admin_notices_api is available.
 		if ( ! $this->admin_notices_api ) {
 			return;
@@ -187,7 +187,7 @@ function () {
 	 *
 	 * @since 4.2.0
 	 */
-	private function register_missing_table_notice() {
+	protected function register_missing_table_notice() {
 		// Check if admin_notices_api is available.
 		if ( ! $this->admin_notices_api ) {
 			return;

includes/admin/class-admin.php

@@ -317,7 +317,7 @@ public static function pro_upgrade_banner( $donate = true, $custom_text = '' ) {
 	 *
 	 * @return array<string, mixed>
 	 */
-	private function get_admin_banner_config(): array {
+	protected function get_admin_banner_config(): array {
 		$dashboard_url = admin_url( 'admin.php?page=bsearch_dashboard' );
 		$popular_url   = admin_url( 'admin.php?page=bsearch_popular_searches' );
 		$settings_url  = admin_url( 'admin.php?page=bsearch_options_page' );

includes/admin/class-dashboard.php

@@ -544,7 +544,15 @@ public function get_popular_searches( $args = array() ) {
 			$sql = "SELECT DISTINCT $fields FROM {$table_name} $join WHERE 1=1 $where $groupby $orderby $limits";
 		}
 
-		$result = $wpdb->get_results( $sql ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared
+		static $cache = array();
+
+		$cache_key = md5( $sql );
+		if ( isset( $cache[ $cache_key ] ) ) {
+			return $cache[ $cache_key ];
+		}
+
+		$result              = $wpdb->get_results( $sql ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared
+		$cache[ $cache_key ] = $result;
 
 		return $result;
 	}

includes/admin/class-settings-wizard.php

@@ -160,7 +160,7 @@ public function get_wizard_steps() {
 	 * @param array $all_settings All settings array.
 	 * @return array
 	 */
-	private function build_step_settings( $keys, $all_settings ) {
+	protected function build_step_settings( $keys, $all_settings ) {
 		$settings = array();
 		foreach ( $keys as $key ) {
 			if ( isset( $all_settings[ $key ] ) ) {

includes/admin/class-statistics-table.php

@@ -130,7 +130,7 @@ public function get_popular_searches( $per_page = 20, $page_number = 1, $args =
 	 * @param string $to_date     To date in Y-m-d format.
 	 * @return array Array of popular search terms.
 	 */
-	private function get_network_popular_searches( $per_page, $page_number, $args, $from_date, $to_date ) {
+	protected function get_network_popular_searches( $per_page, $page_number, $args, $from_date, $to_date ) {
 		global $wpdb;
 
 		$overall_unions = self::get_network_table_unions( 'bsearch' );
@@ -497,7 +497,7 @@ public function process_bulk_action() {
 	 * @param array $args Array of arguments.
 	 * @return string ORDER BY clause without the ORDER BY keyword.
 	 */
-	private function get_orderby_clause( $args = null ) {
+	protected function get_orderby_clause( $args = null ) {
 		$orderby = '';
 		if ( ! empty( $_REQUEST['orderby'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			$orderby = sanitize_text_field( wp_unslash( $_REQUEST['orderby'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended

includes/admin/class-tools-page.php

@@ -218,11 +218,6 @@ public function render_page() {
 							<?php $sql_queries = self::recreate_indices_sql(); ?>
 							<pre id="bsearch-indices-sql"><code><?php echo implode( "\n", array_map( 'esc_html', $sql_queries ) ); ?></code></pre>
 						</div>
-						<script>
-							jQuery(document).ready(function($) {
-								bsearchAddCopyButton('bsearch-indices-sql');
-							});
-						</script>
 
 					</div>
 				</div>

includes/admin/css/better-search-admin-rtl.css

@@ -1513,6 +1513,12 @@ a.bsearch_button.bsearch_button_gold:hover {
 	}
 }
 
+button .spinner {
+	float: none;
+	vertical-align: middle;
+	margin: 0 4px 0 0;
+}
+
 /* Copy to clipboard button */
 .bsearch-code-wrapper {
 	position: relative;

includes/admin/css/better-search-admin.css

@@ -1503,6 +1503,12 @@ a.bsearch_button.bsearch_button_gold:hover {
 	}
 }
 
+button .spinner {
+    float: none;
+    vertical-align: middle;
+    margin: 0 0 0 4px;
+}
+
 /* Copy to clipboard button */
 .bsearch-code-wrapper {
     position: relative;