diff options
| author | mrjive <mrjive@mrjive.it> | 2015-01-06 15:13:03 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-01-06 15:13:03 +0100 |
| commit | b80c218606994032e76805900cb9b340ea132358 (patch) | |
| tree | bf625cf4c59bf521e639018399bf1770d116a6a0 /mod/register.php | |
| parent | aa6d61d3b19cb13c30bf5a1579adefedf0cc9515 (diff) | |
| parent | 3185bfe3ca131d471b8fcdc0c94abf1a114486c7 (diff) | |
| download | volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.tar.gz volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.tar.bz2 volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.zip | |
Merge pull request #1 from friendica/master
test pull request
Diffstat (limited to 'mod/register.php')
| -rw-r--r-- | mod/register.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mod/register.php b/mod/register.php index 954a32fbf..70bdcf350 100644 --- a/mod/register.php +++ b/mod/register.php @@ -1,6 +1,5 @@ <?php -require_once('include/account.php'); function register_init(&$a) { @@ -38,7 +37,9 @@ function register_post(&$a) { $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailies) { - $r = q("select count(account_id) as total from account where account_created > UTC_TIMESTAMP() - INTERVAL 1 day"); + $r = q("select count(account_id) as total from account where account_created > %s - INTERVAL %s", + db_utcnow(), db_quoteinterval('1 day') + ); if($r && $r[0]['total'] >= $max_dailies) { notice( t('Maximum daily site registrations exceeded. Please try again tomorrow.') . EOL); return; @@ -101,7 +102,7 @@ function register_post(&$a) { $invite_code = ((x($_POST,'invite_code')) ? notags(trim($_POST['invite_code'])) : ''); if($using_invites && $invite_code) { - q("delete * from register where hash = '%s' limit 1", dbesc($invite_code)); + q("delete * from register where hash = '%s'", dbesc($invite_code)); set_pconfig($result['account']['account_id'],'system','invites_remaining',$num_invites); } @@ -165,7 +166,9 @@ function register_content(&$a) { $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailies) { - $r = q("select count(account_id) as total from account where account_created > UTC_TIMESTAMP() - INTERVAL 1 day"); + $r = q("select count(account_id) as total from account where account_created > %s - INTERVAL %s", + db_utcnow(), db_quoteinterval('1 day') + ); if($r && $r[0]['total'] >= $max_dailies) { logger('max daily registrations exceeded.'); notice( t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); @@ -197,13 +200,13 @@ function register_content(&$a) { $invite_code = ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "" ); - + require_once('include/bbcode.php'); $o = replace_macros(get_markup_template('register.tpl'), array( '$title' => t('Registration'), '$reg_is' => $registration_is, - '$registertext' => get_config('system','register_text'), + '$registertext' => bbcode(get_config('system','register_text')), '$other_sites' => $other_sites, '$invitations' => get_config('system','invitation_only'), '$invite_desc' => t('Membership on this site is by invitation only.'), |