diff options
| author | friendica <info@friendica.com> | 2013-01-31 17:55:52 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-01-31 17:55:52 -0800 |
| commit | 982034b87d341c0bbada64b48d8488a5d2ff711c (patch) | |
| tree | 1c5b34934f1c91119a8c7e1b206cb3bc0f8fcae7 /mod | |
| parent | 808de7b447c5b5b06a1b314713b7473b3ea0a02f (diff) | |
| download | volse-hubzilla-982034b87d341c0bbada64b48d8488a5d2ff711c.tar.gz volse-hubzilla-982034b87d341c0bbada64b48d8488a5d2ff711c.tar.bz2 volse-hubzilla-982034b87d341c0bbada64b48d8488a5d2ff711c.zip | |
update friends in common tool now that poco is working
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/register.php | 4 | ||||
| -rw-r--r-- | mod/zfinger.php | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/mod/register.php b/mod/register.php index dbf8d25b7..494e72b8f 100644 --- a/mod/register.php +++ b/mod/register.php @@ -30,7 +30,7 @@ function register_post(&$a) { $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailies) { - $r = q("select count(*) 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 > UTC_TIMESTAMP() - INTERVAL 1 day"); if($r && $r[0]['total'] >= $max_dailies) { notice( t('Maximum daily site registrations exceeded. Please try again tomorrow.') . EOL); return; @@ -129,7 +129,7 @@ function register_content(&$a) { $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailies) { - $r = q("select count(*) 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 > UTC_TIMESTAMP() - INTERVAL 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); diff --git a/mod/zfinger.php b/mod/zfinger.php index b7a89b12b..398699b20 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -126,12 +126,6 @@ function zfinger_init(&$a) { $ret['target_sig'] = $zsig; $ret['searchable'] = $searchable; -// wtf -// if(! $e['xchan_connurl']) - -// FIXME encrypt permissions when targeted so that only the target can view them, requires sending the pubkey and also checking that the target_sig is signed with that pubkey and isn't a forgery. - - logger('zot-info: ' . print_r($e,true)); $permissions = get_all_perms($e['channel_id'],(($ztarget && $zsig) ? base64url_encode(hash('whirlpool',$ztarget . $zsig,true)) @@ -143,10 +137,6 @@ function zfinger_init(&$a) { if($permissions['view_profile']) $ret['profile'] = $profile; -// if($feed && $permissions['view_stream']) -// $ret['messages'] = $zot_feed($e['channel_id'],(($ztarget && $zsig) -// ? base64url_encode(hash('whirlpool',$ztarget . $zsig,true)) -// : '' ),$mindate); // array of (verified) hubs this channel uses |