From: Roland Haeder <roland@mxchange.org>
Date: Fri, 30 Dec 2016 20:48:09 +0000 (+0100)
Subject: added curly braces + fixed indenting according to code review by Hypolite
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bc9cb5e5f6bca2a193b85b3b6700592f8042b150;p=friendica.git

added curly braces + fixed indenting according to code review by Hypolite

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

diff --git a/include/follow.php b/include/follow.php
index 8d80538e0c..3045191077 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -110,12 +110,10 @@ function new_contact($uid,$url,$interactive = false) {
 
 			// NOTREACHED
 		}
-	} else {
-		if (get_config('system','dfrn_only')) {
-			$result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
-			$result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
-			return $result;
-		}
+	} elseif (get_config('system','dfrn_only')) {
+		$result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
+		$result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
+		return $result;
 	}
 
 	// This extra param just confuses things, remove it
diff --git a/include/items.php b/include/items.php
index 8d95c35529..fa4f3290b1 100644
--- a/include/items.php
+++ b/include/items.php
@@ -955,12 +955,14 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
 		$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
 		if ((dbm::is_result($r)) && (count($r) == 1)) {
-			if ($notify)
+			if ($notify) {
 				call_hooks('post_local_end', $r[0]);
-			else
+			} else {
 				call_hooks('post_remote_end', $r[0]);
-		} else
+			}
+		} else {
 			logger('item_store: new item not found in DB, id ' . $current_post);
+		}
 	}
 
 	if ($arr['parent-uri'] === $arr['uri']) {
@@ -994,8 +996,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
 	check_item_notification($current_post, $uid);
 
-	if ($notify)
+	if ($notify) {
 		proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $current_post);
+	}
 
 	return $current_post;
 }
diff --git a/mod/contacts.php b/mod/contacts.php
index 26dfe06078..38e0992257 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -37,34 +37,36 @@ function contacts_init(App &$a) {
 	}
 
 	if ($contact_id) {
-			$a->data['contact'] = $r[0];
+		$a->data['contact'] = $r[0];
 
-			if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
-				$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
-			} else {
-				$networkname = '';
-			}
+		if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
+			$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
+		} else {
+			$networkname = '';
+		}
 
-			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
-				'$name' => htmlentities($a->data['contact']['name']),
-				'$photo' => $a->data['contact']['photo'],
-				'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
-				'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
-				'$network_name' => $networkname,
-				'$network' => t('Network:'),
-				'$account_type' => account_type($a->data['contact'])
-			));
-			$finpeople_widget = '';
-			$follow_widget = '';
-			$networks_widget = '';
-	}
-	else {
+		/// @TODO Add nice spaces
+		$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
+			'$name' => htmlentities($a->data['contact']['name']),
+			'$photo' => $a->data['contact']['photo'],
+			'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
+			'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
+			'$network_name' => $networkname,
+			'$network' => t('Network:'),
+			'$account_type' => account_type($a->data['contact'])
+		));
+
+		$finpeople_widget = '';
+		$follow_widget = '';
+		$networks_widget = '';
+	} else {
 		$vcard_widget = '';
 		$networks_widget .= networks_widget('contacts',$_GET['nets']);
-		if (isset($_GET['add']))
+		if (isset($_GET['add'])) {
 			$follow_widget = follow_widget($_GET['add']);
-		else
+		} else {
 			$follow_widget = follow_widget();
+		}
 
 		$findpeople_widget .= findpeople_widget();
 	}
diff --git a/mod/profile.php b/mod/profile.php
index 32539758e2..32d3985b7f 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -111,10 +111,8 @@ function profile_content(&$a, $update = 0) {
 	if ($update) {
 		// Ensure we've got a profile owner if updating.
 		$a->profile['profile_uid'] = $update;
-	} else {
-		if ($a->profile['profile_uid'] == local_user()) {
-			nav_set_selected('home');
-		}
+	} elseif ($a->profile['profile_uid'] == local_user()) {
+		nav_set_selected('home');
 	}
 
 	$contact = null;
@@ -158,12 +156,12 @@ function profile_content(&$a, $update = 0) {
 	}
 
 	if (! $update) {
-		if (x($_GET,'tab'))
+		if (x($_GET,'tab')) {
 			$tab = notags(trim($_GET['tab']));
+		}
 
 		$o.=profile_tabs($a, $is_owner, $a->profile['nickname']);
 
-
 		if ($tab === 'profile') {
 			$o .= advanced_profile($a);
 			call_hooks('profile_advanced',$o);
@@ -201,14 +199,12 @@ function profile_content(&$a, $update = 0) {
 
 		$o .= status_editor($a,$x);
 		}
-
 	}
 
 
 	/**
 	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
 	 */
-
 	$sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
 
 
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index 32f71db015..6c80afdc22 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -33,7 +33,7 @@ function theme_admin(App &$a){
 	$align = get_config('quattro', 'align' );
 	$color = get_config('quattro', 'color' );
 	$tfs = get_config("quattro","tfs");
-	$pfs = get_config("quattro","pfs");    
+	$pfs = get_config("quattro","pfs");
 
 	return quattro_form($a,$align, $color, $tfs, $pfs);
 }
@@ -69,8 +69,8 @@ function quattro_form(App &$a, $align, $color, $tfs, $pfs){
 		'$title'   => t("Theme settings"),
 		'$align'   => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
 		'$color'   => array('quattro_color', t('Color scheme'), $color, '', $colors),
-        '$pfs'     => array('quattro_pfs', t('Posts font size'), $pfs),
-        '$tfs'     => array('quattro_tfs',t('Textareas font size'), $tfs),
+		'$pfs'     => array('quattro_pfs', t('Posts font size'), $pfs),
+		'$tfs'     => array('quattro_tfs',t('Textareas font size'), $tfs),
 	));
 	return $o;
 }