X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofile.php;h=59835bd4cbf5b3bf85b78818b7f1809c41de0363;hb=a5e91175243a41c77a56e73efc3672f20a7e6d23;hp=32d3985b7f844f11bd4618290a965af737bd8ab0;hpb=bc9cb5e5f6bca2a193b85b3b6700592f8042b150;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index 32d3985b7f..59835bd4cb 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,10 +1,15 @@
page,'aside'))
$a->page['aside'] = '';
@@ -13,8 +18,8 @@ function profile_init(App &$a) {
$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 (dbm::is_result($r)) {
- goaway(App::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);
@@ -35,7 +40,7 @@ function profile_init(App &$a) {
profile_load($a,$which,$profile);
- $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+ $blocked = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
$userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false);
if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
@@ -57,21 +62,21 @@ function profile_init(App &$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: <' . App::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'] .= "\r\n";
+ $a->page['htmlhead'] .= "\r\n";
}
- $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 = '';
@@ -93,7 +98,9 @@ function profile_content(&$a, $update = 0) {
$category = ((x($_GET,'category')) ? $_GET['category'] : '');
}
- if (get_config('system','block_public') && (! local_user()) && (! remote_user())) {
+ $hashtags = (x($_GET, 'tag') ? $_GET['tag'] : '');
+
+ if (Config::get('system','block_public') && (! local_user()) && (! remote_user())) {
return login();
}
@@ -135,7 +142,7 @@ function profile_content(&$a, $update = 0) {
intval($contact_id),
intval($a->profile['profile_uid'])
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$contact = $r[0];
$remote_contact = true;
}
@@ -149,6 +156,7 @@ function profile_content(&$a, $update = 0) {
}
$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)) {
notice( t('Access to this profile has been restricted.') . EOL);
@@ -177,8 +185,9 @@ function profile_content(&$a, $update = 0) {
$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
$commvisitor = (($commpage && $remote_contact == true) ? true : false);
- $a->page['aside'] .= posted_date_widget(App::get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
- $a->page['aside'] .= categories_widget(App::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) : ''));
+ $a->page['aside'] .= tagcloud_wall_widget();
if (can_write_wall($a,$a->profile['profile_uid'])) {
@@ -195,9 +204,9 @@ 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);
}
}
@@ -209,21 +218,36 @@ function profile_content(&$a, $update = 0) {
if ($update) {
+ $last_updated = (x($_SESSION['last_updated'], $last_updated_key) ? $_SESSION['last_updated'][$last_updated_key] : 0);
+
+ // 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`
+ $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 = "";
@@ -233,6 +257,11 @@ function profile_content(&$a, $update = 0) {
//$sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category'));
}
+ if (x($hashtags)) {
+ $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($hashtags)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval($a->profile['profile_uid']));
+ }
+
if ($datequery) {
$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
}
@@ -240,30 +269,24 @@ function profile_content(&$a, $update = 0) {
$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'])
- );
+ // 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)) {
- $a->set_pager_total($r[0]['total']);
- }
+ 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 = PConfig::get(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 = 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
@@ -282,21 +305,24 @@ function profile_content(&$a, $update = 0) {
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 `thread`.`contact-id` = %d
AND NOT `thread`.`deleted`
AND NOT `thread`.`moderated`
AND `thread`.`wall`
- $sql_extra $sql_extra2
+ $sql_extra3 $sql_extra $sql_extra2
ORDER BY `thread`.`created` DESC $pager_sql",
- intval($a->profile['profile_uid']),
- intval($a->profile['contact_id'])
+ intval($a->profile['profile_uid'])
);
+
}
$parents_arr = array();
$parents_str = '';
- if (dbm::is_result($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);
@@ -313,27 +339,24 @@ function profile_content(&$a, $update = 0) {
$items = array();
}
- if($is_owner && (! $update) && (! get_config('theme','hide_eventlist'))) {
+ if($is_owner && (! $update) && (! Config::get('theme','hide_eventlist'))) {
$o .= get_birthdays();
$o .= get_events();
}
- 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;