email check failed, translate wall_item template

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index 57a15c0081904b68479ca8eb1b35af96dac0ecab..68c7297c90267a571a38b2202b766bd1f47905bc 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -30,17 +30,12 @@ function register_post(&$a) {
                break;
        }
 
-       if(x($_POST,'username'))
-               $username = notags(trim($_POST['username']));
-       if(x($_POST['nickname']))
-               $nickname = notags(trim($_POST['nickname']));
-       if(x($_POST,'email'))
-               $email = notags(trim($_POST['email']));
-       if(x($_POST,'openid_url'))
-               $openid_url = notags(trim($_POST['openid_url']));
-
-       $photo = ((x($_POST,'photo')) ? notags(trim($_POST['photo'])) : '');
 
+       $username   = ((x($_POST,'username'))   ? notags(trim($_POST['username']))   : '');
+       $nickname   = ((x($_POST,'nickname'))   ? notags(trim($_POST['nickname']))   : '');
+       $email      = ((x($_POST,'email'))      ? notags(trim($_POST['email']))      : '');
+       $openid_url = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
+       $photo      = ((x($_POST,'photo'))      ? notags(trim($_POST['photo']))      : '');
 
        if((! x($username)) || (! x($email)) || (! x($nickname))) {
                if($openid_url) {
@@ -71,14 +66,15 @@ function register_post(&$a) {
        // I don't really like having this rule, but it cuts down
        // on the number of auto-registrations by Russian spammers
        
-       $no_utf = get_config('system','no_utf');
-
-       $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); 
+       //  Using preg_match was completely unreliable, due to mixed UTF-8 regex support
+       //      $no_utf = get_config('system','no_utf');
+       //      $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); 
 
+       // So now we are just looking for a space in the full name. 
+       
        $loose_reg = get_config('system','no_regfullname');
-
-       if((! $loose_reg) && (! preg_match($pat,$username)))
-               $err .= t('That doesn\'t appear to be your full name.') . EOL;
+       if((! $loose_reg) && (! 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;
@@ -127,7 +123,20 @@ function register_post(&$a) {
        $pkey = openssl_pkey_get_details($res);
        $pubkey = $pkey["key"];
 
+       /**
+        *
+        * Create another keypair for signing/verifying
+        * salmon protocol messages. We have to use a slightly
+        * less robust key because this won't be using openssl
+        * but the phpseclib. Since it is PHP interpreted code
+        * it is not nearly as efficient, and the larger keys
+        * will take several minutes each to process.
+        *
+        */
+       
        $sres=openssl_pkey_new(array(
+               'digest_alg' => 'sha1',
+               'private_key_bits' => 512,
                'encrypt_key' => false ));
 
        // Get private key
@@ -142,8 +151,8 @@ function register_post(&$a) {
        $spubkey = $spkey["key"];
 
        $r = q("INSERT INTO `user` ( `username`, `password`, `email`, `openid`, `nickname`,
-               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `verified`, `blocked` )
-               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked` )
+               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
                dbesc($username),
                dbesc($new_password_encoded),
                dbesc($email),
@@ -153,6 +162,7 @@ function register_post(&$a) {
                dbesc($prvkey),
                dbesc($spubkey),
                dbesc($sprvkey),
+               dbesc(datetime_convert()),
                intval($verified),
                intval($blocked)
                );
@@ -345,15 +355,34 @@ function register_content(&$a) {
        $nickname     = ((x($_POST,'nickname'))     ? $_POST['nickname']     : ((x($_GET,'nickname'))     ? $_GET['nickname']              : ''));
        $photo        = ((x($_POST,'photo'))        ? $_POST['photo']        : ((x($_GET,'photo'))        ? hex2bin($_GET['photo'])        : ''));
 
+       $noid = get_config('system','no_openid');
+
+       if($noid) {
+               $oidhtml = '';
+               $fillwith = '';
+               $fillext = '';
+               $oidlabel = '';
+       }
+       else {
+               $oidhtml = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
+               $fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
+               $fillext =  t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
+               $oidlabel = t("Your OpenID \x28optional\x29: ");
+       }
+
+       $license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.');
+
+
        $o = load_view_file("view/register.tpl");
        $o = replace_macros($o, array(
+               '$oidhtml' => $oidhtml,
                '$regtitle'  => t('Registration'),
                '$registertext' =>((x($a->config,'register_text'))
                        ? '<div class="error-message">' . $a->config['register_text'] . '</div>'
                        : "" ),
-               '$fillwith'  => t('You may ' . "\x28" . 'optionally' . "\x29" . ' fill in this form via OpenID by supplying your OpenID and clicking ') . "'" . t('Register') . "'",
-               '$fillext'   => t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'),
-               '$oidlabel'  => t('Your OpenID ' . "\x28" . 'optional' . "\x29" . ': '),
+               '$fillwith'  => $fillwith,
+               '$fillext'   => $fillext,
+               '$oidlabel'  => $oidlabel,
                '$openid'    => $openid_url,
                '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
                '$addrlabel' => t('Your Email Address: '),
@@ -364,6 +393,7 @@ function register_content(&$a) {
                '$username'  => $username,
                '$email'     => $email,
                '$nickname'  => $nickname,
+               '$license'   => $license,
                '$sitename'  => $a->get_hostname()
        ));
        return $o;