added more curly braces + space between "if" and brace

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

Conflicts:
	mod/admin.php

include/follow.php

@@ -77,12 +77,12 @@ function new_contact($uid,$url,$interactive = false) {
 
 	$url = str_replace('/#!/','/',$url);
 
-	if(! allowed_url($url)) {
+	if (! allowed_url($url)) {
 		$result['message'] = t('Disallowed profile URL.');
 		return $result;
 	}
 
-	if(! $url) {
+	if (! $url) {
 		$result['message'] = t('Connect URL missing.');
 		return $result;
 	}
@@ -91,17 +91,21 @@ function new_contact($uid,$url,$interactive = false) {
 
 	call_hooks('follow', $arr);
 
-	if(x($arr['contact'],'name'))
+	if (x($arr['contact'],'name')) {
 		$ret = $arr['contact'];
-	else
+	}
+	else {
 		$ret = probe_url($url);
+	}
 
-	if($ret['network'] === NETWORK_DFRN) {
-		if($interactive) {
-			if(strlen($a->path))
+	if ($ret['network'] === NETWORK_DFRN) {
+		if ($interactive) {
+			if (strlen($a->path)) {
 				$myaddr = bin2hex(App::get_baseurl() . '/profile/' . $a->user['nickname']);
-			else
+			}
+			else {
 				$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
+			}
 
 			goaway($ret['request'] . "&addr=$myaddr");
 

include/salmon.php

@@ -24,22 +24,24 @@ function get_salmon_key($uri,$keyhash) {
 	// We have found at least one key URL
 	// If it's inline, parse it - otherwise get the key
 
-	if(count($ret) > 0) {
-		for($x = 0; $x < count($ret); $x ++) {
-			if(substr($ret[$x],0,5) === 'data:') {
-				if(strstr($ret[$x],','))
+	if (count($ret) > 0) {
+		for ($x = 0; $x < count($ret); $x ++) {
+			if (substr($ret[$x],0,5) === 'data:') {
+				if (strstr($ret[$x],',')) {
 					$ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1);
-				else
+				} else {
 					$ret[$x] = substr($ret[$x],5);
-			} elseif (normalise_link($ret[$x]) == 'http://')
+				}
+			} elseif (normalise_link($ret[$x]) == 'http://') {
 				$ret[$x] = fetch_url($ret[$x]);
+			}
 		}
 	}
 
 
 	logger('Key located: ' . print_r($ret,true));
 
-	if(count($ret) == 1) {
+	if (count($ret) == 1) {
 
 		// We only found one one key so we don't care if the hash matches.
 		// If it's the wrong key we'll find out soon enough because
@@ -50,10 +52,11 @@ function get_salmon_key($uri,$keyhash) {
 		return $ret[0];
 	}
 	else {
-		foreach($ret as $a) {
+		foreach ($ret as $a) {
 			$hash = base64url_encode(hash('sha256',$a));
-			if($hash == $keyhash)
+			if ($hash == $keyhash) {
 				return $a;
+			}
 		}
 	}
 

include/security.php

@@ -94,11 +94,12 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 
 
 	}
-	if($login_initial) {
+	if ($login_initial) {
 		call_hooks('logged_in', $a->user);
 
-		if(($a->module !== 'home') && isset($_SESSION['return_url']))
+		if (($a->module !== 'home') && isset($_SESSION['return_url'])) {
 			goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
+		}
 	}
 
 }
@@ -109,16 +110,17 @@ function can_write_wall(&$a,$owner) {
 
 	static $verified = 0;
 
-	if((! (local_user())) && (! (remote_user())))
+	if ((! (local_user())) && (! (remote_user()))) {
 		return false;
+	}
 
 	$uid = local_user();
 
-	if(($uid) && ($uid == $owner)) {
+	if (($uid) && ($uid == $owner)) {
 		return true;
 	}
 
-	if(remote_user()) {
+	if (remote_user()) {
 
 		// use remembered decision and avoid a DB lookup for each and every display item
 		// DO NOT use this function if there are going to be multiple owners
@@ -126,25 +128,25 @@ function can_write_wall(&$a,$owner) {
 		// We have a contact-id for an authenticated remote user, this block determines if the contact
 		// belongs to this page owner, and has the necessary permissions to post content
 
-		if($verified === 2)
+		if ($verified === 2) {
 			return true;
-		elseif($verified === 1)
+		} elseif ($verified === 1) {
 			return false;
-		else {
+		} else {
 			$cid = 0;
 
-			if(is_array($_SESSION['remote'])) {
-				foreach($_SESSION['remote'] as $visitor) {
-					if($visitor['uid'] == $owner) {
+			if (is_array($_SESSION['remote'])) {
+				foreach ($_SESSION['remote'] as $visitor) {
+					if ($visitor['uid'] == $owner) {
 						$cid = $visitor['cid'];
 						break;
 					}
 				}
 			}
 
-			if(! $cid)
+			if (! $cid) {
 				return false;
-
+			}
 
 			$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `user`.`uid` = `contact`.`uid` 
 				WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 

include/socgraph.php

@@ -91,8 +91,8 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 
 		$name = $entry->displayName;
 
-		if(isset($entry->urls)) {
-			foreach($entry->urls as $url) {
+		if (isset($entry->urls)) {
+			foreach ($entry->urls as $url) {
 				if ($url->type == 'profile') {
 					$profile_url = $url->value;
 					continue;
@@ -104,7 +104,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 			}
 		}
 		if (isset($entry->photos)) {
-			foreach($entry->photos as $photo) {
+			foreach ($entry->photos as $photo) {
 				if ($photo->type == 'profile') {
 					$profile_photo = $photo->value;
 					continue;
@@ -112,29 +112,37 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 			}
 		}
 
-		if(isset($entry->updated))
+		if (isset($entry->updated)) {
 			$updated = date("Y-m-d H:i:s", strtotime($entry->updated));
+		}
 
-		if(isset($entry->network))
+		if (isset($entry->network)) {
 			$network = $entry->network;
+		}
 
-		if(isset($entry->currentLocation))
+		if (isset($entry->currentLocation)) {
 			$location = $entry->currentLocation;
+		}
 
-		if(isset($entry->aboutMe))
+		if (isset($entry->aboutMe)) {
 			$about = html2bbcode($entry->aboutMe);
+		}
 
-		if(isset($entry->gender))
+		if (isset($entry->gender)) {
 			$gender = $entry->gender;
+		}
 
-		if(isset($entry->generation) AND ($entry->generation > 0))
+		if (isset($entry->generation) AND ($entry->generation > 0)) {
 			$generation = ++$entry->generation;
+		}
 
-		if(isset($entry->tags))
-			foreach($entry->tags as $tag)
+		if (isset($entry->tags)) {
+			foreach($entry->tags as $tag) {
 				$keywords = implode(", ", $tag);
+			}
+		}
 
-		if(isset($entry->contactType) AND ($entry->contactType >= 0))
+		if (isset($entry->contactType) AND ($entry->contactType >= 0))
 			$contact_type = $entry->contactType;
 
 		// If you query a Friendica server for its profiles, the network has to be Friendica
@@ -171,8 +179,6 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 
 function poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid = 0, $uid = 0, $zcid = 0) {
 
-	$a = get_app();
-
 	// Generation:
 	//  0: No definition
 	//  1: Profiles on this server
@@ -1186,12 +1192,12 @@ function update_suggestions() {
 
 	$done[] = App::get_baseurl() . '/poco';
 
-	if(strlen(get_config('system','directory'))) {
+	if (strlen(get_config('system','directory'))) {
 		$x = fetch_url(get_server()."/pubsites");
 		if ($x) {
 			$j = json_decode($x);
 			if ($j->entries) {
-				foreach($j->entries as $entry) {
+				foreach ($j->entries as $entry) {
 
 					poco_check_server($entry->url);
 
@@ -1210,7 +1216,7 @@ function update_suggestions() {
 	);
 
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
 			if(! in_array($base,$done))
 				poco_load(0,0,0,$base);
@@ -1221,7 +1227,7 @@ function update_suggestions() {
 function poco_discover_federation() {
 	$last = get_config('poco','last_federation_discovery');
 
-	if($last) {
+	if ($last) {
 		$next = $last + (24 * 60 * 60);
 		if($next > time())
 			return;
@@ -1377,7 +1383,7 @@ function poco_discover_server($data, $default_generation = 0) {
 
 		$name = $entry->displayName;
 
-		if(isset($entry->urls)) {
+		if (isset($entry->urls)) {
 			foreach($entry->urls as $url) {
 				if ($url->type == 'profile') {
 					$profile_url = $url->value;
@@ -1390,39 +1396,48 @@ function poco_discover_server($data, $default_generation = 0) {
 			}
 		}
 
-		if(isset($entry->photos)) {
-			foreach($entry->photos as $photo) {
-				if($photo->type == 'profile') {
+		if (isset($entry->photos)) {
+			foreach ($entry->photos as $photo) {
+				if ($photo->type == 'profile') {
 					$profile_photo = $photo->value;
 					continue;
 				}
 			}
 		}
 
-		if(isset($entry->updated))
+		if (isset($entry->updated)) {
 			$updated = date("Y-m-d H:i:s", strtotime($entry->updated));
+		}
 
-		if(isset($entry->network))
+		if(isset($entry->network)) {
 			$network = $entry->network;
+		}
 
-		if(isset($entry->currentLocation))
+		if(isset($entry->currentLocation)) {
 			$location = $entry->currentLocation;
+		}
 
-		if(isset($entry->aboutMe))
+		if(isset($entry->aboutMe)) {
 			$about = html2bbcode($entry->aboutMe);
+		}
 
-		if(isset($entry->gender))
+		if(isset($entry->gender)) {
 			$gender = $entry->gender;
+		}
 
-		if(isset($entry->generation) AND ($entry->generation > 0))
+		if(isset($entry->generation) AND ($entry->generation > 0)) {
 			$generation = ++$entry->generation;
+		}
 
-		if(isset($entry->contactType) AND ($entry->contactType >= 0))
+		if(isset($entry->contactType) AND ($entry->contactType >= 0)) {
 			$contact_type = $entry->contactType;
+		}
 
-		if(isset($entry->tags))
-			foreach($entry->tags as $tag)
+		if(isset($entry->tags)) {
+			foreach ($entry->tags as $tag) {
 				$keywords = implode(", ", $tag);
+			}
+		}
 
 		if ($generation > 0) {
 			$success = true;