Changeset 817

Timestamp:

12/30/2008 05:44:15 PM (16 years ago)

Author:

apeatling

Message:

Adding filters to the header search form.

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (1 diff)
• buddypress-theme/buddypress-home/header.php (modified) (1 diff)
• buddypress-theme/member-themes/buddypress-member/header.php (modified) (1 diff)

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

@@ -459 +459 @@
     global $bp;
     
-    echo site_url('search');
+    return apply_filters( 'bp_search_form_action', site_url('search') );
 }
 
 function bp_search_form_type_select() {
     // Eventually this won't be needed and a page will be built to integrate all search results.
-?>
-    <select name="search-which" id="search-which" style="width: auto">
+    $selection_box = '<select name="search-which" id="search-which" style="width: auto">';
+    
+    if ( function_exists( 'xprofile_install' ) ) {
+        $selection_box .= '<option value="members">' . __( 'Members', 'buddypress' ) . '</option>';
+    }
+    
+    if ( function_exists( 'groups_install' ) ) {
+        $selection_box .= '<option value="groups">' . __( 'Groups', 'buddypress' ) . '</option>';
+    }
+    
+    if ( function_exists( 'bp_blogs_install' ) ) {
+        $selection_box .= '<option value="blogs">' . __( 'Blogs', 'buddypress' ) . '</option>';
+    }
+            
+    $selection_box .= '</select>';
+    
+    return apply_filters( 'bp_search_form_type_select', $selection_box );
+}
+
+function bp_search_form() {
+    $form = '
+        <form action="' . bp_search_form_action() . '" method="post" id="search-form">
+            <input type="text" id="search-terms" name="search-terms" value="" /> 
+            ' . bp_search_form_type_select() . '
         
-        <?php if ( function_exists( 'xprofile_install' ) ) { ?>
-        <option value="members"><?php _e( 'Members', 'buddypress' ) ?></option>
-        <?php } ?>
-        
-        <?php if ( function_exists( 'groups_install' ) ) { ?>
-        <option value="groups"><?php _e( 'Groups', 'buddypress' ) ?></option>
-        <?php } ?>
-        
-        <?php if ( function_exists( 'bp_blogs_install' ) ) { ?>
-        <option value="blogs"><?php _e( 'Blogs', 'buddypress' ) ?></option>
-        <?php } ?>
-        
-        <?php do_action( 'bp_search_form_type_select_options') ?>
-    </select>
-<?php
+            <input type="submit" name="search-submit" id="search-submit" value="' . __( 'Search', 'buddypress' ) . '" />
+        </form>
+    ';
+    
+    echo apply_filters( 'bp_search_form', $form );
 }
 

trunk/buddypress-theme/buddypress-home/header.php

@@ -31 +31 @@
     
     <div id="search-login-bar">
-        <form action="<?php bp_search_form_action() ?>" method="post" id="search-form">
-            <input type="text" id="search-terms" name="search-terms" value="" /> 
-            <?php bp_search_form_type_select() ?>
-
-            <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
-        </form>
+        <?php bp_search_form() ?>
         
         <?php if ( !is_user_logged_in() ) : ?>

trunk/buddypress-theme/member-themes/buddypress-member/header.php

@@ -28 +28 @@
 
 <div id="search-login-bar">
-    <form action="<?php bp_search_form_action() ?>" method="post" id="search-form">
-        <input type="text" id="search-terms" name="search-terms" value="" /> 
-        <?php bp_search_form_type_select() ?>
-        
-        <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
-    </form>
+    <?php bp_search_form() ?>
 
     <?php if ( !is_user_logged_in() ) : ?>