Changeset 2827 for branches/plugin/bbp-includes/bbp-general-template.php

Timestamp:

02/03/2011 08:00:34 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Login widget, and various supporting styles and functions for a smarter redirect. Fixes #1464, #1465. Props GautamGupta for original patches.

File:

• branches/plugin/bbp-includes/bbp-general-template.php (modified) (5 diffs)

branches/plugin/bbp-includes/bbp-general-template.php

@@ -324 +324 @@
  * @since bbPress (r2815)
  *
- * @param str $url Pass a URL to redirect to
+ * @param string $url Pass a URL to redirect to
  * @uses add_query_arg() To add a arg to the url
  * @uses site_url() Toget the site url
@@ -356 +356 @@
  *
  * @param string $url Pass a URL to redirect to
- * @uses home_url() To get the url
+ * @uses wp_get_referer() To get the referer
+ * @uses esc_attr() To escape the url
  * @uses apply_filters() Calls 'bbp_redirect_to_field' with the referer field
  *                        and url
  */
 function bbp_redirect_to_field( $url = '' ) {
-    // If no URL is passed, use request
-    if ( empty( $url ) && !empty( $_SERVER['HTTP_REFERER'] ) )
-        $url = esc_url( $_SERVER['HTTP_REFERER'] );
+    // If no URL is passed, try to get the referer and then the request uri
+    if ( empty( $url ) && ( !$url = wp_get_referer() ) && ( !empty( $_SERVER['REQUEST_URI'] ) ) )
+        $url = $_SERVER['REQUEST_URI'];
+
+    $url = (string) esc_attr( $url );
 
     $referer_field = '<input type="hidden" name="redirect_to" value="' . $url . '" />';
@@ -411 +414 @@
         // Treat different kinds of fields in different ways
         switch ( $input_type ) {
-            case 'text' :
+            case 'text'     :
             case 'textarea' :
                 $retval = esc_attr( stripslashes( $pre_ret_val ) );
@@ -417 +420 @@
 
             case 'password' :
-            case 'select' :
-            case 'radio' :
+            case 'select'   :
+            case 'radio'    :
             case 'checkbox' :
             default :
@@ -1062 +1065 @@
 }
 
+/** Login/logout/register/lost pass *******************************************/
+
+/**
+ * Output the logout link
+ *
+ * @since bbPress (r)
+ *
+ * @param string $redirect_to Redirect to url
+ * @uses bbp_get_logout_link() To get the logout link
+ */
+function bbp_logout_link( $redirect_to = '' ) {
+    echo bbp_get_logout_link( $redirect_to );
+}
+    /**
+     * Return the logout link
+     *
+     * @since bbPress (r)
+     *
+     * @param string $redirect_to Redirect to url
+     * @uses wp_logout_url() To get the logout url
+     * @uses apply_filters() Calls 'bbp_get_logout_link' with the logout link and
+     *                        redirect to url
+     * @return string The logout link
+     */
+    function bbp_get_logout_link( $redirect_to = '' ) {
+        return apply_filters( 'bbp_get_logout_link', '<a href="' . wp_logout_url() . '" class="button logout-link">' . __( 'Log Out', 'bbpress' ) . '</a>', $redirect_to );
+    }
+
 ?>