X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=6f7f978aae64e0127059d096bcefb6eb3f112eb0;hb=fa154248dcd62677544aa9ac7d82ddcd3df92f6e;hp=b14377cea7f4d91d24e9339160fb17e39dcf187f;hpb=1270243d8090fa4795475d29a918602f037cd86a;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
index b14377cea7..6f7f978aae 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -1,86 +1,212 @@
 <?php
-function edit_contact(&$a,$contact_id) {
 
+function contacts_init(&$a) {
+	require_once('include/group.php');
+	$a->page['aside'] .= group_side();
+
+	if($a->config['register_policy'] != REGISTER_CLOSED)
+		$a->page['aside'] .= '<div class="side-invite-link-wrapper" id="side-invite-link-wrapper" ><a href="invite" class="side-invite-link" id="side-invite-link">' . t("Invite Friends") . '</a></div>';
 }
 
 function contacts_post(&$a) {
 
 	
-	if(($a->argc != 3) || (! local_user()))
+	if(! local_user())
 		return;
 
 	$contact_id = intval($a->argv[1]);
 	if(! $contact_id)
 		return;
 
-	$cmd = $a->argv[2];
+	$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		intval($contact_id),
+		intval($_SESSION['uid'])
+	);
+
+	if(! count($orig_record)) {
+		notice("Could not access contact record." . EOL);
+		goaway($a->get_baseurl() . '/contacts');
+		return; // NOTREACHED
+	}
+
+	$profile_id = intval($_POST['profile-assign']);
+	if($profile_id) {
+		$r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($profile_id),
+			intval($_SESSION['uid'])
+		);
+		if(! count($r)) {
+			notice( t('Could not locate selected profile.') . EOL);
+			return;
+		}
+	}
+	$rating = intval($_POST['reputation']);
+	if($rating > 5 || $rating < 0)
+		$rating = 0;
+
+	$reason = notags(trim($_POST['reason']));
 
-	$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+	$r = q("UPDATE `contact` SET `profile-id` = %d, `rating` = %d, `reason` = '%s'
+		WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		intval($profile_id),
+		intval($rating),
+		dbesc($reason),
 		intval($contact_id),
 		intval($_SESSION['uid'])
 	);
+	if($r)
+		notice( t('Contact updated.') . EOL);
+	else
+		notice( t('Failed to update contact record.') . EOL);
+	return;
+
+}
+
+
+
+function contacts_content(&$a) {
 
-	if(! count($r))
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
 		return;
-	$photo = str_replace('-4.jpg', '' , $r[0]['photo']);
-	$photos = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d",
-			dbesc($photo),
+	}
+
+	if($a->argc == 3) {
+
+		$contact_id = intval($a->argv[1]);
+		if(! $contact_id)
+			return;
+
+		$cmd = $a->argv[2];
+
+		$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			intval($contact_id),
 			intval($_SESSION['uid'])
-	);
+		);
+
+		if(! count($orig_record)) {
+			notice( t('Could not access contact record.') . EOL);
+			goaway($a->get_baseurl() . '/contacts');
+			return; // NOTREACHED
+		}
+
+
+//		$photo = str_replace('-4.jpg', '' , $r[0]['photo']);
+//		$photos = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d",
+//				dbesc($photo),
+//				intval($_SESSION['uid'])
+//		);
 	
+		if($cmd == 'block') {
+			$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
+			$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+					intval($blocked),
+					intval($contact_id),
+					intval($_SESSION['uid'])
+			);
+			if($r) {
+				$msg = t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ;
+				notice($msg);
+			}
+			goaway($a->get_baseurl() ."/contacts/$contact_id");
+			return; // NOTREACHED
+		}
 
-	switch($cmd) {
-		case 'edit':
-				edit_contact($a,$contact_id);
-			break;
-		case 'block':
-			$r = q("UPDATE `contact` SET `blocked` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($contact_id),
-				intval($_SESSION['uid'])
+		if($cmd == 'ignore') {
+			$readonly = (($orig_record[0]['readonly']) ? 0 : 1);
+			$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+					intval($readonly),
+					intval($contact_id),
+					intval($_SESSION['uid'])
 			);
-			if($r)
-				$_SESSION['sysmsg'] .= "Contact has been blocked." . EOL;
-			break;
-		case 'drop':
+			if($r) {
+				$msg = t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL ;
+				notice($msg);
+			}
+			goaway($a->get_baseurl() ."/contacts/$contact_id");
+			return; // NOTREACHED
+		}
+
+		if($cmd == 'drop') {
 			$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($contact_id),
 				intval($_SESSION['uid']));
-			if(count($photos)) {
-				foreach($photos as $p) {
-					q("DELETE FROM `photos` WHERE `id` = %d LIMIT 1",
-						$p['id']);
-				}
-			}
-			if($intval($contact_id))
-				q("DELETE * FROM `item` WHERE `contact-id` = %d ",
+
+//			if(count($photos)) {
+//				foreach($photos as $p) {
+//					q("DELETE FROM `photos` WHERE `id` = %d LIMIT 1",
+//						$p['id']);
+//				}
+//			}
+
+			if(intval($contact_id))
+				q("DELETE FROM `item` WHERE `contact-id` = %d LIMIT 1",
 					intval($contact_id)
 				);
-
-			break;
-		default:
-			return;
-			break;
+	
+			notice("Contact has been removed." . EOL );
+			goaway($a->get_baseurl() . '/contacts');
+			return; // NOTREACHED
+		}
 	}
 
