From: Roland Häder <roland@mxchange.org>
Date: Thu, 22 Dec 2016 16:12:34 +0000 (+0100)
Subject: Coding convention continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7c8e834546823eeadc68a2451b871addda38af57;p=friendica.git

Coding convention continued:
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/mod/common.php b/mod/common.php
index ab27dc667a..26ef7e48b7 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -19,23 +19,27 @@ function common_content(App &$a) {
 		return;
 	}
 
-	if($cmd !== 'loc' && $cmd != 'rem')
+	if ($cmd !== 'loc' && $cmd != 'rem') {
 		return;
+	}
 
-	if(! $uid)
+	if (! $uid) {
 		return;
+	}
 
-	if($cmd === 'loc' && $cid) {
+	if ($cmd === 'loc' && $cid) {
 		$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($cid),
 			intval($uid)
 		);
+		/// @TODO Handle $c with dbm::is_result()
 		$a->page['aside'] = "";
 		profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
 	} else {
 		$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 			intval($uid)
 		);
+		/// @TODO Handle $c with dbm::is_result()
 
 		$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
 			'$name' => htmlentities($c[0]['name']),
@@ -43,8 +47,9 @@ function common_content(App &$a) {
 			'url' => 'contacts/' . $cid
 		));
 
-		if(! x($a->page,'aside'))
+		if (! x($a->page,'aside')) {
 			$a->page['aside'] = '';
+		}
 		$a->page['aside'] .= $vcard_widget;
 	}
 
@@ -70,29 +75,29 @@ function common_content(App &$a) {
 		}
 	}
 
-
-
-	if($cid == 0 && $zcid == 0)
+	if ($cid == 0 && $zcid == 0) {
 		return;
+	}
 
-
-	if($cid)
+	if ($cid) {
 		$t = count_common_friends($uid, $cid);
-	else
+	} else {
 		$t = count_common_friends_zcid($uid, $zcid);
+	}
 
-	if(count($t))
+	if (count($t)) {
 		$a->set_pager_total($t);
-	else {
+	} else {
 		notice( t('No contacts in common.') . EOL);
 		return $o;
 	}
 
 
-	if($cid)
+	if ($cid) {
 		$r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
-	else
+	} else {
 		$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
+	}
 
 
 	if (! dbm::is_result($r)) {
@@ -106,39 +111,41 @@ function common_content(App &$a) {
 		//get further details of the contact
 		$contact_details = get_contact_details_by_url($rr['url'], $uid);
 
-		// $rr[id] is needed to use contact_photo_menu()
-		$rr[id] = $rr[cid];
+		// $rr['id'] is needed to use contact_photo_menu()
+		/// @TODO Adding '/" here avoids E_NOTICE on missing constants
+		$rr['id'] = $rr['cid'];
 
 		$photo_menu = '';
 		$photo_menu = contact_photo_menu($rr);
 
 		$entry = array(
-			'url'		=> $rr['url'],
-			'itemurl'	=> (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
-			'name'		=> $contact_details['name'],
-			'thumb'		=> proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
-			'img_hover'	=> htmlentities($contact_details['name']),
-			'details'	=> $contact_details['location'],
-			'tags'		=> $contact_details['keywords'],
-			'about'		=> $contact_details['about'],
-			'account_type'	=> account_type($contact_details),
-			'network'	=> network_to_name($contact_details['network'], $contact_details['url']),
-			'photo_menu'	=> $photo_menu,
-			'id'		=> ++$id,
+			'url'          => $rr['url'],
+			'itemurl'      => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'name'         => $contact_details['name'],
+			'thumb'        => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+			'img_hover'    => htmlentities($contact_details['name']),
+			'details'      => $contact_details['location'],
+			'tags'         => $contact_details['keywords'],
+			'about'        => $contact_details['about'],
+			'account_type' => account_type($contact_details),
+			'network'      => network_to_name($contact_details['network'], $contact_details['url']),
+			'photo_menu'   => $photo_menu,
+			'id'           => ++$id,
 		);
 		$entries[] = $entry;
 	}
 
-	if($cmd === 'loc' && $cid && $uid == local_user()) {
+	if ($cmd === 'loc' && $cid && $uid == local_user()) {
 		$tab_str = contacts_tab($a, $cid, 4);
-	} else
+	} else {
 		$title = t('Common Friends');
+	}
 
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
 	$o .= replace_macros($tpl,array(
-		'$title' => $title,
-		'$tab_str' => $tab_str,
+		'$title'    => $title,
+		'$tab_str'  => $tab_str,
 		'$contacts' => $entries,
 		'$paginate' => paginate($a),
 	));