Show
Ignore:
Timestamp:
12/13/05 21:32:46 (3 years ago)
Author:
dougal
Message:

Fix user cookie verification.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.5/wp-includes/pluggable-functions.php

    r2780 r3304  
    1010    // *** retrieving user's data from cookies and db - no spoofing 
    1111 
    12     if (isset($_COOKIE['wordpressuser_' . COOKIEHASH]))  
     12    if ( wp_login($_COOKIE['wordpressuser_' . COOKIEHASH], $_COOKIE['wordpresspass_' . COOKIEHASH], true) ) { 
    1313        $user_login = $_COOKIE['wordpressuser_' . COOKIEHASH]; 
    14     $userdata = get_userdatabylogin($user_login); 
    15     $user_level = $userdata->user_level; 
    16     $user_ID = $userdata->ID; 
    17     $user_nickname = $userdata->user_nickname; 
    18     $user_email = $userdata->user_email; 
    19     $user_url = $userdata->user_url; 
    20     $user_pass_md5 = md5($userdata->user_pass); 
    21  
    22     $idmode = $userdata->user_idmode; 
    23     if ($idmode == 'nickname')  $user_identity = $userdata->user_nickname; 
    24     if ($idmode == 'login')     $user_identity = $userdata->user_login; 
    25     if ($idmode == 'firstname') $user_identity = $userdata->user_firstname; 
    26     if ($idmode == 'lastname')  $user_identity = $userdata->user_lastname; 
    27     if ($idmode == 'namefl')    $user_identity = $userdata->user_firstname.' '.$userdata->user_lastname; 
    28     if ($idmode == 'namelf')    $user_identity = $userdata->user_lastname.' '.$userdata->user_firstname; 
    29     if (!$idmode) $user_identity = $userdata->user_nickname; 
     14        $userdata = get_userdatabylogin($user_login); 
     15        $user_level = $userdata->user_level; 
     16        $user_ID = $userdata->ID; 
     17        $user_nickname = $userdata->user_nickname; 
     18        $user_email = $userdata->user_email; 
     19        $user_url = $userdata->user_url; 
     20        $user_pass_md5 = md5($userdata->user_pass); 
     21 
     22        $idmode = $userdata->user_idmode; 
     23        switch($userdata->user_idmode) { 
     24            case 'login': 
     25                $user_identity = $userdata->user_login; 
     26                break; 
     27            case 'firstname': 
     28                $user_identity = $userdata->user_firstname; 
     29                break; 
     30            case 'lastname': 
     31                $user_identity = $userdata->user_lastname; 
     32                break; 
     33            case 'namefl': 
     34                $user_identity = $userdata->user_firstname.' '.$userdata->user_lastname; 
     35                break; 
     36            case 'namelf': 
     37                $user_identity = $userdata->user_lastname.' '.$userdata->user_firstname; 
     38                break; 
     39            case 'nickname': 
     40            default: 
     41                $user_identity = $userdata->user_nickname; 
     42                break; 
     43        } 
     44    } 
    3045} 
    3146endif;