golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Author description field. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2004-01-01 00:55:31 +00:00
parent cbee61601c
commit 92c031cd84
4 changed files with 99 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/menu.php
View File

@ -19,7 +19,7 @@ foreach ($menu as $item) {
?> ?>
<li><a href="javascript:profile(<?php echo $user_ID ?>)">My Profile</a></li> <li><a href="profile.php">My Profile</a></li>
<li><a href="<?php echo "$siteurl/$blogfilename"; ?>">View site</a></li> <li><a href="<?php echo "$siteurl/$blogfilename"; ?>">View site</a></li>
<li class="last"><a href="<?php echo $siteurl ?>/wp-login.php?action=logout">Logout (<?php echo stripslashes($user_nickname) ?>)</a></li> <li class="last"><a href="<?php echo $siteurl ?>/wp-login.php?action=logout">Logout (<?php echo stripslashes($user_nickname) ?>)</a></li>
</ul> </ul>

195
wp-admin/profile.php
View File

@ -35,13 +35,10 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
} }
require_once('../wp-config.php'); require_once('../wp-config.php');
require_once(ABSPATH.WPINC.'/functions.php'); require_once('auth.php');
switch($action) { switch($action) {
case 'update': case 'update':
require_once('auth.php');
get_currentuserinfo(); get_currentuserinfo();
@ -82,48 +79,36 @@ case 'update':
setcookie("wordpresspass_".$cookiehash,md5($newuser_pass),time()+31536000); setcookie("wordpresspass_".$cookiehash,md5($newuser_pass),time()+31536000);
} }
$newuser_firstname=addslashes($HTTP_POST_VARS["newuser_firstname"]); $newuser_firstname=addslashes(stripslashes($HTTP_POST_VARS['newuser_firstname']));
$newuser_lastname=addslashes($HTTP_POST_VARS["newuser_lastname"]); $newuser_lastname=addslashes(stripslashes($HTTP_POST_VARS['newuser_lastname']));
$newuser_nickname=addslashes($HTTP_POST_VARS["newuser_nickname"]); $newuser_nickname=addslashes(stripslashes($HTTP_POST_VARS['newuser_nickname']));
$newuser_icq=addslashes($HTTP_POST_VARS["newuser_icq"]); $newuser_icq=addslashes(stripslashes($HTTP_POST_VARS['newuser_icq']));
$newuser_aim=addslashes($HTTP_POST_VARS["newuser_aim"]); $newuser_aim=addslashes(stripslashes($HTTP_POST_VARS['newuser_aim']));
$newuser_msn=addslashes($HTTP_POST_VARS["newuser_msn"]); $newuser_msn=addslashes(stripslashes($HTTP_POST_VARS['newuser_msn']));
$newuser_yim=addslashes($HTTP_POST_VARS["newuser_yim"]); $newuser_yim=addslashes(stripslashes($HTTP_POST_VARS['newuser_yim']));
$newuser_email=addslashes($HTTP_POST_VARS["newuser_email"]); $newuser_email=addslashes(stripslashes($HTTP_POST_VARS['newuser_email']));
$newuser_url=addslashes($HTTP_POST_VARS["newuser_url"]); $newuser_url=addslashes(stripslashes($HTTP_POST_VARS['newuser_url']));
$newuser_idmode=addslashes($HTTP_POST_VARS["newuser_idmode"]); $newuser_idmode=addslashes(stripslashes($HTTP_POST_VARS['newuser_idmode']));
$user_description = addslashes(stripslashes($HTTP_POST_VARS['user_description']));
$query = "UPDATE $tableusers SET user_firstname='$newuser_firstname', ".$updatepassword."user_lastname='$newuser_lastname', user_nickname='$newuser_nickname', user_icq='$newuser_icq', user_email='$newuser_email', user_url='$newuser_url', user_aim='$newuser_aim', user_msn='$newuser_msn', user_yim='$newuser_yim', user_idmode='$newuser_idmode' WHERE ID = $user_ID"; $query = "UPDATE $tableusers SET user_firstname='$newuser_firstname', $updatepassword user_lastname='$newuser_lastname', user_nickname='$newuser_nickname', user_icq='$newuser_icq', user_email='$newuser_email', user_url='$newuser_url', user_aim='$newuser_aim', user_msn='$newuser_msn', user_yim='$newuser_yim', user_idmode='$newuser_idmode', user_description = '$user_description' WHERE ID = $user_ID";
$result = $wpdb->query($query); $result = $wpdb->query($query);
if (!$result) { if (!$result) {
die ("<strong>ERROR</strong>: couldn't update your profile... please contact the <a href=\"mailto:$admin_email\">webmaster</a> !<br /><br />$query<br /><br />"); die ("<strong>ERROR</strong>: couldn't update your profile... please contact the <a href=\"mailto:$admin_email\">webmaster</a> !<br /><br />$query<br /><br />");
} }
header('Location: profile.php?updated=true');
?>
<html>
<body onload="window.close();">
Profile updated!<br />
If this window doesn't close itself, close it yourself :p
</body>
</html>
<?php
break; break;
case 'viewprofile': case 'viewprofile':
require_once('auth.php');
$profiledata = get_userdata($user); $profiledata = get_userdata($user);
if ($HTTP_COOKIE_VARS['wordpressuser_'.$cookiehash] == $profiledata->user_login) if ($HTTP_COOKIE_VARS['wordpressuser_'.$cookiehash] == $profiledata->user_login)
header ('Location: profile.php'); header ('Location: profile.php');
$profile = 1; include_once('admin-header.php');
include('admin-header.php');
?> ?>
<h1 id="wphead"><a href="http://wordpress.org" rel="external"><span>WordPress</span></a></h1>
<h2>View Profile &#8220; <h2>View Profile &#8220;
<?php <?php
switch($profiledata->user_idmode) { switch($profiledata->user_idmode) {
@ -192,8 +177,6 @@ break;
case 'IErightclick': case 'IErightclick':
$profile = 1;
include ('admin-header.php');
$bookmarklet_tbpb = ($use_trackback) ? '&trackback=1' : ''; $bookmarklet_tbpb = ($use_trackback) ? '&trackback=1' : '';
$bookmarklet_tbpb .= ($use_pingback) ? '&pingback=1' : ''; $bookmarklet_tbpb .= ($use_pingback) ? '&pingback=1' : '';
@ -230,8 +213,7 @@ break;
default: default:
$profile = 1; include_once('admin-header.php');
include ('admin-header.php');
$profiledata=get_userdata($user_ID); $profiledata=get_userdata($user_ID);
$bookmarklet_tbpb = ($use_trackback) ? '&trackback=1' : ''; $bookmarklet_tbpb = ($use_trackback) ? '&trackback=1' : '';
@ -239,7 +221,12 @@ default:
$bookmarklet_height= ($use_trackback) ? 480 : 440; $bookmarklet_height= ($use_trackback) ? 480 : 440;
?> ?>
<h1 id="wphead"><a href="http://wordpress.org" rel="external"><span>WordPress</span></a></h1> <?php if ($updated) { ?>
<div class="wrap">
<p><strong>Profile updated.</strong></p>
</div>
<?php } ?>
<div class="wrap">
<form name="profile" id="profile" action="profile.php" method="post"> <form name="profile" id="profile" action="profile.php" method="post">
<h2>Edit Your Profile</h2> <h2>Edit Your Profile</h2>
<p> <p>
@ -253,76 +240,86 @@ default:
echo $posts; echo $posts;
?> ?>
| <strong>Login:</strong> <?php echo $profiledata->user_login ?></p> | <strong>Login:</strong> <?php echo $profiledata->user_login ?></p>
<div class="left"> <style type="text/css" media="screen">
<p> th { text-align: right; }
<label for="newuser_firstname">First:</label> </style>
<input type="text" name="newuser_firstname" id="newuser_firstname" value="<?php echo $profiledata->user_firstname ?>" /> <table width="99%" border="0" cellspacing="2" cellpadding="3">
</p> <tr>
<p> <th width="15%" scope="row">First:</th>
<label for="">Last:</label> <td><input type="text" name="newuser_firstname" id="newuser_firstname" value="<?php echo $profiledata->user_firstname ?>" /></td>
<input type="text" name="newuser_lastname" id="newuser_lastname" value="<?php echo $profiledata->user_lastname ?>" /> </tr>
</p> <tr>
<p> <th scope="row">Last:</th>
<label for="newuser_nickname">Nickname:</label> <td><input type="text" name="newuser_lastname" id="newuser_lastname2" value="<?php echo $profiledata->user_lastname ?>" /></td>
<input type="text" name="newuser_nickname" id="newuser_nickname" value="<?php echo $profiledata->user_nickname ?>" /> </tr>
</p> <tr>
<p> <th scope="row">Description:</th>
<label for="newuser_email">Email:</label> <td><textarea name="user_description" rows="5" id="textarea2" style="width: 99%; "><?php echo $profiledata->user_description ?></textarea></td>
<input type="text" name="newuser_email" id="newuser_email" value="<?php echo $profiledata->user_email ?>" /> </tr>
</p> <tr>
<p> <th scope="row">Nickname:</th>
<label for="newuser_url">URL:</label> <td><input type="text" name="newuser_nickname" id="newuser_nickname2" value="<?php echo $profiledata->user_nickname ?>" /></td>
<input type="text" name="newuser_url" id="newuser_url" value="<?php echo $profiledata->user_url ?>" /> </tr>
</p> <tr>
<p> <th scope="row">Email:</th>
<label for="newuser_icq">ICQ:</label> <td><input type="text" name="newuser_email" id="newuser_email2" value="<?php echo $profiledata->user_email ?>" /></td>
<input type="text" name="newuser_icq" id="newuser_icq" value="<?php if ($profiledata->user_icq > 0) { echo $profiledata->user_icq; } ?>" /> </tr>
</p> <tr>
<p> <th scope="row">URI:</th>
<label for="newuser_aim">AIM:</label> <td><input type="text" name="newuser_url" id="newuser_url2" value="<?php echo $profiledata->user_url ?>" /></td>
<input type="text" name="newuser_aim" id="newuser_aim" value="<?php echo $profiledata->user_aim ?>" /> </tr>
</p> <tr>
<p> <th scope="row">ICQ:</th>
<label for="newuser_msn">MSN IM:</label> <td><input type="text" name="newuser_icq" id="newuser_icq2" value="<?php if ($profiledata->user_icq > 0) { echo $profiledata->user_icq; } ?>" /></td>
<input type="text" name="newuser_msn" id="newuser_msn" value="<?php echo $profiledata->user_msn ?>" /> </tr>
</p> <tr>
<p> <th scope="row">AIM:</th>
<label for="newuser_yim">Yahoo IM:</label> <td><input type="text" name="newuser_aim" id="newuser_aim2" value="<?php echo $profiledata->user_aim ?>" /></td>
<input type="text" name="newuser_yim" id="newuser_yim" value="<?php echo $profiledata->user_yim ?>" /> </tr>
</p> <tr>
</div> <th scope="row">MSN IM: </th>
<div class="right"> <td><input type="text" name="newuser_msn" id="newuser_msn2" value="<?php echo $profiledata->user_msn ?>" /></td>
<p><strong>Identity</strong> on the blog: </tr>
<select name="newuser_idmode"> <tr>
<option value="nickname"<?php <th scope="row">Yahoo IM: </th>
<td> <input type="text" name="newuser_yim" id="newuser_yim2" value="<?php echo $profiledata->user_yim ?>" /> </td>
</tr>
<tr>
<th scope="row">Identity on blog: </th>
<td><select name="newuser_idmode">
<option value="nickname"<?php
if ($profiledata->user_idmode == 'nickname') if ($profiledata->user_idmode == 'nickname')
echo " selected"; ?>><?php echo $profiledata->user_nickname ?></option> echo " selected"; ?>><?php echo $profiledata->user_nickname ?></option>
<option value="login"<?php <option value="login"<?php
if ($profiledata->user_idmode=="login") if ($profiledata->user_idmode=="login")
echo " selected"; ?>><?php echo $profiledata->user_login ?></option> echo " selected"; ?>><?php echo $profiledata->user_login ?></option>
<option value="firstname"<?php <option value="firstname"<?php
if ($profiledata->user_idmode=="firstname") if ($profiledata->user_idmode=="firstname")
echo " selected"; ?>><?php echo $profiledata->user_firstname ?></option> echo " selected"; ?>><?php echo $profiledata->user_firstname ?></option>
<option value="lastname"<?php <option value="lastname"<?php
if ($profiledata->user_idmode=="lastname") if ($profiledata->user_idmode=="lastname")
echo " selected"; ?>><?php echo $profiledata->user_lastname ?></option> echo " selected"; ?>><?php echo $profiledata->user_lastname ?></option>
<option value="namefl"<?php <option value="namefl"<?php
if ($profiledata->user_idmode=="namefl") if ($profiledata->user_idmode=="namefl")
echo " selected"; ?>><?php echo $profiledata->user_firstname." ".$profiledata->user_lastname ?></option> echo " selected"; ?>><?php echo $profiledata->user_firstname." ".$profiledata->user_lastname ?></option>
<option value="namelf"<?php <option value="namelf"<?php
if ($profiledata->user_idmode=="namelf") if ($profiledata->user_idmode=="namelf")
echo " selected"; ?>><?php echo $profiledata->user_lastname." ".$profiledata->user_firstname ?></option> echo " selected"; ?>><?php echo $profiledata->user_lastname." ".$profiledata->user_firstname ?></option>
</select> </select> </td>
</p> </tr>
<p> <br /> <tr>
New <strong>Password</strong> (Leave blank to stay the same.)<br /> <th scope="row">New <strong>Password</strong> (Leave blank to stay the same.)</th>
<input type="password" name="pass1" size="16" value="" /> <td><input type="password" name="pass1" size="16" value="" />
<input type="password" name="pass2" size="16" value="" /> <input type="password" name="pass2" size="16" value="" /></td>
</p> </tr>
</table>
<?php if ($is_gecko) { ?> <p style=" text-align: center;">
<br /> <input class="search" type="submit" value="Update" name="submit" /></p>
<br /> </div>
</form>
</div>
<?php if ($is_gecko) { ?>
<div class="wrap">
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
function addPanel() function addPanel()
{ {
@ -335,19 +332,13 @@ function addPanel()
<strong>SideBar</strong><br /> <strong>SideBar</strong><br />
Add the <a href="#" onclick="addPanel()">WordPress Sidebar</a>! Add the <a href="#" onclick="addPanel()">WordPress Sidebar</a>!
<?php } elseif (($is_winIE) || ($is_macIE)) { ?> <?php } elseif (($is_winIE) || ($is_macIE)) { ?>
<br />
<br />
<strong>SideBar</strong><br /> <strong>SideBar</strong><br />
Add this link to your favorites:<br /> Add this link to your favorites:<br />
<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo $siteurl ?>/wp-admin/sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))">WordPress <a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo $siteurl ?>/wp-admin/sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))">WordPress
Sidebar</a>. Sidebar</a>.
<?php } ?>
</p> </div>
<p style="clear: both; text-align: center;"> <?php } ?>
<input class="search" type="submit" value="Update and Close Window" name="submit" /></p>
</div>
</form>
<?php <?php
break; break;

1
wp-includes/functions.php
View File

@ -418,6 +418,7 @@ function get_userdata($userid) {
$user->user_lastname = stripslashes($user->user_lastname); $user->user_lastname = stripslashes($user->user_lastname);
$user->user_firstname = stripslashes($user->user_firstname); $user->user_firstname = stripslashes($user->user_firstname);
$user->user_lastname = stripslashes($user->user_lastname); $user->user_lastname = stripslashes($user->user_lastname);
$user->user_description = stripslashes($user->user_description);
$cache_userdata[$userid] = $user; $cache_userdata[$userid] = $user;
} else { } else {
$user = $cache_userdata[$userid]; $user = $cache_userdata[$userid];

5
wp-includes/template-functions.php
View File

@ -781,7 +781,10 @@ function the_author() {
if ($i == 'namelf') echo $authordata->user_lastname.' '.$authordata->user_firstname; if ($i == 'namelf') echo $authordata->user_lastname.' '.$authordata->user_firstname;
if (!$i) echo $authordata->user_nickname; if (!$i) echo $authordata->user_nickname;
} }
function the_author_description() {
global $authordata;
echo $authordata->user_description;
}
function the_author_login() { function the_author_login() {
global $id,$authordata; echo $authordata->user_login; global $id,$authordata; echo $authordata->user_login;
} }