Changeset 2931821

Timestamp:

06/28/2023 12:13:11 PM (3 years ago)

Author:

kalyx

Message:

init v1.1.1

Location:

nuclia-search-for-wp/trunk

Files:

• README.txt (modified) (2 diffs)
• includes/admin/class-nuclia-admin-page-settings.php (modified) (7 diffs)
• includes/admin/js/reindex-button.js (modified) (1 diff)
• includes/nuclia-searchbox-shortcode.php (modified) (1 diff)
• languages/wp-search-with-nuclia-fr_FR.mo (deleted)
• languages/wp-search-with-nuclia-fr_FR.po (deleted)
• languages/wp-search-with-nuclia.pot (deleted)
• nuclia.php (modified) (1 diff)

nuclia-search-for-wp/trunk/README.txt

@@ -5 +5 @@
 Tested up to: 6.2.2
 Requires PHP: 7.2
-Stable tag: 1.1.0
+Stable tag: 1.1.1
 License: GNU General Public License v2.0, MIT License
 
@@ -67 +67 @@
 == Changelog ==
 
+= 1.1.1 =
+* Fix : Error notices when saving credentials
+
 = 1.1.0 =
 * Enhancement: Added a button for each post types in the settings page to index all unindexed posts ( or attachment )

nuclia-search-for-wp/trunk/includes/admin/class-nuclia-admin-page-settings.php

@@ -217 +217 @@
         $setting       = $settings->get_token();
         ?>
-<input type="password" name="nuclia_token" class="regular-text" value="<?php echo esc_attr( $setting ); ?>" />
+<input type="password" name="nuclia_token" class="regular-text" value="<?php echo esc_attr( $setting ); ?>" autocomplete="new-password" />
 <p class="description" id="home-description">
   <?php esc_html_e( 'Your Nuclia Service Access token with Contributor access (kept private).', 'klx-nuclia-search-for-wp' ); ?>
@@ -233 +233 @@
         $setting       = $settings->get_kbid();
         ?>
-<input type="text" name="nuclia_kbid" class="regular-text" value="<?php echo esc_attr( $setting ); ?>" />
+<input type="text" name="nuclia_kbid" class="regular-text" value="<?php echo esc_attr( $setting ); ?>" autocomplete="off" />
 <p class="description" id="home-description">
   <?php esc_html_e( 'Your Nuclia Knowledge box UID (must be public).', 'klx-nuclia-search-for-wp' ); ?>
@@ -370 +370 @@
         return $count;
     }
-    
-        
-    /**
-     * Sanitize zone.
+
+
+    /**
+     * Sanitize Knowledge box UID.
      *
      * @since  1.0.0
@@ -381 +381 @@
      * @return string
      */
