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']));
+ $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) {
$openid->identity = $openid_url;
$openid->returnUrl = $a->get_baseurl() . '/openid';
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
- $openid->optional = array('namePerson/first');
+ $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
goaway($openid->authUrl());
// NOTREACHED
}
// 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;
$new_password_encoded = hash('whirlpool',$new_password);
$res=openssl_pkey_new(array(
- 'digest_alg' => 'whirlpool',
+ 'digest_alg' => 'sha1',
'private_key_bits' => 4096,
'encrypt_key' => false ));
// Get private key
+ if(empty($res)) {
+ notice( t('SERIOUS ERROR: Generation of security keys failed.') . EOL);
+ return;
+ }
+
$prvkey = '';
openssl_pkey_export($res, $prvkey);
}
- require_once('include/Photo.php');
+ $use_gravatar = ((get_config('system','no_gravatar')) ? false : true);
+
+ // if we have an openid photo use it.
+ // otherwise unless it is disabled, use gravatar
+
+ if($use_gravatar || strlen($photo)) {
- $photo = gravatar_img($email);
- $photo_failure = false;
+ require_once('include/Photo.php');
- $filename = basename($photo);
- $img_str = fetch_url($photo,true);
- $img = new Photo($img_str);
- if($img->is_valid()) {
+ if(($use_gravatar) && (! strlen($photo)))
+ $photo = gravatar_img($email);
+ $photo_failure = false;
- $img->scaleImageSquare(175);
+ $filename = basename($photo);
+ $img_str = fetch_url($photo,true);
+ $img = new Photo($img_str);
+ if($img->is_valid()) {
+
+ $img->scaleImageSquare(175);
- $hash = photo_new_resource();
+ $hash = photo_new_resource();
- $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
+ $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
- if($r === false)
- $photo_failure = true;
+ if($r === false)
+ $photo_failure = true;
- $img->scaleImage(80);
+ $img->scaleImage(80);
- $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
+ $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
- if($r === false)
- $photo_failure = true;
+ if($r === false)
+ $photo_failure = true;
- $img->scaleImage(48);
+ $img->scaleImage(48);
- $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
+ $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
- if($r === false)
- $photo_failure = true;
+ if($r === false)
+ $photo_failure = true;
- if(! $photo_failure) {
- q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
- dbesc($hash)
- );
+ if(! $photo_failure) {
+ q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
+ dbesc($hash)
+ );
+ }
}
}
}
}
-
return;
}}
return;
}
- $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'] : ''));
- $nickname = ((x($_POST,'nickname')) ? $_POST['nickname'] : ((x($_GET,'nickname')) ? $_GET['nickname'] : ''));
+ $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'] : ''));
+ $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: ");
+ }
$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: '),
'$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,
'$regbutt' => t('Register'),
'$username' => $username,
'$email' => $email,