Changeset 2827

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.

Location:

branches/plugin

Files:

• bbp-includes/bbp-general-template.php (modified) (5 diffs)
• bbp-includes/bbp-hooks.php (modified) (1 diff)
• bbp-includes/bbp-user-template.php (modified) (2 diffs)
• bbp-includes/bbp-widgets.php (modified) (3 diffs)
• bbp-themes/bbp-twentyten/css/bbpress.css (modified) (1 diff)

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 );
+    }
+
 ?>

branches/plugin/bbp-includes/bbp-hooks.php

@@ -69 +69 @@
 
 // Widgets
+add_action( 'widgets_init', create_function( '', 'return register_widget("BBP_Login_Widget");'   ) );
 add_action( 'widgets_init', create_function( '', 'return register_widget("BBP_Forums_Widget");'  ) );
 add_action( 'widgets_init', create_function( '', 'return register_widget("BBP_Topics_Widget");'  ) );

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

@@ -362 +362 @@
         return apply_filters( 'bbp_get_user_edit_profile_url', $url, $user_id, $user_nicename );
 
+    }
+
+/**
+ * Output the link to the admin section
+ *
+ * @since bbPress (r)
+ *
+ * @param mixed $args Optional. See {@link bbp_get_admin_link()}
+ * @uses bbp_get_admin_link() To get the admin link
+ */
+function bbp_admin_link( $args = '' ) {
+    echo bbp_get_admin_link( $args );
+}
+    /**
+     * Return the link to the admin section
+     *
+     * @since bbPress (r)
+     *
+     * @param mixed $args Optional. This function supports these arguments:
+     *  - text: The text
+     *  - before: Before the lnk
+     *  - after: After the link
+     * @uses current_user_can() To check if the current user can moderate
+     * @uses admin_url() To get the admin url
+     * @uses apply_filters() Calls 'bbp_get_admin_link' with the link & args
+     * @return The link
+     */
+    function bbp_get_admin_link( $args = '' ) {
+        if ( !current_user_can( 'moderate' ) )
+            return;
+
+        if ( $args && is_string( $args ) && false === strpos( $args, '=' ) )
+            $args = array( 'text' => $args );
+
+        $defaults = array( 'text' => __( 'Admin', 'bbpress' ), 'before' => '', 'after' => '' );
+        $args     = wp_parse_args( $args, $defaults );
+        extract( $args, EXTR_SKIP );
+
+        $uri = admin_url();
+
+        return apply_filters( 'bbp_get_admin_link', $before . '<a href="' . $uri . '">' . $text . '</a>' . $after, $args );
     }
 
@@ -743 +784 @@
  */
 function bbp_logged_in_redirect( $url = '' ) {
-    if ( is_user_logged_in() ) {
-        $redirect_to = !empty( $url ) ? $url : bbp_get_user_profile_url( bbp_get_current_user_id() );
-        wp_safe_redirect( $redirect_to );
-        exit;
-    }
+    if ( !is_user_logged_in() )
+        return;
+
+    $redirect_to = !empty( $url ) ? $url : bbp_get_user_profile_url( bbp_get_current_user_id() );
+    wp_safe_redirect( $redirect_to );
+    exit;
 }
 

branches/plugin/bbp-includes/bbp-widgets.php

@@ -3 +3 @@
 /**
  * bbPress Widgets
+ *
+ * Contains the forum list, topic list, reply list and login form widgets.
  *
  * @package bbPress
  * @subpackage Widgets
  */
