Changeset 3627

Timestamp:

12/30/2010 10:13:05 PM (16 years ago)

Author:

boonebgorges

Message:

Replaces generic 'Search anything' default directory search text with component-specific text. Fixes #1915. Fixes ->forums->slug so that it is properly set in the bp_pages way

Location:

trunk

Files:

• bp-blogs.php (modified) (2 diffs)
• bp-blogs/bp-blogs-templatetags.php (modified) (1 diff)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (2 diffs)
• bp-forums.php (modified) (3 diffs)
• bp-forums/bp-forums-templatetags.php (modified) (1 diff)
• bp-groups.php (modified) (2 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

trunk/bp-blogs.php

@@ -13 +13 @@
                 define ( 'BP_BLOGS_SLUG', $bp->pages->blogs->slug );
 
-        /* For internal identification */
+        // For internal identification
         $bp->blogs->id = 'blogs';
 
@@ -23 +23 @@
         $bp->blogs->format_notification_function = 'bp_blogs_format_notifications';
 
-        /* Register this in the active components array */
+        // Register this in the active components array
         $bp->active_components[$bp->blogs->slug] = $bp->blogs->id;
+
+        // The default text for the blogs directory search box  
+        $bp->default_search_strings[$bp->blogs->slug] = __( 'Search Blogs...', 'buddypress' ); 
 
         do_action( 'bp_blogs_setup_globals' );

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -505 +505 @@
         global $bp;
 
-        $search_value = __( 'Search anything...', 'buddypress' );
-        if ( !empty( $_GET['s'] ) )
-                $search_value = stripslashes( $_GET['s'] );
+        $default_search_value = bp_get_search_default_text(); 
+        $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; 
 
         ?>
         <form action="" method="get" id="search-blogs-form">
-                <label><input type="text" name="s" id="blogs_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+                <label><input type="text" name="s" id="blogs_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
                 <input type="submit" id="blogs_search_submit" name="blogs_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
         </form>

trunk/bp-core.php

@@ -168 +168 @@
         if ( !$bp->current_component && $bp->displayed_user->id )
                 $bp->current_component = $bp->default_component;
+
+        // The default text for the members directory search box
+        $bp->default_search_strings[$bp->members->slug] = __( 'Search Members...', 'buddypress' ); 
 
         do_action( 'bp_core_setup_globals' );

trunk/bp-core/bp-core-templatetags.php

@@ -455 +455 @@
         global $bp;
 
-        $search_value = __( 'Search anything...', 'buddypress' );
-        if ( !empty( $_GET['s'] ) )
-                $search_value = stripslashes( $_GET['s'] );
+        $default_search_value = bp_get_search_default_text(); 
+        $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
 
         ?>
         <form action="" method="get" id="search-members-form">
-                <label><input type="text" name="s" id="members_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+                <label><input type="text" name="s" id="members_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
                 <input type="submit" id="members_search_submit" name="members_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
         </form>
@@ -1049 +1048 @@
 }
 
