From 095d458de4de8e18e0a7222f17ba6e76f80a652f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 29 Dec 2017 22:23:58 -0500 Subject: [PATCH] Fix formatting mod/profile --- mod/profile.php | 165 ++++++++++++++++++++++++------------------------ 1 file changed, 83 insertions(+), 82 deletions(-) diff --git a/mod/profile.php b/mod/profile.php index 59835bd4c..9b609f885 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -6,78 +6,79 @@ use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Database\DBM; -require_once('include/contact_widgets.php'); -require_once('include/redir.php'); +require_once 'include/contact_widgets.php'; +require_once 'include/redir.php'; -function profile_init(App $a) { - - if(! x($a->page,'aside')) +function profile_init(App $a) +{ + if (!x($a->page, 'aside')) { $a->page['aside'] = ''; + } - if($a->argc > 1) + if ($a->argc > 1) { $which = htmlspecialchars($a->argv[1]); - 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"); + } 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"); 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 ); + notice(t('Requested profile is not available.') . EOL); $a->error = 404; return; } } $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); + profile_load($a, $which, $profile); - $blocked = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); - $userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false); + $blocked = Config::get('system', 'block_public') && !local_user() && !remote_user(); + $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'] .= ''; } - if (x($a->profile,'openidserver')) { + + if (x($a->profile, 'openidserver')) { $a->page['htmlhead'] .= '' . "\r\n"; } - if (x($a->profile,'openid')) { - $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'https://' . $a->profile['openid']); + + if (x($a->profile, 'openid')) { + $delegate = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'https://' . $a->profile['openid']); $a->page['htmlhead'] .= '' . "\r\n"; } // site block - if ((! $blocked) && (! $userblock)) { - $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : ''); - $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords); - if(strlen($keywords)) - $a->page['htmlhead'] .= '' . "\r\n" ; + if (!$blocked && !$userblock) { + $keywords = x($a->profile, 'pub_keywords') ? $a->profile['pub_keywords'] : ''; + $keywords = str_replace(array('#', ',', ' ', ',,'), array('', ' ', ',', ','), $keywords); + if (strlen($keywords)) { + $a->page['htmlhead'] .= '' . "\r\n"; + } } - $a->page['htmlhead'] .= '' . "\r\n" ; - $a->page['htmlhead'] .= '' . "\r\n" ; - $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); + $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; + $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : '')); $a->page['htmlhead'] .= '' . "\r\n"; header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); $dfrn_pages = array('request', 'confirm', 'notify', 'poll'); foreach ($dfrn_pages as $dfrn) { - $a->page['htmlhead'] .= "\r\n"; + $a->page['htmlhead'] .= "\r\n"; } - $a->page['htmlhead'] .= "\r\n"; + $a->page['htmlhead'] .= "\r\n"; } - -function profile_content(App $a, $update = 0) { - +function profile_content(App $a, $update = 0) +{ $category = $datequery = $datequery2 = ''; if ($a->argc > 2) { @@ -94,21 +95,21 @@ function profile_content(App $a, $update = 0) { } } - if (! x($category)) { - $category = ((x($_GET,'category')) ? $_GET['category'] : ''); + if (!x($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())) { + if (Config::get('system', 'block_public') && (!local_user()) && (!remote_user())) { return login(); } - require_once("include/bbcode.php"); - require_once('include/security.php'); - require_once('include/conversation.php'); - require_once('include/acl_selectors.php'); - require_once('include/items.php'); + require_once 'include/bbcode.php'; + require_once 'include/security.php'; + require_once 'include/conversation.php'; + require_once 'include/acl_selectors.php'; + require_once 'include/items.php'; $groups = array(); @@ -148,74 +149,72 @@ function profile_content(App $a, $update = 0) { } } - if (! $remote_contact) { + if (!$remote_contact) { if (local_user()) { $contact_id = $_SESSION['cid']; $contact = $a->contact; } } - $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)) { - notice( t('Access to this profile has been restricted.') . EOL); + if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) { + notice(t('Access to this profile has been restricted.') . EOL); return; } - if (! $update) { - if (x($_GET,'tab')) { + if (!$update) { + if (x($_GET, 'tab')) { $tab = notags(trim($_GET['tab'])); } - $o.=profile_tabs($a, $is_owner, $a->profile['nickname']); + $o .= profile_tabs($a, $is_owner, $a->profile['nickname']); if ($tab === 'profile') { $o .= advanced_profile($a); - call_hooks('profile_advanced',$o); + call_hooks('profile_advanced', $o); return $o; } $o .= common_friends_visitor_widget($a->profile['profile_uid']); - if (x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner) { + if (x($_SESSION, 'new_member') && $_SESSION['new_member'] && $is_owner) { $o .= '' . t('Tips for New Members') . '' . EOL; } $commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false); $commvisitor = (($commpage && $remote_contact == true) ? true : false); - $a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true); - $a->page['aside'] .= categories_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : '')); + $a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'], true); + $a->page['aside'] .= categories_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (x($category) ? xmlify($category) : '')); $a->page['aside'] .= tagcloud_wall_widget(); - if (can_write_wall($a,$a->profile['profile_uid'])) { - + 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'])) || - (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || - (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($a->user, true) : ''), + 'lockstate' => is_array($a->user) + && (strlen($a->user['allow_cid']) + || strlen($a->user['allow_gid']) + || 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); + $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); - + // 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); @@ -233,7 +232,7 @@ function profile_content(App $a, $update = 0) { FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND - (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' + (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE . "' OR item.verb = '" . ACTIVITY_DISLIKE . "' OR item.verb = '" . ACTIVITY_ATTEND . "' OR item.verb = '" . ACTIVITY_ATTENDNO . "' OR item.verb = '" . ACTIVITY_ATTENDMAYBE . "') AND `item`.`moderated` = 0 @@ -247,7 +246,6 @@ function profile_content(App $a, $update = 0) { if (!DBM::is_result($r)) { return ''; } - } else { $sql_post_table = ""; @@ -263,10 +261,10 @@ function profile_content(App $a, $update = 0) { } if ($datequery) { - $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery)))); + $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery)))); } if ($datequery2) { - $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); + $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2)))); } // Belongs the profile page to a forum? @@ -283,20 +281,22 @@ function profile_content(App $a, $update = 0) { // check if we serve a mobile device and get the user settings // accordingly if ($a->is_mobile) { - $itemspage_network = PConfig::get(local_user(),'system','itemspage_mobile_network'); + $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network'); $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10); } else { - $itemspage_network = PConfig::get(local_user(),'system','itemspage_network'); + $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); - $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); + $pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage'])); $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network` FROM `thread` @@ -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,23 +322,25 @@ 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 + $items = q(item_query() . " AND `item`.`uid` = %d AND `item`.`parent` IN (%s) $sql_extra ", intval($a->profile['profile_uid']), dbesc($parents_str) ); - $items = conv_sort($items,'created'); + $items = conv_sort($items, 'created'); } else { $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(); }