From c676689df039ac62ed7eda3daba7efda1929b312 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 23 Mar 2019 20:32:15 +0100 Subject: [PATCH] fix 48 hours timeframe check and remove unused var in mod changeaddr --- Zotlabs/Module/Changeaddr.php | 4 ++-- Zotlabs/Module/{Admin => }/Features.php | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename Zotlabs/Module/{Admin => }/Features.php (100%) diff --git a/Zotlabs/Module/Changeaddr.php b/Zotlabs/Module/Changeaddr.php index 5cd236394..ed139c9f9 100644 --- a/Zotlabs/Module/Changeaddr.php +++ b/Zotlabs/Module/Changeaddr.php @@ -31,7 +31,7 @@ class Changeaddr extends \Zotlabs\Web\Controller { if($account['account_password_changed'] > NULL_DATE) { $d1 = datetime_convert('UTC','UTC','now - 48 hours'); - if($account['account_password_changed'] > d1) { + if($account['account_password_changed'] > $d1) { notice( t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL); return; } @@ -49,7 +49,7 @@ class Changeaddr extends \Zotlabs\Web\Controller { if(check_webbie(array($new_address)) !== $new_address) { notice( t('Nickname has unsupported characters or is already being used on this site.') . EOL); - return $ret; + return; } channel_change_address($channel,$new_address); diff --git a/Zotlabs/Module/Admin/Features.php b/Zotlabs/Module/Features.php similarity index 100% rename from Zotlabs/Module/Admin/Features.php rename to Zotlabs/Module/Features.php