harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more zregister cleanup and theme separation

Browse Source
This commit is contained in:
friendica 2012-08-16 00:51:03 -07:00
parent 5b547ae991
commit eb911443aa
6 changed files with 74 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/account.php
View File

@ -12,7 +12,8 @@ function check_account_email($email) {
$result = array('error' => false, 'message' => '');
// Caution: empty email isn't counted as an error in this function. Check emptiness separately.
// Caution: empty email isn't counted as an error in this function.
// Check for empty value separately.
if(! strlen($email))
return $result;
@ -32,10 +33,25 @@ function check_account_email($email) {
if($result['message'])
$result['error'] = true;
return $result;
$arr = array('email' => $email, 'result' => $result);
call_hooks('check_account_email', $arr);
return $arr['result'];
}
function check_account_password($password) {
$result = array('error' => false, 'message' => '');
// The only validation we perform by default is pure Javascript to
// check minimum length and that both entered passwords match.
// Use hooked functions to perform complexity requirement checks.
$arr = array('password' => $password, 'result' => $result);
call_hooks('check_account_password', $arr);
return $arr['result'];
}
function create_account($arr) {
@ -77,6 +93,13 @@ function create_account($arr) {
return $result;
}
$password_result = check_account_password($password);
if(! $password_result['error']) {
$result['message'] = $password_result['message'];
return $result;
}
$password_encoded = hash('whirlpool',$password);
$r = q("INSERT INTO account

2
include/js_strings.php
View File

@ -6,6 +6,8 @@ function js_strings() {
'$comment' => t('Comment'),
'$showmore' => t('show more'),
'$showfewer' => t('show fewer'),
'$pwshort' => t("Password too short"),
'$pwnomatch' => t("Passwords do not match"),
'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : 'null'),
'$t02' => ((t('timeago.suffixAgo') != 'timeago.suffixAgo') ? t('timeago.suffixAgo') : 'null'),

11
js/main.js
View File

@ -851,3 +851,14 @@ $("abbr.wall-item-ago-time").timeago();
});
function zFormError(elm,x) {
if(x) {
$(elm).addClass("zform-error");
$(elm).removeClass("zform-ok");
}
else {
$(elm).addClass("zform-ok");
$(elm).removeClass("zform-error");
}
}

51
mod/zregister.php
View File

@ -11,55 +11,10 @@ function zregister_init(&$a) {
json_return_and_die($result);
}
$pw1 = t("Password too short");
$pw2 = t("Passwords do not match");
$a->page['htmlhead'] .= <<< EOT
<script>
function zFormError(elm,x) {
if(x) {
$(elm).addClass("zform-error");
$(elm).removeClass("zform-ok");
}
else {
$(elm).addClass("zform-ok");
$(elm).removeClass("zform-error");
}
if($cmd === 'password_check.json') {
$result = check_account_password($_REQUEST['password']);
json_return_and_die($result);
}
$(document).ready(function() {
$("#zregister-email").blur(function() {
var zreg_email = $("#zregister-email").val();
$.get("zregister/email_check.json?f=&email=" + encodeURIComponent(zreg_email),function(data) {
$("#zregister-email-feedback").html(data.message);
zFormError("#zregister-email-feedback",data.error);
});
});
$("#zregister-password").blur(function() {
if(($("#zregister-password").val()).length < 6 ) {
$("#zregister-password-feedback").html("$pw1");
zFormError("#zregister-password-feedback",true);
}
else {
$("#zregister-password-feedback").html("");
zFormError("#zregister-password-feedback",false);
}
});
$("#zregister-password2").blur(function() {
if($("#zregister-password").val() != $("#zregister-password2").val()) {
$("#zregister-password2-feedback").html("$pw2");
zFormError("#zregister-password2-feedback",true);
}
else {
$("#zregister-password2-feedback").html("");
zFormError("#zregister-password2-feedback",false);
}
});
});
</script>
EOT;
}

31
view/js/mod_zregister.js Normal file
View File

@ -0,0 +1,31 @@
$(document).ready(function() {
$("#zregister-email").blur(function() {
var zreg_email = $("#zregister-email").val();
$.get("zregister/email_check.json?f=&email=" + encodeURIComponent(zreg_email),function(data) {
$("#zregister-email-feedback").html(data.message);
zFormError("#zregister-email-feedback",data.error);
});
});
$("#zregister-password").blur(function() {
if(($("#zregister-password").val()).length < 6 ) {
$("#zregister-password-feedback").html(aStr['pwshort']);
zFormError("#zregister-password-feedback",true);
}
else {
$("#zregister-password-feedback").html("");
zFormError("#zregister-password-feedback",false);
}
});
$("#zregister-password2").blur(function() {
if($("#zregister-password").val() != $("#zregister-password2").val()) {
$("#zregister-password2-feedback").html(aStr['pwnomatch']);
zFormError("#zregister-password2-feedback",true);
}
else {
$("#zregister-password2-feedback").html("");
zFormError("#zregister-password2-feedback",false);
}
});
});
</script>

2
view/tpl/js_strings.tpl
View File

@ -7,6 +7,8 @@
'comment' : '$comment',
'showmore' : '$showmore',
'showfewer' : '$showfewer',
'pwshort' : '$pwshort',
'pwnomatch' : 'pwnomatch',
't01' : $t01,
't02' : $t02,