X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=b7b76cbb5bbe60c30003096513a370142f2d5e41;hb=72896b0f6b1677a42970f432485df213318141e9;hp=827166f92731135c093061981eec72176c43393b;hpb=7de5c7ebe1fba7757f06762d26dae478c9de5389;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index 827166f927..b7b76cbb5b 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -27,7 +27,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 = $a->argv[1];
}
else {
auto_redir($a, $which);
@@ -41,10 +41,10 @@ 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')) {
- $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
+ $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'https://' . $a->profile['openid']);
$a->page['htmlhead'] .= '' . "\r\n";
}
// site block
@@ -60,7 +60,7 @@ function profile_init(&$a) {
$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);
-
+
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
foreach($dfrn_pages as $dfrn)
$a->page['htmlhead'] .= "get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
@@ -166,7 +166,6 @@ function profile_content(&$a, $update = 0) {
if($tab === 'profile') {
- require_once('include/profile_advanced.php');
$o .= advanced_profile($a);
call_hooks('profile_advanced',$o);
return $o;
@@ -182,26 +181,27 @@ function profile_content(&$a, $update = 0) {
$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
$commvisitor = (($commpage && $remote_contact == true) ? true : false);
- $celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
- $a->page['aside'] .= posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
+ $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) : ''));
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, $celeb) : ''),
- 'bang' => '',
- 'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
- 'profile_uid' => $a->profile['profile_uid']
- );
-
- $o .= status_editor($a,$x);
+ '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) : ''),
+ 'bang' => '',
+ '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);
}
}
@@ -216,38 +216,45 @@ function profile_content(&$a, $update = 0) {
if($update) {
- $r = q("SELECT distinct(parent) AS `item_id`, `contact`.`uid` AS `contact-uid`
- FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
- (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
- and `item`.`moderated` = 0 and `item`.`unseen` = 1
+ $r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`,
+ `contact`.`uid` AS `contact-uid`
+ 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`.`wall` = 1
$sql_extra
ORDER BY `item`.`created` DESC",
intval($a->profile['profile_uid'])
);
- }
- else {
+ } else {
+ $sql_post_table = "";
if(x($category)) {
- $sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'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) {
- $sql_extra2 .= protect_sprintf(sprintf(" AND item.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 item.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))));
}
- if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
+ if(get_config('system', 'old_pager')) {
$r = q("SELECT COUNT(*) AS `total`
- FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
+ 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'])
);
@@ -257,8 +264,17 @@ function profile_content(&$a, $update = 0) {
}
}
- $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
- $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+ // 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 : 20);
+ } else {
+ $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+ $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+ }
+ // 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))
$itemspage_network = $a->force_max_items;
@@ -266,17 +282,19 @@ function profile_content(&$a, $update = 0) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
- $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
- FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1
+ $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`,
+ `thread`.`uid` AS `contact-uid`
+ 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
- ORDER BY `item`.`created` DESC $pager_sql ",
+ ORDER BY `thread`.`created` DESC $pager_sql ",
intval($a->profile['profile_uid'])
);
-
}
$parents_arr = array();
@@ -286,10 +304,10 @@ function profile_content(&$a, $update = 0) {
foreach($r as $rr)
$parents_arr[] = $rr['item_id'];
$parents_str = implode(', ', $parents_arr);
-
- $items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
- `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
+
+ $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
@@ -301,7 +319,7 @@ function profile_content(&$a, $update = 0) {
intval($a->profile['profile_uid']),
dbesc($parents_str)
);
-
+
$items = conv_sort($items,'created');
} else {
$items = array();
@@ -314,7 +332,7 @@ function profile_content(&$a, $update = 0) {
if($is_owner) {
- $r = q("UPDATE `item` SET `unseen` = 0
+ $r = q("UPDATE `item` SET `unseen` = 0
WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
intval(local_user())
);
@@ -323,12 +341,11 @@ function profile_content(&$a, $update = 0) {
$o .= conversation($a,$items,'profile',$update);
if(! $update) {
- if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {
- $o .= paginate($a);
- }
- else {
- $o .= alt_pager($a,count($items));
- }
+ if(!get_config('system', 'old_pager')) {
+ $o .= alt_pager($a,count($items));
+ } else {
+ $o .= paginate($a);
+ }
}
return $o;