+
+/**
+ * bbPress Login Widget
+ *
+ * Adds a widget which displays the login form
+ *
+ * @since bbPress (r2827)
+ *
+ * @uses WP_Widget
+ */
+class BBP_Login_Widget extends WP_Widget {
+
+    /**
+     * bbPress Login Widget
+     *
+     * Registers the login widget
+     *
+     * @since bbPress (r2827)
+     *
+     * @uses apply_filters() Calls 'bbp_login_widget_options' with the
+     *                        widget options
+     */
+    function BBP_Login_Widget() {
+        $widget_ops = apply_filters( 'bbp_login_widget_options', array(
+            'classname'   => 'bbp_widget_login',
+            'description' => __( 'The login widget.', 'bbpress' )
+        ) );
+
+        parent::WP_Widget( false, __( 'bbPress Login Widget', 'bbpress' ), $widget_ops );
+    }
+
+    /**
+     * Displays the output, the login form
+     *
+     * @since bbPress (r2827)
+     *
+     * @param mixed $args Arguments
+     * @param array $instance Instance
+     * @uses apply_filters() Calls 'bbp_login_widget_title' with the title
+     * @uses get_template_part() To get the login/logged in form
+     */
+    function widget( $args, $instance ) {
+        extract( $args );
+
+        $title = apply_filters( 'bbp_login_widget_title', $instance['title'] );
+
+        echo $before_widget;
+
+        if ( !empty( $title ) )
+            echo $before_title . $title . $after_title;
+
+        if ( !is_user_logged_in() ) : ?>
+
+            <form method="post" action="<?php bbp_wp_login_action( array( 'context' => 'login_post' ) ); ?>" class="bbp-login-form">
+                <fieldset>
+                    <legend><?php _e( 'Login', 'bbpress' ); ?></legend>
+
+                    <?php do_action( 'bbp_template_notices' ); ?>
+
+                    <div class="bbp-username">
+                        <label for="user_login"><?php _e( 'Username', 'bbpress' ); ?>: </label>
+                        <input type="text" name="log" value="<?php bbp_sanitize_val( 'user_login', 'text' ); ?>" size="20" id="user_login" tabindex="<?php bbp_tab_index(); ?>" />
+                    </div>
+
+                    <div class="bbp-password">
+                        <label for="user_pass"><?php _e( 'Password', 'bbpress' ); ?>: </label>
+                        <input type="password" name="pwd" value="<?php bbp_sanitize_val( 'user_pass', 'password' ); ?>" size="20" id="user_pass" tabindex="<?php bbp_tab_index(); ?>" />
+                    </div>
+
+                    <div class="bbp-remember-me">
+                        <input type="checkbox" name="rememberme" value="forever" <?php checked( bbp_get_sanitize_val( 'rememberme', 'checkbox' ), true, true ); ?> id="rememberme" tabindex="<?php bbp_tab_index(); ?>" />
+                        <label for="rememberme"><?php _e( 'Keep me signed in', 'bbpress' ); ?></label>
+                    </div>
+
+                    <div class="bbp-submit-wrapper">
+
+                        <?php do_action( 'login_form' ); ?>
+
+                        <input type="submit" name="user-submit" value="<?php _e( 'Log In', 'bbpress' ); ?>" tabindex="<?php bbp_tab_index(); ?>" class="user-submit" />
+
+                        <?php bbp_user_login_fields(); ?>
+
+                    </div>
+                </fieldset>
+            </form>
+
+        <?php else : ?>
+
+            <div class="bbp-logged-in">
+                <a href="<?php echo bp_loggedin_user_domain(); ?>"><?php echo get_avatar( bbp_get_current_user_id(), '40' ); ?></a>
+                <h4><?php echo bbp_get_user_profile_link( bbp_get_current_user_id() ); ?></h4>
+
+                <?php bbp_logout_link(); ?>
+            </div>
+
+        <?php endif;
+
+        echo $after_widget;
+    }
+
+    /**
+     * Update the login widget options
+     *
+     * @since bbPress (r2827)
+     *
+     * @param array $new_instance The new instance options
+     * @param array $old_instance The old instance options
+     */
+    function update( $new_instance, $old_instance ) {
+        $instance          = $old_instance;
+        $instance['title'] = strip_tags( $new_instance['title'] );
+
+        return $instance;
+    }
+
+    /**
+     * Output the login widget options form
+     *
+     * @since bbPress (r2827)
+     *
+     * @param $instance Instance
+     * @uses BBP_Login_Widget::get_field_id() To output the field id
+     * @uses BBP_Login_Widget::get_field_name() To output the field name
+     */
+    function form( $instance ) {
+        $title = !empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : ''; ?>
+
+        <p>
+            <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'bbpress' ); ?>
+            <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></label>
+        </p>
+
+        <?php
+    }
+}
 
 /**
@@ -83 +220 @@
         <?php echo $after_widget;
 
-        endif;      
+        endif;
     }
 
@@ -279 +416 @@
      */
     function form( $instance ) {
-        $title     = !empty( $instance['title'] )     ? esc_attr( $instance['title']     ) : '';
+        $title     = !empty( $instance['title']     ) ? esc_attr( $instance['title']     ) : '';
         $max_shown = !empty( $instance['max_shown'] ) ? esc_attr( $instance['max_shown'] ) : '';
         $show_date = !empty( $instance['show_date'] ) ? esc_attr( $instance['show_date'] ) : '';

branches/plugin/bbp-themes/bbp-twentyten/css/bbpress.css

@@ -387 +387 @@
     color: #aaa;
 }
+
+/* =Widgets
+-------------------------------------------------------------- */
+
+.widget-area .bbp-login-form fieldset legend {
+    display: none;
+}
+
+.widget-area .bbp-login-form .bbp-username label,
+.widget-area .bbp-login-form .bbp-password label {
+    width: 70px;
+    display: inline-block;
+}
+.widget-area .bbp-login-form .bbp-username,
+.widget-area .bbp-login-form .bbp-password,
+.widget-area .bbp-login-form .bbp-remember-me,
+.widget-area .bbp-login-form .bbp-submit-wrapper {
+    margin-top: 10px;
+}
+
+.widget-area .bbp-login-form .bbp-remember-me {
+    float: left;
+}
+
+.widget-area .bbp-login-form .bbp-submit-wrapper {
+    float: right;
+}
+
+.widget-area .bbp-logged-in img.avatar {
+    float: left;
+    margin-right: 15px;
+}
+
+.widget-area .bbp-logged-in h4 {
+    font-weight: bold;
+    font-size: 1.3em;
+    display: inline;
+    clear: none;
+}
+
+.widget-area .bbp-logged-in a.logout-link {
+    display: block;
+}