Changeset 12219

Timestamp:

09/07/2018 03:43:17 AM (6 years ago)

Author:

imath

Message:

BP Nouveau: Improve special characters management in Members search

[12201] only partly fixed AJAX search requests into the Members directory :

• The search input needs to output URL decoded characters.
• Special characters such as ">" or "<", when directly typed into the search input, need to be URL encoded.

Props n0barcode

Fixes #7962 (trunk)

File:

• trunk/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js (modified) (4 diffs)

trunk/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js

@@ -2 +2 @@
 /* jshint devel: true */
 /* jshint browser: true */
-/* @version 3.0.0 */
+/* @version 3.2.0 */
 window.wp = window.wp || {};
 window.bp = window.bp || {};
@@ -160 +160 @@
 
             return params;
+        },
+
+        /**
+         * URL Decode a query variable.
+         *
+         * @param  {string} qv    The query variable to decode.
+         * @param  {object} chars The specific characters to use. Optionnal.
+         * @return {string}       The URL decoded variable.
+         */
+        urlDecode: function( qv, chars ) {
+            var specialChars = chars || {
+                amp: '&',
+                lt: '<',
+                gt: '>',
+                quot: '"',
+                '#039': '\''
+            };
+
+            return decodeURIComponent( qv.replace( /\+/g, ' ' ) ).replace( /&([^;]+);/g, function( v, q ) {
+                return specialChars[q] || '';
+            } );
         },
 
@@ -239 +260 @@
             }
 
+            // Prepare the search terms for the request
+            if ( data.search_terms ) {
+                data.search_terms = data.search_terms.replace( /</g, '&lt;' ).replace( />/g, '&gt;' );
+            }
+
             // Set session's data
             if ( null !== data.scope ) {
@@ -358 +384 @@
 
                     if ( search_terms ) {
-                        search_terms = decodeURIComponent( search_terms.replace( /\+/g, ' ' ) );
+                        search_terms = self.urlDecode( search_terms );
                         $( '#buddypress [data-bp-search="' + object + '"] input[type=search]' ).val( search_terms );
                     }