Changeset 670

Timestamp:

02/05/07 22:49:56 (2 years ago)

Author:

mdawaffe

Message:

bb_get_current_user_info(), bb_get_user_email(). logged-in.php props so1o. fixes #512

Files:

• trunk/bb-admin/admin-functions.php (modified) (1 diff)
• trunk/bb-includes/akismet.php (modified) (3 diffs)
• trunk/bb-includes/registration-functions.php (modified) (2 diffs)
• trunk/bb-includes/template-functions.php (modified) (2 diffs)
• trunk/bb-templates/kakumei/logged-in.php (added)

trunk/bb-admin/admin-functions.php

@@ -187 +187 @@
-function bb_user_row( $user_id, $role = '', $email = false ) {
-        $user = bb_get_user( $user_id );
-
-
-
-
-
+
+
+
+
+
+
+
-        $r .= "\t\t<td>$user->user_registered</td>\n";
-_id
+->ID
-        return $r;
-}

trunk/bb-includes/akismet.php

@@ -58 +58 @@
-                        'permalink' => get_topic_link( $bb_post->topic_id ), // First page
-                        'comment_type' => 'forum',
-$user->user_login
-$user->user_email
-$user->user_url
+get_user_name( $user->ID )
+bb_get_user_email( $user->ID )
+get_user_link( $user->ID )
-                        'comment_content' => $bb_post->post_text,
-                        'comment_date_gmt' => $bb_post->post_time
@@ -77 +77 @@
-                        'permalink' => get_user_profile_link( $user->ID ),
-                        'comment_type' => 'profile',
-$user->user_login
-$user->user_email
-$user->user_url
+get_user_name( $user-ID )
+bb_get_user_email( $user->ID )
+get_user_link( $user->ID )
-                        'comment_content' => $user->occ . ' ' . $user->interests,
-                        'comment_date_gmt' => $user->user_registered
@@ -93 +93 @@
-                        'referrer' => $_SERVER['HTTP_REFERER'],
-                        'comment_type' => isset($_POST['topic_id']) ? 'forum' : 'profile',
-$bb_current_user->data->user_login
-$bb_current_user->data->user_email
-$bb_current_user->data->user_url
+bb_get_current_user_info( 'name' )
+bb_get_current_user_info( 'email' )
+bb_get_current_user_info( 'url' )
-                        'comment_content' => $submit
-                );

trunk/bb-includes/registration-functions.php

@@ -42 +42 @@
-        bb_update_usermeta( $user->ID, 'newpwdkey', $resetkey );
-        if ( $user ) :
-$user->user_email
+bb_get_user_email( $user->ID )
-
-%s
@@ -100 +100 @@
-        if ( $user ) :
-                $message = __("Your username is: %1\$s \nYour password is: %2\$s \nYou can now log in: %3\$s \n\nEnjoy!");
-$user->user_email
+bb_get_user_email( $user->ID )
-                        sprintf( $message, "$user->user_login", "$pass", bb_get_option('uri') ), 
-                        'From: ' . bb_get_option('admin_email') 

trunk/bb-includes/template-functions.php

@@ -101 +101 @@
-
-function login_form() {
-
-
-
-
-
-
-
+
+
+
-                bb_load_template( 'login-form.php' );
-}
@@ -1242 +1238 @@
-<p><strong>Note</strong>: Blocking a user does <em>not</em> block any IP addresses.'); ?></p>
-<?php
+}
+
+function bb_logout_link( $args = '' ) {
+        echo apply_filters( 'bb_logout_link', bb_get_logout_link( $args ), $args );
+}
+
+function bb_get_logout_link( $args = '' ) {
+        if ( $args && is_string($args) && false === strpos($args, '=') )
+                $args = array( 'text' => $args );
+
+        $defaults = array('text' => __('Log out'), 'before' => '', 'after' => '');
+        $args = bb_parse_args( $args, $defaults );
+        extract($args);
+
+        return apply_filters( 'bb_get_logout_link', "$before<a href='" . bb_get_option( 'uri' ) . "bb-login.php?logout'>$text</a>$after", $args );
+}
+
+function bb_admin_link( $args = '' ) {
+        echo apply_filters( 'bb_admin_link', bb_get_admin_link( $args ), $args );
+}
+
+function bb_get_admin_link( $args = '' ) {
+        if ( $args && is_string($args) && false === strpos($args, '=') )
+                $args = array( 'text' => $args );
+
+        $defaults = array('text' => __('Admin'), 'before' => '', 'after' => '');
+        $args = bb_parse_args( $args, $defaults );
+        extract($args);
+
+        return apply_filters( 'bb_get_admin_link', "$before<a href='" . bb_get_option( 'uri' ) . "bb-admin/'>$text</a>$after", $args );
+}
+
+function bb_profile_link( $args = '' ) {
+        global $bb_current_user;
+
+        $defaults = array( 'text' => __('View your profile'), 'before' => '', 'after' => '' );
+        $args = bb_parse_args( $args, $defaults );
+        echo apply_filters( 'bb_profile_link', "$before<a href='" . get_user_profile_link( $bb_current_user->ID ) . "'>$text</a>$after", $args );
+}
+
+function bb_current_user_info( $key = '' ) {
+        if ( !$key )
+                return;
+
+        echo apply_filters( 'bb_current_user_info', bb_get_current_user_info( $key ), $key );
+}
+        
+
+function bb_get_current_user_info( $key = '' ) {
+        if ( !is_string($key) )
+                return;
+        $user = bb_get_current_user(); // Not globalized
+
+        switch ( $key ) :
+        case '' :
+                return $user;
+                break;
+        case 'id' :
+        case 'ID' :
+                return $user->ID;
+                break;
+        case 'name' :
+        case 'login' :
+        case 'user_login' :
+                return get_user_name( $user->ID );
+                break;
+        case 'email' :
+        case 'user_email' :
+                return bb_get_user_email( $user->ID );
+                break;
+        case 'url' :
+        case 'uri' :
+        case 'user_url' :
+                return get_user_link( $user->ID );
+                break;
+        endswitch;
+}
+
+function bb_get_user_email( $id ) {
+        if ( !$user = bb_get_user( $id ) )
+                return false;
+
+        return apply_filters( 'bb_get_user_email', $user->user_email, $id );
-}
-