-}
-
-
-
+	if(($a->argc == 2) && intval($a->argv[1])) {
 
+		$contact_id = intval($a->argv[1]);
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
+			$_SESSION['uid'],
+			intval($contact_id)
+		);
+		if(! count($r)) {
+			notice( t('Contact not found.') . EOL);
+			return;
+		}
 
+		require_once('view/contact_selectors.php');
 
+		$tpl = file_get_contents("view/contact_edit.tpl");
 
+		$direction = '';
+		if(strlen($r[0]['issued-id'])) {
+			if(strlen($r[0]['dfrn-id'])) {
+				$direction = DIRECTION_BOTH;
+				$dir_icon = 'images/lrarrow.gif';
+				$alt_text = t('Mutual Friendship');
+			}
+			else {
+				$direction = DIRECTION_IN;
+				$dir_icon = 'images/larrow.gif';
+				$alt_text = t('is a fan of yours');
+			}
+		}
+		else {
+			$direction = DIRECTION_OUT;
+			$dir_icon = 'images/rarrow.gif';
+			$alt_text = t('you are a fan of');
+		}
 
+		$o .= replace_macros($tpl,array(
+			'$profile_select' => contact_profile_assign($r[0]['profile-id']),
+			'$contact_id' => $r[0]['id'],
+			'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
+			'$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
+			'$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
+			'$rating' => contact_reputation($r[0]['rating']),
+			'$reason' => $r[0]['reason'],
+			'$groups' => '', // group_selector(),
+			'$photo' => $r[0]['photo'],
+			'$name' => $r[0]['name'],
+			'$dir_icon' => $dir_icon,
+			'$alt_text' => $alt_text,
+			'$url' => (($direction != DIRECTION_IN) ? "redir/{$r[0]['id']}" : $r[0]['url'] )
 
+		));
 
+		return $o;
 
-function contacts_content(&$a) {
-	if(! local_user()) {
-		$_SESSION['sysmsg'] .= "Permission denied." . EOL;
-		return;
 	}
 
-	if(($a->argc2 == 2) && ($a->argv[1] == 'all'))
+	if(($a->argc == 2) && ($a->argv[1] == 'all'))
 		$sql_extra = '';
 	else
 		$sql_extra = " AND `blocked` = 0 ";
@@ -88,26 +214,26 @@ function contacts_content(&$a) {
 	$tpl = file_get_contents("view/contacts-top.tpl");
 	$o .= replace_macros($tpl,array(
 		'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
-		'$hide_text' => ((strlen($sql_extra)) ? 'Show Blocked Connections' : 'Hide Blocked Connections')
+		'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections'))
 	)); 
 
 	switch($sort_type) {
 		case DIRECTION_BOTH :
-			$sql_extra = " AND `dfrn-id` != '' AND `ret-id` != '' ";
+			$sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` != '' ";
 			break;
 		case DIRECTION_IN :
-			$sql_extra = " AND `dfrn-id` != '' AND `ret-id` = '' ";
+			$sql_extra2 = " AND `dfrn-id` = '' AND `issued-id` != '' ";
 			break;
 		case DIRECTION_OUT :
-			$sql_extra = " AND `dfrn-id` = '' AND `ret-id` != '' ";
+			$sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` = '' ";
 			break;
 		case DIRECTION_ANY :
 		default:
-			$sql_extra = '';
+			$sql_extra2 = '';
 			break;
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d $sql_extra",
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
 		intval($_SESSION['uid']));
 
 	if(count($r)) {
@@ -118,22 +244,22 @@ function contacts_content(&$a) {
 			if($rr['self'])
 				continue;
 			$direction = '';
-			if(strlen($rr['dfrn-id'])) {
-				if(strlen($rr['ret-id'])) {
+			if(strlen($rr['issued-id'])) {
+				if(strlen($rr['dfrn-id'])) {
 					$direction = DIRECTION_BOTH;
 					$dir_icon = 'images/lrarrow.gif';
-					$alt_text = 'Mutual Friendship';
+					$alt_text = t('Mutual Friendship');
 				}
 				else {
-					$direction = DIRECTION_OUT;
-					$dir_icon = 'images/rarrow.gif';
-					$alt_text = 'You are a fan of';
+					$direction = DIRECTION_IN;
+					$dir_icon = 'images/larrow.gif';
+					$alt_text = t('is a fan of yours');
 				}
 			}
 			else {
-				$direction = DIRECTION_IN;
-				$dir_icon = 'images/larrow.gif';
-				$alt_text = 'is a fan of yours';
+				$direction = DIRECTION_OUT;
+				$dir_icon = 'images/rarrow.gif';
+				$alt_text = t('you are a fan of');
 			}
 
 			$o .= replace_macros($tpl, array(
@@ -147,6 +273,4 @@ function contacts_content(&$a) {
 		}
 	}
 	return $o;
-
-
 }
\ No newline at end of file