Fix formatting mod/profile

mod/profile.php

@@ -6,22 +6,22 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-require_once('include/contact_widgets.php');
+require_once 'include/contact_widgets.php';
-require_once('include/redir.php');
+require_once 'include/redir.php';
 
-function profile_init(App $a) {
+function profile_init(App $a)
-
+{
-	if(! x($a->page,'aside'))
+	if (!x($a->page, 'aside')) {
 		$a->page['aside'] = '';
+	}
 
-	if($a->argc > 1)
+	if ($a->argc > 1) {
 		$which = htmlspecialchars($a->argv[1]);
-	else {
+	} else {
-		$r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1");
+		$r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1");
 		if (DBM::is_result($r)) {
 			goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
-		}
+		} else {
-		else {
 			logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
 			notice(t('Requested profile is not available.') . EOL);
 			$a->error = 404;
@@ -30,40 +30,42 @@ function profile_init(App $a) {
 	}
 
 	$profile = 0;
-	if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
+	if (local_user() && $a->argc > 2 && $a->argv[2] === 'view') {
 		$which = $a->user['nickname'];
 		$profile = htmlspecialchars($a->argv[1]);
-	}
+	} else {
-	else {
 		auto_redir($a, $which);
 	}
 
 	profile_load($a, $which, $profile);
 
-	$blocked = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+	$blocked = Config::get('system', 'block_public') && !local_user() && !remote_user();
-	$userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false);
+	$userblock = $a->profile['hidewall'] && !local_user() && !remote_user();
 
-	if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
+	if (x($a->profile, 'page-flags') && $a->profile['page-flags'] == PAGE_COMMUNITY) {
 		$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
 	}
+
 	if (x($a->profile, 'openidserver')) {
 		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
 	}
+
 	if (x($a->profile, 'openid')) {
 		$delegate = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'https://' . $a->profile['openid']);
 		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 	}
 	// site block
-	if ((! $blocked) && (! $userblock)) {
+	if (!$blocked && !$userblock) {
-		$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+		$keywords = x($a->profile, 'pub_keywords') ? $a->profile['pub_keywords'] : '';
 		$keywords = str_replace(array('#', ',', ' ', ',,'), array('', ' ', ',', ','), $keywords);
-		if(strlen($keywords))
+		if (strlen($keywords)) {
 			$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n";
 		}
+	}
 
-	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
+	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . ($a->profile['net-publish'] ? 'true' : 'false') . '" />' . "\r\n";
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which . '" />' . "\r\n";
-	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''));
 	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
 	header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
@@ -71,13 +73,12 @@ function profile_init(App $a) {
 	foreach ($dfrn_pages as $dfrn) {
 		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"" . System::baseUrl() . "/dfrn_{$dfrn}/{$which}\" />\r\n";
 	}
-	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".System::baseUrl()."/poco/{$which}\" />\r\n";
 
+	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"" . System::baseUrl() . "/poco/{$which}\" />\r\n";
 }
 
-
+function profile_content(App $a, $update = 0)
-function profile_content(App $a, $update = 0) {
+{
-
 	$category = $datequery = $datequery2 = '';
 
 	if ($a->argc > 2) {
@@ -95,20 +96,20 @@ function profile_content(App $a, $update = 0) {
 	}
 
 	if (!x($category)) {
-		$category = ((x($_GET,'category')) ? $_GET['category'] : '');
+		$category = x($_GET, 'category') ? $_GET['category'] : '';
 	}
 
-	$hashtags = (x($_GET, 'tag') ? $_GET['tag'] : '');
+	$hashtags = x($_GET, 'tag') ? $_GET['tag'] : '';
 
 	if (Config::get('system', 'block_public') && (!local_user()) && (!remote_user())) {
 		return login();
 	}
 
-	require_once("include/bbcode.php");
+	require_once 'include/bbcode.php';
-	require_once('include/security.php');
+	require_once 'include/security.php';
-	require_once('include/conversation.php');
+	require_once 'include/conversation.php';
-	require_once('include/acl_selectors.php');
+	require_once 'include/acl_selectors.php';
-	require_once('include/items.php');
+	require_once 'include/items.php';
 
 	$groups = array();
 
@@ -155,10 +156,10 @@ function profile_content(App $a, $update = 0) {
 		}
 	}
 
-	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+	$is_owner = local_user() && local_user() == $a->profile['profile_uid'];
 	$last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
 
-	if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+	if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
 		notice(t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
@@ -190,33 +191,31 @@ function profile_content(App $a, $update = 0) {
 		$a->page['aside'] .= tagcloud_wall_widget();
 
 		if (can_write_wall($a, $a->profile['profile_uid'])) {
-
 			$x = array(
 				'is_owner' => $is_owner,
 				'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false),
 				'default_location' => (($is_owner) ? $a->user['default-location'] : ''),
 				'nickname' => $a->profile['nickname'],
-				'lockstate' => (((is_array($a->user) && ((strlen($a->user['allow_cid'])) ||
+				'lockstate' => is_array($a->user)
-						(strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) ||
+					&& (strlen($a->user['allow_cid'])
-						(strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+						|| strlen($a->user['allow_gid'])
-				'acl' => (($is_owner) ? populate_acl($a->user, true) : ''),
+						|| strlen($a->user['deny_cid'])
+						|| strlen($a->user['deny_gid'])
+					) ? 'lock' : 'unlock',
+				'acl' => $is_owner ? populate_acl($a->user, true) : '',
 				'bang' => '',
-				'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
+				'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
 				'profile_uid' => $a->profile['profile_uid'],
-				'acl_data' => ( $is_owner ? construct_acl_data($a, $a->user) : '' ), // For non-Javascript ACL selector
+				'acl_data' => $is_owner ? construct_acl_data($a, $a->user) : '', // For non-Javascript ACL selector
 			);
 
 			$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
-	/**
-	 * 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);
 
-
 	if ($update) {
 		$last_updated = (x($_SESSION['last_updated'], $last_updated_key) ? $_SESSION['last_updated'][$last_updated_key] : 0);
 
@@ -247,7 +246,6 @@ function profile_content(App $a, $update = 0) {
 		if (!DBM::is_result($r)) {
 			return '';
 		}
-
 	} else {
 		$sql_post_table = "";
 
@@ -289,10 +287,12 @@ function profile_content(App $a, $update = 0) {
 			$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network');
 			$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
 		}
+
 		//  now that we have the user settings, see if the theme forces
 		//  a maximum item number which is lower then the user choice
-		if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
+		if (($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) {
 			$itemspage_network = $a->force_max_items;
+		}
 
 		$a->set_pager_itemspage($itemspage_network);
 
@@ -312,7 +312,6 @@ function profile_content(App $a, $update = 0) {
 			ORDER BY `thread`.`created` DESC $pager_sql",
 			intval($a->profile['profile_uid'])
 		);
-
 	}
 
 	$parents_arr = array();
@@ -323,8 +322,10 @@ function profile_content(App $a, $update = 0) {
 	$_SESSION['last_updated'][$last_updated_key] = time();
 
 	if (DBM::is_result($r)) {
-		foreach($r as $rr)
+		foreach ($r as $rr) {
 			$parents_arr[] = $rr['item_id'];
+		}
+
 		$parents_str = implode(', ', $parents_arr);
 
 		$items = q(item_query() . " AND `item`.`uid` = %d
@@ -339,7 +340,7 @@ function profile_content(App $a, $update = 0) {
 		$items = array();
 	}
 
-	if($is_owner && (! $update) && (! Config::get('theme','hide_eventlist'))) {
+	if ($is_owner && !$update && !Config::get('theme', 'hide_eventlist')) {
 		$o .= get_birthdays();
 		$o .= get_events();
 	}