aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-16 16:11:53 -0700
committerfriendica <info@friendica.com>2014-08-16 16:11:53 -0700
commitbf3dc80233147a1dab9f034a192750f765d0436b (patch)
treefe2ae56b6de99214b1cd0f942769cdf582a9942b
parent20bdcb037f29824bcb0c8307526c0e95baa7b360 (diff)
parente4620179acb9fb7004939c2e0fc8717f9b148ca3 (diff)
downloadvolse-hubzilla-bf3dc80233147a1dab9f034a192750f765d0436b.tar.gz
volse-hubzilla-bf3dc80233147a1dab9f034a192750f765d0436b.tar.bz2
volse-hubzilla-bf3dc80233147a1dab9f034a192750f765d0436b.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--doc/install.bb2
-rw-r--r--mod/settings.php1
-rwxr-xr-xview/tpl/settings_account.tpl8
3 files changed, 7 insertions, 4 deletions
diff --git a/doc/install.bb b/doc/install.bb
index bf6578e59..16e3730ee 100644
--- a/doc/install.bb
+++ b/doc/install.bb
@@ -15,7 +15,7 @@ local .htaccess file
php.ini file
- curl, gd, mysql, and openssl extensions
- some form of email server or email gateway such that PHP mail() works
- - mcrypt (optional; used for server-to-server message encryption)
+ - mcrypt
- Mysql 5.x
diff --git a/mod/settings.php b/mod/settings.php
index 631ceb3c2..d6ebf9e90 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -629,6 +629,7 @@ function settings_content(&$a) {
'$submit' => t('Submit'),
'$email' => array('email', t('Email Address:'), $email, ''),
'$removeme' => t('Remove Account'),
+ '$removeaccount' => t('Remove this account from this server including all its channels'),
'$permanent' => t('Warning: This action is permanent and cannot be reversed.'),
'$account_settings' => $account_settings
));
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index 169516f08..1e28d8b84 100755
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
@@ -2,9 +2,6 @@
<h1>{{$title}}</h1>
-
-
-
<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@@ -23,4 +20,9 @@
{{$account_settings}}
+<div id="settings-remove-account-link">
+<h3 class="settings-heading">{{$removeme}}</h3>
+<div id="settings-remove-account-desc">{{$removeaccount}}</div>
+<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeaccount">{{$removeme}}</button>
+</div>
</div>