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

invitation cleanup

Browse Source
This commit is contained in:
friendica 2012-08-16 05:29:16 -07:00
parent d78d6a2e66
commit 57cf80754d
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mod/zregister.php
View File

@ -5,21 +5,23 @@ require_once('include/account.php');
function zregister_init(&$a) { function zregister_init(&$a) {
$a->page['template'] = 'full'; $a->page['template'] = 'full';
$result = null;
$cmd = ((argc() > 1) ? argv(1) : ''); $cmd = ((argc() > 1) ? argv(1) : '');
switch($cmd) {
if($cmd === 'invite_check.json') { case 'invite_check.json':
$result = check_account_invite($_REQUEST['invite_code']); $result = check_account_invite($_REQUEST['invite_code']);
json_return_and_die($result); break;
case 'email_check.json':
$result = check_account_email($_REQUEST['email']);
break;
case 'password_check.json':
$result = check_account_password($_REQUEST['password']);
break;
default:
break;
} }
if($result) {
if($cmd === 'email_check.json') {
$result = check_account_email($_REQUEST['email']);
json_return_and_die($result);
}
if($cmd === 'password_check.json') {
$result = check_account_password($_REQUEST['password']);
json_return_and_die($result); json_return_and_die($result);
} }
} }
@ -218,11 +220,10 @@ function zregister_content(&$a) {
$enable_tos = 1 - intval(get_config('system','no_termsofservice')); $enable_tos = 1 - intval(get_config('system','no_termsofservice'));
$email = ((x($_REQUEST,'email')) ? $_REQUEST['email'] : "" ); $email = ((x($_REQUEST,'email')) ? strip_tags(trim($_REQUEST['email'])) : "" );
$password = ((x($_REQUEST,'password')) ? $_REQUEST['password'] : "" ); $password = ((x($_REQUEST,'password')) ? trim($_REQUEST['password']) : "" );
$password2 = ((x($_REQUEST,'password2')) ? $_REQUEST['password2'] : "" ); $password2 = ((x($_REQUEST,'password2')) ? trim($_REQUEST['password2']) : "" );
$invite_code = ((x($_REQUEST,'invite_code')) ? $_REQUEST['invite_code'] : "" ); $invite_code = ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "" );
$o = replace_macros(get_markup_template('zregister.tpl'), array( $o = replace_macros(get_markup_template('zregister.tpl'), array(
@ -232,7 +233,7 @@ function zregister_content(&$a) {
'$invitations' => get_config('system','invitation_only'), '$invitations' => get_config('system','invitation_only'),
'$invite_desc' => t('Membership on this site is by invitation only.'), '$invite_desc' => t('Membership on this site is by invitation only.'),
'$label_invite' => t('Please enter your invitation code'), '$label_invite' => t('Please enter your invitation code'),
'$invite_id' => $invite_id, '$invite_code' => $invite_code,
'$label_email' => t('Your email address'), '$label_email' => t('Your email address'),
'$label_pass1' => t('Choose a password'), '$label_pass1' => t('Choose a password'),

5
view/tpl/zregister.tpl
View File

@ -10,14 +10,11 @@
<p id="register-invite-desc">$invite_desc</p> <p id="register-invite-desc">$invite_desc</p>
<label for="zregister-invite" id="label-zregister-invite" class="zregister-label">$label_invite</label> <label for="zregister-invite" id="label-zregister-invite" class="zregister-label">$label_invite</label>
<input type="text" maxlength="72" size="32" name="invite_id" id="zregister-invite" class="zregister-input" value="$invite_id" /> <input type="text" maxlength="72" size="32" name="invite_code" id="zregister-invite" class="zregister-input" value="$invite_code" />
</div>
<div id="zregister-invite-feedback" class="zregister-feedback"></div> <div id="zregister-invite-feedback" class="zregister-feedback"></div>
<div id="zregister-invite-end" class="zregister-field-end"></div> <div id="zregister-invite-end" class="zregister-field-end"></div>
{{ endif }} {{ endif }}
<label for="zregister-email" id="label-zregister-email" class="zregister-label" >$label_email</label> <label for="zregister-email" id="label-zregister-email" class="zregister-label" >$label_email</label>
<input type="text" maxlength="72" size="32" name="email" id="zregister-email" class="zregister-input" value="$email" /> <input type="text" maxlength="72" size="32" name="email" id="zregister-email" class="zregister-input" value="$email" />
<div id="zregister-email-feedback" class="zregister-feedback"></div> <div id="zregister-email-feedback" class="zregister-feedback"></div>