aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-03-23 20:32:15 +0100
committerMario <mario@mariovavti.com>2019-03-23 20:32:15 +0100
commitc676689df039ac62ed7eda3daba7efda1929b312 (patch)
tree35049fe3396201e8665eac4c5905580b712cc448
parent0f5625d7219c1065b99fdcbbbd01b4ba347e4eec (diff)
downloadvolse-hubzilla-c676689df039ac62ed7eda3daba7efda1929b312.tar.gz
volse-hubzilla-c676689df039ac62ed7eda3daba7efda1929b312.tar.bz2
volse-hubzilla-c676689df039ac62ed7eda3daba7efda1929b312.zip
fix 48 hours timeframe check and remove unused var in mod changeaddr
-rw-r--r--Zotlabs/Module/Changeaddr.php4
-rw-r--r--Zotlabs/Module/Features.php (renamed from Zotlabs/Module/Admin/Features.php)0
2 files changed, 2 insertions, 2 deletions
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
index 504caae79..504caae79 100644
--- a/Zotlabs/Module/Admin/Features.php
+++ b/Zotlabs/Module/Features.php