X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsuggest.php;h=578338b5058055ff85d57dbb22d7c6abff4aab9f;hb=215205d376feb7bef8b2aa4957d1ed5b5196ea1a;hp=7a86d53a1dbccd533d2f505a24cd089c3dc70c85;hpb=8a80ea24d1d8039be6dc532c9db23c60e71eb467;p=friendica.git

diff --git a/mod/suggest.php b/mod/suggest.php
index 7a86d53a1d..578338b505 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -9,20 +9,50 @@ function suggest_init(&$a) {
 		return;
 
 	if(x($_GET,'ignore') && intval($_GET['ignore'])) {
-		q("insert into gcign ( uid, gcid ) values ( %d, %d ) ",
-			intval(local_user()),
-			intval($_GET['ignore'])
-		);
+		// 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['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+				'$method' => 'get',
+				'$message' => t('Do you really want to delete this suggestion?'),
+				'$extra_inputs' => $inputs,
+				'$confirm' => t('Yes'),
+				'$confirm_url' => $query['base'],
+				'$confirm_name' => 'confirmed',
+				'$cancel' => t('Cancel'),
+			));
+			$a->error = 1; // Set $a->error so the other module functions don't execute
+			return;
+		}
+		// Now check how the user responded to the confirmation query
+		if(!$_REQUEST['canceled']) {
+			q("insert into gcign ( uid, gcid ) values ( %d, %d ) ",
+				intval(local_user()),
+				intval($_GET['ignore'])
+			);
+		}
 	}
 
 }
-		
+
 
 
 
 
 function suggest_content(&$a) {
 
+	require_once("mod/proxy.php");
+
 	$o = '';
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -31,11 +61,8 @@ function suggest_content(&$a) {
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
-	$a->page['aside'] .= follow_widget();
 	$a->page['aside'] .= findpeople_widget();
-
-
-	$o .= '<h2>' . t('Friend Suggestions') . '</h2>';
+	$a->page['aside'] .= follow_widget();
 
 
 	$r = suggestion_query(local_user());
@@ -45,24 +72,45 @@ function suggest_content(&$a) {
 		return $o;
 	}
 
-	$tpl = get_markup_template('suggest_friends.tpl');
+	require_once 'include/contact_selectors.php';
 
 	foreach($r as $rr) {
 
-		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);			
-
-		$o .= replace_macros($tpl,array(
-			'$url' => zrl($rr['url']),
-			'$name' => $rr['name'],
-			'$photo' => $rr['photo'],
-			'$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
-			'$conntxt' => t('Connect'),
-			'$connlnk' => $connlnk,
-			'$ignore' => t('Ignore/Hide')
-		));
+		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+		$ignlnk = $a->get_baseurl() . '/suggest?ignore=' . $rr['id'];
+		$photo_menu = array(array(t("View Profile"), zrl($rr["url"])));
+		$photo_menu[] = array(t("Connect/Follow"), $connlnk);
+		$photo_menu[] = array(t('Ignore/Hide'), $ignlnk);
+		$contact_details = get_contact_details_by_url($rr["url"], local_user());
+
+		$entry = array(
+			'url' => zrl($rr['url']),
+			'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'img_hover' => $rr['url'],
+			'name' => $rr['name'],
+			'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
+			'details'       => $contact_details['location'],
+                        'tags'          => $contact_details['keywords'],
+                        'about'         => $contact_details['about'],
+			'ignlnk' => $ignlnk,
+			'ignid' => $rr['id'],
+			'conntxt' => t('Connect'),
+			'connlnk' => $connlnk,
+			'photo_menu' => $photo_menu,
+			'ignore' => t('Ignore/Hide'),
+			'network' => network_to_name($rr['network'], $rr['url']),
+			'id' => ++$id,
+		);
+		$entries[] = $entry;
 	}
 
-	$o .= cleardiv();
-//	$o .= paginate($a);
+	$tpl = get_markup_template('viewcontact_template.tpl');
+
+	$o .= replace_macros($tpl,array(
+		'$title' => t('Friend Suggestions'),
+		'$contacts' => $entries,
+		
+	));
+
 	return $o;
 }