-    public function sanitize_zone( $value ) {
+    public function sanitize_kbid( $value ) {
 
         $value = sanitize_text_field( $value );
-
-        if ( empty( $value ) ) {
-            add_settings_error(
-                'nuclia_settings',
-                'empty',
-                esc_html__( 'Zone should not be empty.', 'klx-nuclia-search-for-wp' )
-            );
-
-        }
-
-        return $value;
-    }
-
-    /**
-     * Sanitize Service Access token.
-     *
-     * @since  1.0.0
-     *
-     * @param string $value The value to sanitize.
-     *
-     * @return string
-     */
-    public function sanitize_token( $value ) {
-
-        $value = sanitize_text_field( $value );
-
-        if ( empty( $value ) ) {
-            add_settings_error(
-                'nuclia_settings',
-                'empty',
-                esc_html__( 'Service Access token should not be empty.', 'klx-nuclia-search-for-wp' )
-            );
-        }
-
-        return $value;
-    }
-
-    /**
-     * Sanitize Knowledge box UID.
-     *
-     * @since  1.0.0
-     *
-     * @param string $value The value to sanitize.
-     *
-     * @return string
-     */
-    public function sanitize_kbid( $value ) {
-
-        $value = sanitize_text_field( $value );
+        
+        $settings = $this->plugin->get_settings();
 
         if ( empty( $value ) ) {
@@ -440 +393 @@
                 esc_html__( 'Knowledge box UID should not be empty.', 'klx-nuclia-search-for-wp' )
             );
+            $settings->set_api_is_reachable( false );
             return $value;
         }
 
-        $settings = $this->plugin->get_settings();
 
         $valid_credentials = true;
         try {
-            $this->is_valid_credentials( $settings->get_zone(), $settings->get_kbid() );
+            $this->is_valid_credentials( $settings->get_zone(), $value );
         } catch ( Exception $exception ) {
             $valid_credentials = false;
@@ -467 +420 @@
             );
             $settings->set_api_is_reachable( false );
+        };
+
+        return $value;
+    }   
+        
+    /**
+     * Sanitize zone.
+     *
+     * @since  1.0.0
+     *
+     * @param string $value The value to sanitize.
+     *
+     * @return string
+     */
+    public function sanitize_zone( $value ) {
+
+        $value = sanitize_text_field( $value );
+        
+        if ( empty( $value ) ) {
+            add_settings_error(
+                'nuclia_settings',
+                'empty',
+                esc_html__( 'Zone should not be empty.', 'klx-nuclia-search-for-wp' )
+            );
+            $settings = $this->plugin->get_settings();
+            $settings->set_api_is_reachable( false );
+        }
+
+        return $value;
+    }
+
+    /**
+     * Sanitize Service Access token.
+     *
+     * @since  1.0.0
+     *
+     * @param string $value The value to sanitize.
+     *
+     * @return string
+     */
+    public function sanitize_token( $value ) {
+
+        $value = sanitize_text_field( $value );
+        
+        $settings = $this->plugin->get_settings();
+
+        if ( empty( $value ) ) {
+            add_settings_error(
+                'nuclia_settings',
+                'empty',
+                esc_html__( 'Service Access token should not be empty.', 'klx-nuclia-search-for-wp' )
+            );
+            $settings->set_api_is_reachable( false );
+            return $value;
+        }
+        
+        
+        if ( ! $this->is_valid_token( $settings->get_zone(), $settings->get_kbid(), $value ) ) {
+            add_settings_error(
+                'nuclia_settings',
+                'wrong_token',
+                esc_html__(
+                    'It looks like your token is wrong.',
+                    'klx-nuclia-search-for-wp'
+                )
+            );
+            $settings->set_api_is_reachable( false );
         } else {
-            if ( ! $this->is_valid_token( $settings->get_zone(), $settings->get_kbid(), $settings->get_token() ) ) {
-                add_settings_error(
-                    'nuclia_settings',
-                    'wrong_token',
-                    esc_html__(
-                        'It looks like your token is wrong.',
-                        'klx-nuclia-search-for-wp'
-                    )
-                );
-                $settings->set_api_is_reachable( false );
-            } else {
-                add_settings_error(
-                    'nuclia_settings',
-                    'connection_success',
-                    esc_html__( 'We succesfully managed to connect to the Nuclia servers with the provided information.', 'klx-nuclia-search-for-wp' ),
-                    'updated'
-                );
-                $settings->set_api_is_reachable( true );
-            }
+            add_settings_error(
+                'nuclia_settings',
+                'connection_success',
+                esc_html__( 'We succesfully managed to connect to the Nuclia servers with the provided information.', 'klx-nuclia-search-for-wp' ),
+                'updated'
+            );
+            $settings->set_api_is_reachable( true );
         }
-
+        
         return $value;
     }
@@ -555 +563 @@
         $response_code  = wp_remote_retrieve_response_code( $response );
         if( $response_code === 200 ) {
-            return;
+            return true;
         } elseif( $response_code === 422 ) {
             throw new Exception(

nuclia-search-for-wp/trunk/includes/admin/js/reindex-button.js

@@ -1 +1 @@
 (function($) {
-
+    
     $(
         function() {

nuclia-search-for-wp/trunk/includes/nuclia-searchbox-shortcode.php

@@ -22 +22 @@
         'features' => 'navigateToLink'
     ), $atts));
-    nuclia_log( 'shortcode atts : '.$zone.' - '.$kbid.' - '.$features );
+
     // we need zone and kbid to display searchbox
     if ( empty($zone) || empty($kbid) ) :

nuclia-search-for-wp/trunk/nuclia.php

@@ -4 +4 @@
  * Plugin URI:        https://github.com/kalyx/nuclia-search-for-wp
  * Description:       Integrate the powerful Nuclia search service with WordPress
- * Version:           1.1.0
+ * Version:           1.1.1
  * Requires at least: 5.6
  * Requires PHP:      7.2