X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=0ddcac70f43ac7a5abca92200b908543a2bc6d82;hb=6edc52f78f12f366f344eb86723d39b92a77a9ff;hp=3ef7b53043b8b4afe79405019445ce17b188d7ba;hpb=5635fe250ca4ef8e1dcf12cfe0f49b2a23c86b16;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
index 3ef7b53043..0ddcac70f4 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -225,6 +225,36 @@ function contacts_content(&$a) {
 
 		if($cmd === 'drop') {
 
+			// Check if we should do HTML-based delete confirmation
+			if($_REQUEST['confirm']) {
+				// <form> can't take arguments in its "action" parameter
+				// so add any arguments as hidden inputs
+				$query = explode_querystring($a->query_string);
+				$inputs = array();
+				foreach($query['args'] as $arg) {
+					if(strpos($arg, 'confirm=') === false) {
+						$arg_parts = explode('=', $arg);
+						$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+					}
+				}
+
+				$a->page['aside'] = '';
+				return replace_macros(get_markup_template('confirm.tpl'), array(
+					'$method' => 'get',
+					'$message' => t('Do you really want to delete this contact?'),
+					'$extra_inputs' => $inputs,
+					'$confirm' => t('Yes'),
+					'$confirm_url' => $query['base'],
+					'$confirm_name' => 'confirmed',
+					'$cancel' => t('Cancel'),
+				));
+			}
+			// Now check how the user responded to the confirmation query
+			if($_REQUEST['canceled']) {
+				goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+
+			}
+
 			require_once('include/Contact.php');
 
 			terminate_friendship($a->user,$a->contact,$orig_record[0]);
@@ -239,14 +269,18 @@ function contacts_content(&$a) {
 		}
 	}
 
+
+
+	$_SESSION['return_url'] = $a->query_string;
+
 	if((x($a->data,'contact')) && (is_array($a->data['contact']))) {
 
 		$contact_id = $a->data['contact']['id'];
 		$contact = $a->data['contact'];
 
-		$editselect = 'exact';
-		if(intval(get_pconfig(local_user(),'system','plaintext')))
-			$editselect = 'none';
+		$editselect = 'none';
+		if( feature_enabled(local_user(),'richtext') )
+			$editselect = 'exact';
 
 		$a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
 			'$baseurl' => $a->get_baseurl(true),
@@ -346,7 +380,7 @@ function contacts_content(&$a) {
 
 		$lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
-		$o .= replace_macros($tpl,array(
+		$o .= replace_macros($tpl, array(
 			'$header' => t('Contact Editor'),
 			'$tab_str' => $tab_str,
 			'$submit' => t('Submit'),
@@ -388,7 +422,7 @@ function contacts_content(&$a) {
 			'$dir_icon' => $dir_icon,
 			'$alt_text' => $alt_text,
 			'$sparkle' => $sparkle,
-			'$url' => $url
+			'$url' => $url,
 
 		));
 
@@ -405,8 +439,6 @@ function contacts_content(&$a) {
 	$ignored = false;
 	$all = false;
 
-	$_SESSION['return_url'] = $a->query_string;
-
 	if(($a->argc == 2) && ($a->argv[1] === 'all')) {
 		$sql_extra = '';
 		$all = true;
@@ -571,7 +603,7 @@ function contacts_content(&$a) {
 	}
 	
 	$tpl = get_markup_template("contacts-template.tpl");
-	$o .= replace_macros($tpl,array(
+	$o .= replace_macros($tpl, array(
 		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
 		'$tabs' => $t,
 		'$total' => $total,