From 431a462d60af173592cf6a046dc2280a07484402 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 4 Mar 2015 11:01:16 +0100 Subject: cleanup removeme --- mod/removeme.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mod/removeme.php') diff --git a/mod/removeme.php b/mod/removeme.php index 492738b77..52145d639 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -9,6 +9,7 @@ function removeme_post(&$a) { return; if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password'])))) + notice( t('Password not correct.') . EOL); return; if((! x($_POST,'verify')) || (! strlen(trim($_POST['verify'])))) @@ -21,6 +22,7 @@ function removeme_post(&$a) { $account = $a->get_account(); if(! account_verify_password($account['account_email'],$_POST['qxz_password'])) + notice( t('Password not correct.') . EOL); return; if($account['account_password_changed'] != NULL_DATE) { @@ -55,12 +57,12 @@ function removeme_content(&$a) { '$basedir' => $a->get_baseurl(), '$hash' => $hash, '$title' => t('Remove This Channel'), - '$desc' => t('This will completely remove this channel from the network. Once this has been done it is not recoverable.'), + '$desc' => array(t('WARNING: '), t('This channel will be completely removed from the network. '), t('This action is permanent and can not be undone!')), '$passwd' => t('Please enter your password for verification:'), - '$global' => array('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')), + '$global' => array('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'), array(t('No'),t('Yes'))), '$submit' => t('Remove Channel') )); return $o; -} \ No newline at end of file +} -- cgit v1.2.3 From 9cd7546be5ad7f24534653f310c15362c3f2baa6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 7 Mar 2015 15:56:28 +0100 Subject: hopefully fix #919 --- mod/removeme.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'mod/removeme.php') diff --git a/mod/removeme.php b/mod/removeme.php index 52145d639..ff955775a 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -9,7 +9,6 @@ function removeme_post(&$a) { return; if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password'])))) - notice( t('Password not correct.') . EOL); return; if((! x($_POST,'verify')) || (! strlen(trim($_POST['verify'])))) @@ -22,7 +21,6 @@ function removeme_post(&$a) { $account = $a->get_account(); if(! account_verify_password($account['account_email'],$_POST['qxz_password'])) - notice( t('Password not correct.') . EOL); return; if($account['account_password_changed'] != NULL_DATE) { -- cgit v1.2.3 From 844b2ae5873ea2e53bf284abe39ad7a19fe27256 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Mar 2015 20:19:17 -0700 Subject: cleanup of old delegation stuff --- mod/removeme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/removeme.php') diff --git a/mod/removeme.php b/mod/removeme.php index ff955775a..b604bc7db 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -5,7 +5,7 @@ function removeme_post(&$a) { if(! local_channel()) return; - if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) + if($_SESSION['delegate']) return; if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password'])))) -- cgit v1.2.3