harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse Source 
Conflicts:
	include/config.php
	update.php
This commit is contained in:
Alexander Kampmann
2012-04-05 13:39:15 +02:00
parent cbf4544887 9b6e91086b
commit 355c42cb30
1809 changed files with 48790 additions and 7152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/profile.php
Executable → Regular
+22 -2
View File
@@ -2,6 +2,11 @@
function profile_init(&$a) {
require_once('include/contact_widgets.php');
if(! x($a->page,'aside'))
$a->page['aside'] = '';
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
if($a->argc > 1)
@@ -59,6 +64,13 @@ function profile_init(&$a) {
function profile_content(&$a, $update = 0) {
if (x($a->category)) {
$category = $a->category;
}
else {
$category = ((x($_GET,'category')) ? $_GET['category'] : '');
}
if(get_config('system','block_public') && (! local_user()) && (! remote_user())) {
return login();
}
@@ -107,13 +119,14 @@ function profile_content(&$a, $update = 0) {
$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
if($a->user['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'))
$tab = notags(trim($_GET['tab']));
@@ -135,6 +148,8 @@ function profile_content(&$a, $update = 0) {
$celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
$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(
@@ -178,6 +193,10 @@ function profile_content(&$a, $update = 0) {
}
else {
if(x($category)) {
$sql_extra .= file_tag_file_query('item',$category,'category');
}
$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
@@ -204,6 +223,7 @@ function profile_content(&$a, $update = 0) {
intval($a->profile['profile_uid'])
);
}
$parents_arr = array();