+/** 
+ * Get the default text for the search box for a given component. 
+ * 
+ * @global object $bp BuddyPress global settings 
+ * @return string 
+ * @since 1.3 
+ */ 
+function bp_search_default_text() { 
+        echo bp_get_search_default_text(); 
+} 
+        function bp_get_search_default_text( $component = false ) { 
+                global $bp; 
+                
+                if ( empty( $component ) ) 
+                        $component = $bp->current_component;
+                
+                $default_text = __( 'Search anything...', 'buddypress' );
+                
+                if ( !empty( $bp->default_search_strings[$component] ) ) {
+                        // Most of the time, $component will be the actual component name
+                        $default_text = $bp->default_search_strings[$component];
+                } else {
+                        // When the request comes through AJAX, we need to get the component name
+                        // out of $bp->pages
+                        if ( !empty( $bp->pages->{$component}->slug ) ) {
+                                $key = $bp->pages->{$component}->slug;
+                                if ( !empty( $bp->default_search_strings[$key] ) )
+                                        $default_text = $bp->default_search_strings[$key];
+                        }
+                }
+                
+                return apply_filters( 'bp_search_default_text', $default_text, $component ); 
+        } 
+
 function bp_search_form() {
         $form = '

trunk/bp-forums.php

@@ -5 +5 @@
         define( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
 
-if ( !defined( 'BP_FORUMS_SLUG' ) )
-        define( 'BP_FORUMS_SLUG', 'forums' );
-
 if ( !defined( 'BB_PATH' ) )
         require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress.php' );
@@ -14 +11 @@
 require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-filters.php' );
 
+/**
+ * Puts important forums component data into the $bp global for later use.
+ *
+ * @package BuddyPress Forums
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ */
 function bp_forums_setup() {
         global $bp;
-
-        /* For internal identification */
+        
+        if ( !defined( 'BP_FORUMS_SLUG' ) )
+                define ( 'BP_FORUMS_SLUG', $bp->pages->forums->slug );
+
+        // For internal identification
         $bp->forums->id = 'forums';
 
@@ -26 +32 @@
                 $bp->forums->bbconfig = $bp->site_options['bb-config-location'];
 
-        /* Register this in the active components array */
+        // Register this in the active components array
         $bp->active_components[$bp->forums->slug] = $bp->forums->id;
+
+        // The default text for the forums directory search box
+        $bp->default_search_strings[$bp->forums->slug] = __( 'Search Forum Topics...', 'buddypress' ); 
 
         do_action( 'bp_forums_setup' );

trunk/bp-forums/bp-forums-templatetags.php

@@ -1029 +1029 @@
         global $bp;
 
-        $search_value = __( 'Search anything...', 'buddypress' );
-        if ( !empty( $_REQUEST['fs'] ) )
-                $search_value = stripslashes( $_REQUEST['fs'] );
+        $default_search_value = bp_get_search_default_text(); 
+        $search_value = !empty( $_REQUEST['fs'] ) ? stripslashes( $_REQUEST['fs'] ) : $default_search_value; 
 
 ?>
         <form action="" method="get" id="search-forums-form">
-                <label><input type="text" name="s" id="forums_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+                <label><input type="text" name="s" id="forums_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
                 <input type="submit" id="forums_search_submit" name="forums_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
         </form>

trunk/bp-groups.php

@@ -5 +5 @@
 require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-filters.php' );
 
+/**
+ * Puts important groups component data into the $bp global for later use.
+ *
+ * @package BuddyPress Groups
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ */
 function groups_setup_globals() {
-        global $bp, $wpdb;
+        global $bp;
 
         if ( !defined( 'BP_GROUPS_SLUG' ) )
@@ -40 +46 @@
         // Auto join group when non group member performs group activity
         $bp->groups->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) ? false : true;
+
+        // The default text for the groups directory search box
+        $bp->default_search_strings[$bp->groups->slug] = __( 'Search Groups...', 'buddypress' ); 
 
         do_action( 'groups_setup_globals' );

trunk/bp-groups/bp-groups-templatetags.php

@@ -1872 +1872 @@
         global $bp;
 
-        $search_value = __( 'Search anything...', 'buddypress' );
-        if ( !empty( $_REQUEST['s'] ) )
-                $search_value = stripslashes( $_REQUEST['s'] );
+        $default_search_value = bp_get_search_default_text(); 
+        $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; 
 
 ?>
         <form action="" method="get" id="search-groups-form">
-                <label><input type="text" name="s" id="groups_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+                <label><input type="text" name="s" id="groups_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
                 <input type="submit" id="groups_search_submit" name="groups_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
         </form>

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -54 +54 @@
                 $qs[] = 'page=' . $_POST['page'];
 
-        if ( !empty( $_POST['search_terms'] ) && __( 'Search anything...', 'buddypress' ) != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
+        $object_search_text = bp_get_search_default_text( $object ); 
+        if ( !empty( $_POST['search_terms'] ) && $object_search_text != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] ) 
                 $qs[] = 'search_terms=' . $_POST['search_terms'];