X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=32d3985b7f844f11bd4618290a965af737bd8ab0;hb=5adfeb0bd5fed2f793332056c03bb7c043d5fc69;hp=58e3a160721cc78014f7c1f3b49c6db09fb9c3ef;hpb=1dd77ee443f700c4f48e8b655ceef968b8fbb753;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index 58e3a16072..c2b4fe2489 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,20 +1,22 @@
page,'aside'))
$a->page['aside'] = '';
if($a->argc > 1)
- $which = $a->argv[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");
- if(count($r)) {
- goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
+ if (dbm::is_result($r)) {
+ goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
}
else {
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
@@ -27,7 +29,7 @@ function profile_init(&$a) {
$profile = 0;
if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
$which = $a->user['nickname'];
- $profile = $a->argv[1];
+ $profile = htmlspecialchars($a->argv[1]);
}
else {
auto_redir($a, $which);
@@ -41,14 +43,15 @@ function profile_init(&$a) {
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')) {
+ }
+ 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)) {
+ if ((! $blocked) && (! $userblock)) {
$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
if(strlen($keywords))
@@ -56,41 +59,43 @@ function profile_init(&$a) {
}
$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";
- header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
+ $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'] .= "get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
- $a->page['htmlhead'] .= "get_baseurl()."/poco/{$which}\" />\r\n";
+ foreach ($dfrn_pages as $dfrn) {
+ $a->page['htmlhead'] .= "\r\n";
+ }
+ $a->page['htmlhead'] .= "\r\n";
}
-function profile_content(&$a, $update = 0) {
+function profile_content(App $a, $update = 0) {
$category = $datequery = $datequery2 = '';
- if($a->argc > 2) {
- for($x = 2; $x < $a->argc; $x ++) {
- if(is_a_date_arg($a->argv[$x])) {
- if($datequery)
+ if ($a->argc > 2) {
+ for ($x = 2; $x < $a->argc; $x ++) {
+ if (is_a_date_arg($a->argv[$x])) {
+ if ($datequery) {
$datequery2 = escape_tags($a->argv[$x]);
- else
+ } else {
$datequery = escape_tags($a->argv[$x]);
- }
- else
+ }
+ } else {
$category = $a->argv[$x];
+ }
}
}
- if(! x($category)) {
+ if (! x($category)) {
$category = ((x($_GET,'category')) ? $_GET['category'] : '');
}
- if(get_config('system','block_public') && (! local_user()) && (! remote_user())) {
+ if (get_config('system','block_public') && (! local_user()) && (! remote_user())) {
return login();
}
@@ -105,86 +110,80 @@ function profile_content(&$a, $update = 0) {
$tab = 'posts';
$o = '';
- if($update) {
+ if ($update) {
// Ensure we've got a profile owner if updating.
$a->profile['profile_uid'] = $update;
+ } elseif ($a->profile['profile_uid'] == local_user()) {
+ nav_set_selected('home');
}
- else {
- if($a->profile['profile_uid'] == local_user()) {
- nav_set_selected('home');
- }
- }
-
$contact = null;
$remote_contact = false;
$contact_id = 0;
- if(is_array($_SESSION['remote'])) {
- foreach($_SESSION['remote'] as $v) {
- if($v['uid'] == $a->profile['profile_uid']) {
+ if (is_array($_SESSION['remote'])) {
+ foreach ($_SESSION['remote'] as $v) {
+ if ($v['uid'] == $a->profile['profile_uid']) {
$contact_id = $v['cid'];
break;
}
}
}
- if($contact_id) {
+ if ($contact_id) {
$groups = init_groups_visitor($contact_id);
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
intval($a->profile['profile_uid'])
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$contact = $r[0];
$remote_contact = true;
}
}
- if(! $remote_contact) {
- if(local_user()) {
+ 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);
+ $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;
}
- 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']);
-
- if($tab === 'profile') {
+ if ($tab === 'profile') {
$o .= advanced_profile($a);
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($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
- $a->page['aside'] .= categories_widget($a->get_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) : ''));
- if(can_write_wall($a,$a->profile['profile_uid'])) {
+ if (can_write_wall($a,$a->profile['profile_uid'])) {
$x = array(
'is_owner' => $is_owner,
@@ -199,79 +198,85 @@ function profile_content(&$a, $update = 0) {
'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
- );
+ );
- $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);
- if($update) {
+ if ($update) {
+ $last_updated = (x($_SESSION['last_updated'], $last_updated_key) ? $_SESSION['last_updated'][$last_updated_key] : 0);
- $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`,
- `contact`.`uid` AS `contact-uid`
+ // If the page user is the owner of the page we should query for unseen
+ // items. Otherwise use a timestamp of the last succesful update request.
+ if ($is_owner || !$last_updated) {
+ $sql_extra4 = " AND `item`.`unseen`";
+ } else {
+ $gmupdate = gmdate("Y-m-d H:i:s", $last_updated);
+ $sql_extra4 = " AND `item`.`received` > '" . $gmupdate . "'";
+ }
+
+ $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created`
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 ."'
OR item.verb = '" . ACTIVITY_DISLIKE . "' OR item.verb = '" . ACTIVITY_ATTEND . "'
OR item.verb = '" . ACTIVITY_ATTENDNO . "' OR item.verb = '" . ACTIVITY_ATTENDMAYBE . "')
- AND `item`.`moderated` = 0 and `item`.`unseen` = 1
+ AND `item`.`moderated` = 0
AND `item`.`wall` = 1
+ $sql_extra4
$sql_extra
ORDER BY `item`.`created` DESC",
intval($a->profile['profile_uid'])
);
+ if (!dbm::is_result($r)) {
+ return '';
+ }
+
} else {
$sql_post_table = "";
- if(x($category)) {
+ if (x($category)) {
$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($a->profile['profile_uid']));
//$sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category'));
}
- if($datequery) {
+ if ($datequery) {
$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
}
- if($datequery2) {
+ if ($datequery2) {
$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
}
- if(get_config('system', 'old_pager')) {
- $r = q("SELECT COUNT(*) AS `total`
- FROM `thread` INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
- $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- WHERE `thread`.`uid` = %d AND `thread`.`visible` = 1 AND `thread`.`deleted` = 0
- and `thread`.`moderated` = 0
- AND `thread`.`wall` = 1
- $sql_extra $sql_extra2 ",
- intval($a->profile['profile_uid'])
- );
-
- if(count($r)) {
- $a->set_pager_total($r[0]['total']);
- }
+ // Belongs the profile page to a forum?
+ // If not then we can improve the performance with an additional condition
+ $r = q("SELECT `uid` FROM `user` WHERE `uid` = %d AND `page-flags` IN (%d, %d)",
+ intval($a->profile['profile_uid']),
+ intval(PAGE_COMMUNITY),
+ intval(PAGE_PRVGROUP));
+
+ if (!dbm::is_result($r)) {
+ $sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
}
// check if we serve a mobile device and get the user settings
// accordingly
if ($a->is_mobile) {
- $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network');
- $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10);
+ $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network');
+ $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10);
} else {
- $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
- $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
+ $itemspage_network = get_pconfig(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
@@ -282,39 +287,37 @@ function profile_content(&$a, $update = 0) {
$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`,
- `thread`.`uid` AS `contact-uid`
- FROM `thread` FORCE INDEX (`uid_created`) INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
- $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- WHERE `thread`.`uid` = %d AND `thread`.`visible` = 1 AND `thread`.`deleted` = 0
- and `thread`.`moderated` = 0
- AND `thread`.`wall` = 1
- $sql_extra $sql_extra2
- ORDER BY `thread`.`created` DESC $pager_sql ",
+ $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`
+ FROM `thread`
+ STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+ $sql_post_table
+ STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
+ AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ WHERE `thread`.`uid` = %d AND `thread`.`visible`
+ AND NOT `thread`.`deleted`
+ AND NOT `thread`.`moderated`
+ AND `thread`.`wall`
+ $sql_extra3 $sql_extra $sql_extra2
+ ORDER BY `thread`.`created` DESC $pager_sql",
intval($a->profile['profile_uid'])
-
);
+
}
$parents_arr = array();
$parents_str = '';
- if(count($r)) {
+ // Set a time stamp for this page. We will make use of it when we
+ // search for new items (update routine)
+ $_SESSION['last_updated'][$last_updated_key] = time();
+
+ if (dbm::is_result($r)) {
foreach($r as $rr)
$parents_arr[] = $rr['item_id'];
$parents_str = implode(', ', $parents_arr);
- $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
- `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
- `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
- FROM `item`, `contact`
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- and `item`.`moderated` = 0
- AND `contact`.`id` = `item`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`parent` IN ( %s )
+ $items = q(item_query()." AND `item`.`uid` = %d
+ AND `item`.`parent` IN (%s)
$sql_extra ",
intval($a->profile['profile_uid']),
dbesc($parents_str)
@@ -331,21 +334,18 @@ function profile_content(&$a, $update = 0) {
}
- if($is_owner) {
- $r = q("UPDATE `item` SET `unseen` = 0
- WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
- intval(local_user())
- );
+ if ($is_owner) {
+ $unseen = dba::exists('item', array('wall' => true, 'unseen' => true, 'uid' => local_user()));
+ if ($unseen) {
+ $r = dba::update('item', array('unseen' => false),
+ array('wall' => true, 'unseen' => true, 'uid' => local_user()));
+ }
}
- $o .= conversation($a,$items,'profile',$update);
+ $o .= conversation($a, $items, 'profile', $update);
- if(! $update) {
- if(!get_config('system', 'old_pager')) {
- $o .= alt_pager($a,count($items));
- } else {
- $o .= paginate($a);
- }
+ if (!$update) {
+ $o .= alt_pager($a, count($items));
}
return $o;