From e01f1a434581bc1872db096acac82473711426aa Mon Sep 17 00:00:00 2001
From: LaocheXe <LaocheXe@users.noreply.github.com>
Date: Fri, 10 Jan 2020 08:28:17 -0600
Subject: [PATCH] Delete Account Option

Delete Account Option added in admin  area. Also updated the default_install.xml to add missing core options.
---
 e107_admin/users.php                           |  1 +
 .../batch/usersettings_shortcodes.php          | 18 +++++++++++++-----
 e107_core/xml/default_install.xml              |  8 ++++++++
 e107_languages/English/admin/lan_users.php     |  1 +
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/e107_admin/users.php b/e107_admin/users.php
index d61b05070..a2fb80ecc 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -328,6 +328,7 @@ class users_admin_ui extends e_admin_ui
 		'profile_comments'			=> array('title' => USRLAN_127, 'type' => 'boolean', 'writeParms' => 'label=yesno', 'data' => 'int',),
 		'force_userupdate'			=> array('title' => USRLAN_133, 'type' => 'boolean', 'writeParms' => 'label=yesno', 'help' => USRLAN_134, 'data' => 'int',),
 		'del_unv'					=> array('title' => USRLAN_93,  'type' => 'number',  'writeParms' => array('maxlength' => 5, 'post' => USRLAN_95), 'help' => USRLAN_94, 'data' => 'int',),
+		'del_accu'					=> array('title' => USRLAN_257, 'type' => 'boolean', 'writeParms' => 'label=yesno', 'data' => 'int',),
 		'track_online'				=> array('title' => USRLAN_130, 'type' => 'boolean', 'writeParms' => 'label=yesno', 'help' => USRLAN_131, 'data' => 'int',),
 		'memberlist_access'			=> array('title' => USRLAN_146, 'type' => 'userclass', 'writeParms' => 'classlist=public,member,guest,admin,main,classes,nobody', 'data' => 'int',),
 		'signature_access'			=> array('title' => USRLAN_194, 'type' => 'userclass', 'writeParms' => 'classlist=member,admin,main,classes,nobody', 'data' => 'int',),
diff --git a/e107_core/shortcodes/batch/usersettings_shortcodes.php b/e107_core/shortcodes/batch/usersettings_shortcodes.php
index 6835dcad7..c748295a7 100755
--- a/e107_core/shortcodes/batch/usersettings_shortcodes.php
+++ b/e107_core/shortcodes/batch/usersettings_shortcodes.php
@@ -600,13 +600,21 @@ class usersettings_shortcodes extends e_shortcode
 		{
 			return null;
 		}
+		
+		$pref = e107::getPref();
+		if($pref['del_accu'] == 1)
+		{
+			$confirm    = defset("LAN_USET_51", "Are you sure? This procedure cannot be reversed! Once completed all personal data that you have entered on this site will be permanently lost and you will no longer be able to login.");
+			$label      = defset('LAN_USET_50', "Delete All Account Information");
 
-		$confirm    = defset("LAN_USET_51", "Are you sure? This procedure cannot be reversed! Once completed all personal data that you have entered on this site will be permanently lost and you will no longer be able to login.");
-		$label      = defset('LAN_USET_50', "Delete All Account Information");
+			$parm['confirm'] = $confirm;
 
-		$parm['confirm'] = $confirm;
-
-		return e107::getForm()->button('delete_account',1, 'delete', $label, $parm);
+			return e107::getForm()->button('delete_account',1, 'delete', $label, $parm);
+		}
+		else
+		{
+			return null;
+		}
 
 	}
 
diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index 6c4fe81b6..bb79dd9cc 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -423,6 +423,14 @@ City, State, Country
 		  'pinterest' => '',
 		  'vimeo' => '',
 		)]]></core>
+		<core name="avatar_upload">0</core>
+		<core name="photo_upload">0</core>
+		<core name="profile_rate">0</core>
+		<core name="profile_comments">0</core>
+		<core name="force_userupdate">0</core>
+		<core name="del_unv">0</core>
+		<core name="del_accu">1</core>
+		<core name="signature_access">253</core>		
 		<emote name="alien!png">!alien</emote>
 		<emote name="amazed!png">!amazed</emote>
 		<emote name="angry!png">!grr !angry</emote>
diff --git a/e107_languages/English/admin/lan_users.php b/e107_languages/English/admin/lan_users.php
index 9c06f0783..cac3cfc3a 100644
--- a/e107_languages/English/admin/lan_users.php
+++ b/e107_languages/English/admin/lan_users.php
@@ -277,6 +277,7 @@ define("USRLAN_253", "Older than");
 define("USRLAN_254", "Reset all passwords");
 define("USRLAN_255", "Notify User");
 define("USRLAN_256", "Dear");
+define("USRLAN_257", "Allow members to delete their account?");
 
 // These need review - there are duplicates above - they come from admin/lan_userclass.php and are unconsistent with userclass defines. TODO LANS
 define("UCSLAN_1", "Sending notification email to");