new nickname policy

diff --git a/mod/settings.php b/mod/settings.php
index 861be7946c089df4033eb9ec68a8634d83cfbfc5..1abb60fccb1405e7229c56dc959cbb4eeee109e4 100644 (file)
--- 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 54087404adbd264c142ae4d2846f0f1501a7aa41..808e2dbaabde74c661721f8ebfd6314116686209 100644 (file)
--- a/view/profile.php
+++ b/view/profile.php
@@ -19,7 +19,9 @@
        <?php } ?>\r
 \r
        <div id="profile-extra-links">\r
+\r
        <a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['uid']; ?>">Introductions</a>\r
+\r
        </div>\r
 \r
        <?php if ( (strlen($profile['address'])) \r

diff --git a/view/settings_nick_unset.tpl b/view/settings_nick_unset.tpl
index 0ea99d68bafb5351cbcef845a7a69de5ebc8c60e..903768b5943680443f4907d94a3f010d9d6e58ba 100644 (file)
--- 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" />