From 54fe09f466b69c960caf64dd325ebfabf3ddd962 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sat, 16 Aug 2014 16:28:07 +0200
Subject: Add account deletion to the UI

---
 mod/settings.php              | 1 +
 view/tpl/settings_account.tpl | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

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>
-- 
cgit v1.2.3


From e3c8d36e06ad056ae9bf49c0e46b70ac048b8a07 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Sat, 16 Aug 2014 20:48:23 +0100
Subject: Install doc - mcrypt is required, not optional.  Even if it's
 intended to be optional, it isn't.  WSoD abound without it.

---
 doc/install.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 
-- 
cgit v1.2.3