From a26f4eeff6edcb49ad2e7607512853ddd24374cc Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Thu, 8 Jul 2010 20:25:05 -0700
Subject: [PATCH] new nickname policy

---
 mod/settings.php             | 2 ++
 view/profile.php             | 2 ++
 view/settings_nick_unset.tpl | 7 ++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mod/settings.php b/mod/settings.php
index 861be7946c..1abb60fccb 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -163,6 +163,8 @@ function settings_content(&$a) {
 
 	$nickname_block = replace_macros($nickname_block,array(
 		'$nickname' => $nickname,
+		'$uid' => $_SESSION['uid'],
+		'$basepath' => substr($a->get_baseurl(),strpos($a->get_baseurl(),'://') + 3), 
 		'$baseurl' => $a->get_baseurl()));	
 
 	$o = file_get_contents('view/settings.tpl');
diff --git a/view/profile.php b/view/profile.php
index 54087404ad..808e2dbaab 100644
--- a/view/profile.php
+++ b/view/profile.php
@@ -19,7 +19,9 @@
 	<?php } ?>
 
 	<div id="profile-extra-links">
+
 	<a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['uid']; ?>">Introductions</a>
+
 	</div>
 
 	<?php if ( (strlen($profile['address'])) 
diff --git a/view/settings_nick_unset.tpl b/view/settings_nick_unset.tpl
index 0ea99d68ba..903768b594 100644
--- a/view/settings_nick_unset.tpl
+++ b/view/settings_nick_unset.tpl
@@ -1,10 +1,11 @@
 
 <div id="settings-nick-wrapper" >
 <p id="settings-nickname-desc">
+Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>.
 Setting a nickname will allow a friendly profile URL such as
-<strong>$baseurl/profile/nickname</strong>
-Once set, it can never be changed. Only letter, numbers, spaces and 
-underscore are allowed and the nickname must start with a space. 
+<strong>'nickname@$basepath'</strong>.
+<br />
+Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed.
 </p>
 <label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
 <input type="text" name="nick" id="settings-nick" value="$nickname" />