aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Removeme.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-06-02 17:58:46 +0000
committerMario <mario@mariovavti.com>2021-06-02 18:13:48 +0000
commitba22d3e9b6ef7042d7129c7715c81c668fcf79b3 (patch)
tree9ae960acdbf42908217d16f78268292c994dc694 /Zotlabs/Module/Removeme.php
parent657af3024e2db87153d71692e7bec77af41d3dcc (diff)
downloadvolse-hubzilla-ba22d3e9b6ef7042d7129c7715c81c668fcf79b3.tar.gz
volse-hubzilla-ba22d3e9b6ef7042d7129c7715c81c668fcf79b3.tar.bz2
volse-hubzilla-ba22d3e9b6ef7042d7129c7715c81c668fcf79b3.zip
fix issue where a deleted channel will return 404 before returning zotinfo
(cherry picked from commit 33463152e844f98b933401c394cc0e111893a077)
Diffstat (limited to 'Zotlabs/Module/Removeme.php')
-rw-r--r--Zotlabs/Module/Removeme.php46
1 files changed, 23 insertions, 23 deletions
diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php
index 876d61ca6..a0697675b 100644
--- a/Zotlabs/Module/Removeme.php
+++ b/Zotlabs/Module/Removeme.php
@@ -5,54 +5,54 @@ namespace Zotlabs\Module;
class Removeme extends \Zotlabs\Web\Controller {
function post() {
-
+
if(! local_channel())
return;
-
+
if($_SESSION['delegate'])
return;
-
+
if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password']))))
return;
-
+
if((! x($_POST,'verify')) || (! strlen(trim($_POST['verify']))))
return;
-
+
if($_POST['verify'] !== $_SESSION['remove_account_verify'])
return;
-
-
+
+
$account = \App::get_account();
-
-
+
+
$x = account_verify_password($account['account_email'],$_POST['qxz_password']);
if(! ($x && $x['account']))
return;
-
+
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 removals are not allowed within 48 hours of changing the account password.') . EOL);
return;
}
}
-
+
$global_remove = 0; //intval($_POST['global']);
channel_remove(local_channel(),1 - $global_remove,true);
-
+
}
-
-
+
+
function get() {
-
+
if(! local_channel())
goaway(z_root());
-
+
$hash = random_string();
-
+
$_SESSION['remove_account_verify'] = $hash;
-
+
$tpl = get_markup_template('removeme.tpl');
$o .= replace_macros($tpl, array(
'$basedir' => z_root(),
@@ -63,9 +63,9 @@ class Removeme extends \Zotlabs\Web\Controller {
// '$global' => [ 'global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), [ t('No'),t('Yes') ] ],
'$submit' => t('Remove Channel')
));
-
- return $o;
-
+
+ return $o;
+
}
-
+
}