Merge branch 'pull-request-245'

* pull-request-245:
  coding corrections. correct type hint, remove unused variable assignment
  HTTPClient don't pull too much bytes when no content-length is given
  de/de-informal: localization updates (delete user function)
  unit tests for self deleting of user accounts
  FS#2751 - self deletion of user account

Conflicts:
	inc/lang/de-informal/lang.php
	inc/lang/de/lang.php

1 files changed, 17 insertions, 0 deletions

diff --git a/inc/html.php b/inc/html.php
index 2d2bb8a7c..96c4eaa1a 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1390,6 +1390,23 @@ function html_updateprofile(){
 
     $form->endFieldset();
     html_form('updateprofile', $form);
+
+    if ($auth->canDo('delUser') && actionOK('profile_delete')) {
+        $form_profiledelete = new Doku_Form(array('id' => 'dw__profiledelete'));
+        $form_profiledelete->startFieldset($lang['profdeleteuser']);
+        $form_profiledelete->addHidden('do', 'profile_delete');
+        $form_profiledelete->addHidden('delete', '1');
+        $form_profiledelete->addElement(form_makeCheckboxField('confirm_delete', '1', $lang['profconfdelete'],'dw__confirmdelete','', array('required' => 'required')));
+        if ($conf['profileconfirm']) {
+            $form_profiledelete->addElement(form_makeTag('br'));
+            $form_profiledelete->addElement(form_makePasswordField('oldpass', $lang['oldpass'], '', 'block', array('size'=>'50', 'required' => 'required')));
+        }
+        $form_profiledelete->addElement(form_makeButton('submit', '', $lang['btn_deleteuser']));
+        $form_profiledelete->endFieldset();
+
+        html_form('profiledelete', $form_profiledelete);
+    }
+
     print '</div>'.NL;
 }