From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 9 Dec 2017 18:42:02 +0000 (-0500)
Subject: Fix formatting all around
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fe89e7760ebfe6f4d0c4a603e2ef777d53fcc8ef;p=friendica.git

Fix formatting all around
---

diff --git a/include/api.php b/include/api.php
index e5963fb8fa..03e042955f 100644
--- a/include/api.php
+++ b/include/api.php
@@ -4674,7 +4674,9 @@ function api_friendica_group_delete($type)
 {
 	$a = get_app();
 
-	if (api_user() === false) throw new ForbiddenException();
+	if (api_user() === false) {
+		throw new ForbiddenException();
+	}
 
 	// params
 	$user_info = api_get_user($a);
@@ -4683,8 +4685,9 @@ function api_friendica_group_delete($type)
 	$uid = $user_info['uid'];
 
 	// error if no gid specified
-	if ($gid == 0 || $name == "")
+	if ($gid == 0 || $name == "") {
 		throw new BadRequestException('gid or name not specified');
+	}
 
 	// get data of the specified group id
 	$r = q(
@@ -4693,8 +4696,9 @@ function api_friendica_group_delete($type)
 		intval($gid)
 	);
 	// error message if specified gid is not in database
-	if (!DBM::is_result($r))
+	if (!DBM::is_result($r)) {
 		throw new BadRequestException('gid not available');
+	}
 
 	// get data of the specified group id and group name
 	$rname = q(
@@ -4704,8 +4708,9 @@ function api_friendica_group_delete($type)
 		dbesc($name)
 	);
 	// error message if specified gid is not in database
-	if (!DBM::is_result($rname))
+	if (!DBM::is_result($rname)) {
 		throw new BadRequestException('wrong group name');
+	}
 
 	// delete group
 	$ret = group_rmv($uid, $name);
diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 0c2d6a0cbe..0be5748386 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -5,36 +5,38 @@ use Friendica\Database\DBM;
 
 require_once('include/group.php');
 
-function contactgroup_content(App $a) {
-	if (! local_user()) {
+function contactgroup_content(App $a)
+{
+	if (!local_user()) {
 		killme();
 	}
 
-	if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+	if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
 		$r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (DBM::is_result($r))
+		if (DBM::is_result($r)) {
 			$change = intval($a->argv[2]);
+		}
 	}
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
-
+	if (($a->argc > 1) && (intval($a->argv[1]))) {
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! DBM::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			killme();
 		}
 
 		$group = $r[0];
 		$members = group_get_members($group['id']);
 		$preselected = array();
-		if(count($members))	{
-			foreach($members as $member)
+		if (count($members)) {
+			foreach ($members as $member) {
 				$preselected[] = $member['id'];
+			}
 		}
 
 		if($change) {
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index c999013eff..ec670922a9 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -508,7 +508,6 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 
 		// Let's send our user to the contact editor in case they want to
 		// do anything special with this new friend.
-
 		if ($handsfree === null) {
 			goaway(System::baseUrl() . '/contacts/' . intval($contact_id));
 		} else {
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index bff1464ae4..a6436b6782 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -194,8 +194,9 @@ function dfrn_request_post(App $a) {
 					if(intval($def_gid))
 						group_add_member(local_user(), '', $r[0]['id'], $def_gid);
 
-					if (isset($photo))
+					if (isset($photo)) {
 						Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
+					}
 
 					$forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
 				} else {
diff --git a/mod/update_display.php b/mod/update_display.php
index 9dd3edf282..b0fbbbba63 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -5,19 +5,18 @@
 use Friendica\App;
 use Friendica\Core\PConfig;
 
-require_once("mod/display.php");
 require_once("include/group.php");
+require_once "mod/display.php";
 
-function update_display_content(App $a) {
-
+function update_display_content(App $a)
+{
 	$profile_uid = intval($_GET["p"]);
 
 	header("Content-type: text/html");
 	echo "<!DOCTYPE html><html><body>\r\n";
 	echo "<section>";
 
-
-	$text = display_content($a,$profile_uid);
+	$text = display_content($a, $profile_uid);
 	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
 	$replace = "<img\${1} dst=\"\${2}\"";
 	$text = preg_replace($pattern, $replace, $text);
diff --git a/mod/update_network.php b/mod/update_network.php
index a6c8173794..6519490eb0 100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -5,11 +5,11 @@
 use Friendica\App;
 use Friendica\Core\PConfig;
 
-require_once("mod/network.php");
 require_once("include/group.php");
+require_once "mod/network.php";
 
-function update_network_content(App $a) {
-
+function update_network_content(App $a)
+{
 	$profile_uid = intval($_GET["p"]);
 
 	header("Content-type: text/html");
diff --git a/src/Model/User.php b/src/Model/User.php
index a66075cac6..ae173fe73d 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -225,7 +225,6 @@ class User
 		}
 
 		// So now we are just looking for a space in the full name.
-
 		$loose_reg = Config::get('system', 'no_regfullname');
 		if (!$loose_reg) {
 			$username = mb_convert_case($username, MB_CASE_TITLE, 'UTF-8');
@@ -234,7 +233,6 @@ class User
 			}
 		}
 
-
 		if (!allowed_email($email)) {
 			$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
 		}