doco

diff --git a/boot.php b/boot.php
index bffd4ae2b1b13a941c3f2b5d8dc78ec5001fe4bf..fe6aee103c6374159f4d50691f9a302b069cd5db 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.947' );
+define ( 'FRIENDIKA_VERSION',      '2.1.948' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1051      );
 

diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
new file mode 100644 (file)
index 0000000..c7be3eb
--- /dev/null
+++ b/doc/Account-Basics.md
@@ -0,0 +1,65 @@
+Account Basics
+==============
+
+* [Home](help)
+
+
+**Registration**
+
+Not all Friendika sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page.
+
+*OpenID*
+
+The first field on the Registration page is for an OpenID address. If you do not have an OpenID address or do not wish to use OpenID, leave this field blank. If you have an OpenID account elsewhere and wish to use it, enter the address into this field and click 'Register'. Friendika will attempt to extract as much information as possible from your OpenID provider and return to this page with those items already filled in.
+
+*Your Full Name*
+
+Please provide your full name as you would like it to be displayed on this system.
+
+*Email Address*
+
+Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these once from your Settings page once you have logged in.     
+
+*Nickname*
+
+A nickname is used to generate web addresses for many of your personal pages, and is also treated like an email address when establishing communications with others. Due to the way that the nickname is used, it has some limitations. It must contain only US-ASCII text characters and numbers, and must also start with a text character. It also must be unique on this system. This is used in many places to identify your account, and once set - cannot be changed.
+
+
+
+*Directory Publishing*
+
+The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login.  
+
+
+*Register*
+
+Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Some sites may require administrator approval before the registration is processed, and you will be alerted if this is the case. Please watch your email (including spam folders) for your registration approval. 
+
+
+
+
+**Login Page**
+
+On the 'Login' page, please enter your login information that was provided during registration. You may use either your nickname or email address as a Login Name. 
+
+If you use your account to manage multiple '[Pages](help/Pages)' and these all have the same email address, please enter the nickname for the account you wish to manage.  
+
+*If* your account has been OpenID enabled, you may use your OpenID address as a login name and leave the password blank. You will be redirected to your OpenID provider to complete your authorisation. 
+
+Otherwise, enter your password. This will have been initially provided in your registration email message. Your password is case-sensitive, so please check your 'Caps Lock' key if you are having difficulty logging in. 
+
+
+**Changing Your Password**
+
+After your first login, please visit the 'Settings' page from the top menu bar and change your password to something that you will remember.
+
+
+**See Also**
+
+* [Profiles](help/Profiles)
+
+* [Groups and Privacy](help/Groups-and-Privacy)
+
+* [Remove Account](help/Remove-Account)
+
+ 
\ No newline at end of file

diff --git a/doc/Home.md b/doc/Home.md
index 2c9f901831c96014995c85564ec1ec29b2856672..4dccfde84646f2b9d2d2c5f2b49595660e562a64 100644 (file)
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -4,6 +4,7 @@ Friendika Documentation and Resources
 
 **Contents**
 
+* [Account Basics](help/Account-Basics)
 * [Making Friends](help/Making-Friends)
 * [Tags and Mentions](help/Tags-and-Mentions)
 * [Profiles](help/Profiles)

diff --git a/mod/register.php b/mod/register.php
index ec68aaef4c86f49f1f0f3125df5cad3df87415d0..5fe7c0c6dd2d310e660e3c83fdd37d2ccedfa86a 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -85,8 +85,11 @@ function register_post(&$a) {
        // So now we are just looking for a space in the full name. 
        
        $loose_reg = get_config('system','no_regfullname');
-       if((! $loose_reg) && (! strpos($username,' ')))
-               $err .= t("That doesn't appear to be your full \x28First Last\x29 name.") . EOL;
+       if(! $loose_reg) {
+               $username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
+               if(! strpos($username,' '))
+                       $err .= t("That doesn't appear to be your full \x28First Last\x29 name.") . EOL;
+       }
 
        if(! allowed_email($email))
                        $err .= t('Your email domain is not among those allowed on this site.') . EOL;

diff --git a/view/settings.tpl b/view/settings.tpl
index 162299f5d5aae22b0fffd8381606345a724efe85..0388bfe0beb16c8ba5b982be8be7ce8775d08822 100644 (file)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -10,6 +10,35 @@ $nickname_block
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
 
 
+<h3 class="settings-heading">$lbl_pass1</h3>
+
+
+<div id="settings-password-wrapper" >
+<p id="settings-password-desc" >
+$lbl_pass2
+</p>
+<label id="settings-password-label" for="settings-password" >$lbl_pass3 </label>
+<input type="password" id="settings-password" name="npassword" />
+</div>
+<div id="settings-password-end" ></div>
+
+<div id="settings-confirm-wrapper" >
+<label id="settings-confirm-label" for="settings-confirm" >$lbl_pass4 </label>
+<input type="password" id="settings-confirm" name="confirm" />
+</div>
+<div id="settings-confirm-end" ></div>
+
+<div id="settings-openid-wrapper" >
+       $oidhtml
+</div>
+<div id="settings-openid-end" ></div>
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
 <h3 class="settings-heading">$lbl_basic</h3>
 
 <div id="settings-username-wrapper" >
@@ -136,33 +165,6 @@ $profile_in_net_dir
 </div>
 
 
-<h3 class="settings-heading">$lbl_pass1</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-$lbl_pass2
-</p>
-<label id="settings-password-label" for="settings-password" >$lbl_pass3 </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >$lbl_pass4 </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
-       $oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
 
 
 <h3 class="settings-heading">$lbl_advn</h3>