aboutsummaryrefslogtreecommitdiffstats
path: root/include/account.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2018-03-31 13:41:29 -0400
committerAndrew Manning <tamanning@zoho.com>2018-03-31 13:41:29 -0400
commit6decffb00c00fabcb4ef581084eaca038e340686 (patch)
tree34471f015e0b33007ad40059dfdd09c83a768fbb /include/account.php
parent1dc795722a8e748ebb98e8fab778cd4686a0654f (diff)
parent6433ce70a19be8c57edbc72f8df3a4c7ef52f389 (diff)
downloadvolse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.gz
volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.bz2
volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.zip
Merge branch 'dev' into oauth2
Diffstat (limited to 'include/account.php')
-rw-r--r--include/account.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/account.php b/include/account.php
index 40cf281c3..2b24364f4 100644
--- a/include/account.php
+++ b/include/account.php
@@ -23,6 +23,7 @@ function get_account_by_id($account_id) {
function check_account_email($email) {
+ $email = punify($email);
$result = array('error' => false, 'message' => '');
// Caution: empty email isn't counted as an error in this function.
@@ -139,7 +140,7 @@ function create_account($arr) {
$result = array('success' => false, 'email' => '', 'password' => '', 'message' => '');
$invite_code = ((x($arr,'invite_code')) ? notags(trim($arr['invite_code'])) : '');
- $email = ((x($arr,'email')) ? notags(trim($arr['email'])) : '');
+ $email = ((x($arr,'email')) ? notags(punify(trim($arr['email']))) : '');
$password = ((x($arr,'password')) ? trim($arr['password']) : '');
$password2 = ((x($arr,'password2')) ? trim($arr['password2']) : '');
$parent = ((x($arr,'parent')) ? intval($arr['parent']) : 0 );