Changeset 1992175

Timestamp:

12/11/2018 09:25:03 PM (7 years ago)

Author:

albertochoa

Message:

Version 1.2.0

Location:

relevant-search/trunk

Files:

• readme.txt (modified) (3 diffs)
• relevant-search.php (modified) (8 diffs)

relevant-search/trunk/readme.txt

@@ -3 +3 @@
 Tags: search, relevant, results, post types, mysql, myisam
 Requires at least: 3.0
-Tested up to: 3.3
-Stable tag: 1.0.1
+Tested up to: 5.0
+Stable tag: 1.2.0
 
 Relevant Search replaces the default WordPress search with relevant results.
@@ -15 +15 @@
 
 = MySQL Documentation =
-* [Full-Text Search Functions](http://dev.mysql.com/doc/refman/5.0/en/fulltext-search.html)
-* [Natural Language Full-Text Searches](http://dev.mysql.com/doc/refman/5.0/en/fulltext-natural-language.html)
-* [Regular Expressions](http://dev.mysql.com/doc/refman/5.1/en/regexp.html)
-
-= Developers =
-* [GitHub](https://github.com/niftycode/relevant-search)
+* [Full-Text Search Functions](http://dev.mysql.com/doc/refman/5.6/en/fulltext-search.html)
+* [Natural Language Full-Text Searches](http://dev.mysql.com/doc/refman/5.6/en/fulltext-natural-language.html)
+* [Regular Expressions](http://dev.mysql.com/doc/refman/5.6/en/regexp.html)
 
 == Installation ==
@@ -31 +28 @@
 == Changelog ==
 
+= 1.2.0 =
+* Code cleanup
+* Tested up to 5.0
+
 = 1.0.1 =
 * Rebuild the Full-Text Index when needed

relevant-search/trunk/relevant-search.php

@@ -2 +2 @@
 /**
  * Plugin Name: Relevant Search
- * Plugin URI: http://snippets-tricks.org/proyecto/relevant-search/
+ * Plugin URI: https://wordpress.org/plugins/relevant-search/
  * Description: Relevant Search will provide contextual search and listing the results based on relevance. It automatically replaces the default WordPress search.
- * Version: 1.0.1
- * Author: Luis Alberto Ochoa Esparza
- * Author URI: http://luisalberto.org
+ * Version: 1.2.0
+ * Author: Luis A. Ochoa
+ * Author URI: https://gitlab.com/albertochoa
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License version 2, as published by the Free Software Foundation. You may NOT assume
- * that you can use any other version of the GPL.
+ * Relevant Search will provide contextual search and listing the results based on relevance.
+ * Copyright (C) 2011-2018 Luis A. Ochoa
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * You should have received a copy of the GNU General Public License along with this program; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
- * @package Relevant Search
- * @version 1.0.1
- * @link http://snippets-tricks.org/proyecto/relevant-search/
- * @author Luis Alberto Ochoa Esparza <[email protected]>
- * @copyright Copyright (C) 2011, Luis Alberto Ochoa Esparza
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -37 +37 @@
 {
     /**
+     * The single instance of the class.
+     *
+     * @since 1.2.0
+     */
+    protected static $instance = null;
+
+    /**
      * The main Relevant Search loader.
      *
      * @since 1.0.0
      */
-    public function __construct() {
+    private function __construct() {
 
         /* Filter the query in 'posts_request' */
@@ -56 +63 @@
 
     /**
+     * 
+     * @since 1.2.0
+     */
+    public static function getInstance() {
+
+        if (is_null( self::$instance ) ) {
+            self::$instance = new Relevant_Search();
+        }
+
+        return self::$instance;
+    }
+
+    /**
      * Creates a query that retrieves the posts depending on search terms
      * and sorts by relevance.
@@ -64 +84 @@
 
         /* If not the search page returns $request */
-        if ( !is_search() ) return $request;
+        if ( !is_search() ) {
+            return $request;
+        }
 
         global $wpdb, $wp_query;
@@ -71 +93 @@
         $s = stripslashes( $wp_query->query_vars['s'] );
 
-        if ( !empty( $wp_query->query_vars['sentence'] ) )
+        if ( !empty( $wp_query->query_vars['sentence'] ) ) {
             $terminos = array( $s );
-
-        else {
+        } else {
             preg_match_all( '/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches );
             $terminos = array_map( 'rs_search_terms_tidy', $matches[0] );
         }
 
-        foreach( $terminos as $termino )
+        foreach( $terminos as $termino ) {
             $regexp[] = "[[:<:]]{$termino}[[:>:]]";
+        }
 
         $regexp = join( '|', $regexp );
@@ -88 +110 @@
 
         /* Add the post that have no password if the user is not logged */
-        if ( !is_user_logged_in() )
+        if ( !is_user_logged_in() ) {
             $query[] = "AND post_password = ''";
+        }
 
         /* Set the post types not excluded from search */
@@ -132 +155 @@
         global $wpdb;
 
-        if ( false == $wpdb->query( "SHOW INDEX FROM {$wpdb->posts} WHERE key_name = 'search';" ) )
+        if ( false == $wpdb->query( "SHOW INDEX FROM {$wpdb->posts} WHERE key_name = 'search';" ) ) {
             $wpdb->query( "CREATE FULLTEXT INDEX search ON {$wpdb->posts} (post_title, post_content);" );
+        }
     }
 
@@ -144 +168 @@
         global $wpdb;
 
-        if ( $wpdb->query( "SHOW INDEX FROM {$wpdb->posts} WHERE key_name = 'search';" ) )
+        if ( $wpdb->query( "SHOW INDEX FROM {$wpdb->posts} WHERE key_name = 'search';" ) ) {
             $wpdb->query( "ALTER TABLE {$wpdb->posts} DROP INDEX search;" );
+        }
     }
-
-    /**
-     * @since 1.0.0
-     * @deprecated 1.0.1
-     */
-    function rs_post_request( $request ) {}
-
-    /**
-     * @since 1.0.0
-     * @deprecated 1.0.1
-     */
-    function rs_activation() {}
-
-    /**
-     * @since 1.0.0
-     * @deprecated 1.0.1
-     */
-    function rs_desactivation() {}
 }
 
 /* Creates a new instance. */
-$GLOBAL['relevat_search'] = new Relevant_Search();
+$GLOBAL['relevat_search'] = Relevant_Search::getInstance();
 
 /**
  * Used internally to tidy up the search terms.
  *
- * TODO: This function has been copied in WordPress Core
+ * This function has been copied in WordPress Core
  *
  * @since 1.0.0