Merge commit 'mike/master'

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index 7ad7ef211861d980862aa581cadf67713630c858..5c41fbfad89066c0c0df70c59f47de81a7d61521 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -36,9 +36,17 @@ function register_post(&$a) {
        $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']))      : '');
+       $publish    = ((x($_POST,'profile_publish_reg') && intval($_POST['profile_publish_reg'])) ? 1 : 0);
 
+       $netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
+               
+       $tmp_str = $openid_url;
        if((! x($username)) || (! x($email)) || (! x($nickname))) {
                if($openid_url) {
+                       if(! validate_url($tmp_str)) {
+                               notice( t('Invalid OpenID url') . EOL);
+                               return;
+                       }
                        $_SESSION['register'] = 1;
                        $_SESSION['openid'] = $openid_url;
                        require_once('library/openid.php');
@@ -55,6 +63,10 @@ function register_post(&$a) {
                return;
        }
 
+       if(! validate_url($tmp_str))
+               $openid_url = '';
+
+
        $err = '';
 
 
@@ -82,6 +94,12 @@ function register_post(&$a) {
        if((! valid_email($email)) || (! validate_email($email)))
                $err .= t('Not a valid email address.') . EOL;
 
+       // Disallow somebody creating an account using openid that uses the admin email address,
+       // since openid bypasses email verification.
+
+       if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url))
+               $err .= t('Cannot use that email.') . EOL;
+
        $nickname = $_POST['nickname'] = strtolower($nickname);
 
        if(! preg_match("/^[a-z][a-z0-9\-\_]*$/",$nickname))
@@ -123,7 +141,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
@@ -138,8 +169,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),
@@ -149,6 +180,7 @@ function register_post(&$a) {
                dbesc($prvkey),
                dbesc($spubkey),
                dbesc($sprvkey),
+               dbesc(datetime_convert()),
                intval($verified),
                intval($blocked)
                );
@@ -168,14 +200,16 @@ function register_post(&$a) {
        }               
 
        if(x($newuid) !== false) {
-               $r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb` )
-                       VALUES ( %d, '%s', %d, '%s', '%s', '%s' ) ",
+               $r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
+                       VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
                        intval($newuid),
                        'default',
                        1,
                        dbesc($username),
                        dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
-                       dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg")
+                       dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
+                       intval($publish),
+                       intval($netpublish)
 
                );
                if($r === false) {
@@ -330,11 +364,15 @@ function register_content(&$a) {
 
        $block = get_config('system','block_extended_register');
 
-       if((($a->config['register_policy'] == REGISTER_CLOSED) && (! getuid())) || ($block)) {
+       if((($a->config['register_policy'] == REGISTER_CLOSED) && (! local_user())) || ($block)) {
                notice("Permission denied." . EOL);
                return;
        }
 
+       if(x($_SESSION,'theme'))
+               unset($_SESSION['theme']);
+
+
        $username     = ((x($_POST,'username'))     ? $_POST['username']     : ((x($_GET,'username'))     ? $_GET['username']              : ''));
        $email        = ((x($_POST,'email'))        ? $_POST['email']        : ((x($_GET,'email'))        ? $_GET['email']                 : ''));
        $openid_url   = ((x($_POST,'openid_url'))   ? $_POST['openid_url']   : ((x($_GET,'openid_url'))   ? $_GET['openid_url']            : ''));
@@ -356,6 +394,25 @@ function register_content(&$a) {
                $oidlabel = t("Your OpenID \x28optional\x29: ");
        }
 
+       if(get_config('system','publish_all')) {
+               $profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />';
+       }
+       else {
+               $publish_tpl = load_view_file("view/profile_publish.tpl");
+               $profile_publish = replace_macros($publish_tpl,array(
+                       '$instance'     => 'reg',
+                       '$pubdesc'      => t('Include your profile in member directory?'),
+                       '$yes_selected' => ' checked="checked" ',
+                       '$no_selected'  => '',
+                       '$str_yes'      => t('Yes'),
+                       '$str_no'       => t('No')
+               ));
+       }
+
+
+       $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,
@@ -372,10 +429,12 @@ function register_content(&$a) {
                '$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'),
                '$nicklabel' => t('Choose a nickname: '),
                '$photo'     => $photo,
+               '$publish'   => $profile_publish,
                '$regbutt'   => t('Register'),
                '$username'  => $username,
                '$email'     => $email,
                '$nickname'  => $nickname,
+               '$license'   => $license,
                '$sitename'  => $a->get_hostname()
        ));
        return $o;