X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofile.php;h=2dd5df75855079153c9bb47e5b22736baa50b510;hb=d653d922b117cb123268e0b7f7b584e86482f5a7;hp=fa2c261df8409054d65140dfcd4f4cf1e7ca3401;hpb=ab099e91028122dfb6b10cf9510b1b061f6f547f;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index fa2c261df8..2dd5df7585 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -2,6 +2,8 @@
function profile_init(&$a) {
+ $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+
if($a->argc > 1)
$which = $a->argv[1];
else {
@@ -18,7 +20,7 @@ function profile_init(&$a) {
profile_load($a,$which,$profile);
- 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'))
@@ -28,10 +30,12 @@ function profile_init(&$a) {
$a->page['htmlhead'] .= '' . "\r\n";
}
- $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) {
+ $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" ;
@@ -48,10 +52,14 @@ function profile_init(&$a) {
function profile_content(&$a, $update = 0) {
+ if(get_config('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');
$groups = array();
$tab = 'posts';
@@ -90,19 +98,28 @@ function profile_content(&$a, $update = 0) {
}
$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+
+ 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']));
- $tpl = load_view_file('view/profile_tabs.tpl');
+ $tpl = get_markup_template('profile_tabs.tpl');
$o .= replace_macros($tpl,array(
'$url' => $a->get_baseurl() . '/' . $a->cmd,
'$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
'$status' => t('Status'),
'$profile' => t('Profile'),
- '$photos' => t('Photos')
+ '$photos' => t('Photos'),
+ '$events' => (($is_owner) ? t('Events') : ''),
+ '$notes' => (($is_owner) ? t('Personal Notes') : ''),
+ '$activetab' => $tab,
));
@@ -113,6 +130,9 @@ function profile_content(&$a, $update = 0) {
return $o;
}
+ 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);
@@ -120,86 +140,19 @@ function profile_content(&$a, $update = 0) {
if(can_write_wall($a,$a->profile['profile_uid'])) {
- $geotag = ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
-
- $tpl = load_view_file('view/jot-header.tpl');
-
- $a->page['htmlhead'] .= replace_macros($tpl, array(
- '$baseurl' => $a->get_baseurl(),
- '$geotag' => $geotag,
- '$nickname' => $a->profile['nickname'],
- '$linkurl' => t('Please enter a link URL:'),
- '$utubeurl' => t('Please enter a YouTube link:'),
- '$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
- '$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
- '$whereareu' => t('Where are you right now?'),
- '$title' => t('Enter a title for this item')
- ));
-
- require_once('include/acl_selectors.php');
-
- $tpl = load_view_file('view/jot.tpl');
-
- if(is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))
- $lockstate = 'lock';
- else
- $lockstate = 'unlock';
-
- $jotplugins = '';
- $jotnets = '';
-
- $mail_enabled = false;
- $pubmail_enabled = false;
-
- if($is_owner) {
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
- intval(local_user())
- );
- if(count($r)) {
- $mail_enabled = true;
- if(intval($r[0]['pubmail']))
- $pubmail_enabled = true;
- }
- }
- if($mail_enabled) {
- $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
- $jotnets .= '
'
- . t("Post to Email") . '
';
- }
-
- call_hooks('jot_tool', $jotplugins);
-
- call_hooks('jot_networks', $jotnets);
-
- $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
-
- $o .= replace_macros($tpl,array(
- '$baseurl' => $a->get_baseurl(),
- '$action' => 'item',
- '$share' => t('Share'),
- '$upload' => t('Upload photo'),
- '$weblink' => t('Insert web link'),
- '$youtube' => t('Insert YouTube video'),
- '$video' => t('Insert Vorbis [.ogg] video'),
- '$audio' => t('Insert Vorbis [.ogg] audio'),
- '$setloc' => t('Set your location'),
- '$noloc' => t('Clear browser location'),
- '$title' => t('Set title'),
- '$wait' => t('Please wait'),
- '$permset' => t('Permission settings'),
- '$content' => '',
- '$post_id' => '',
- '$defloc' => (($is_owner) ? $a->user['default-location'] : ''),
- '$return_path' => $a->cmd,
- '$visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
- '$lockstate' => $lockstate,
- '$emailcc' => t('CC: email addresses'),
- '$jotnets' => $jotnets,
- '$emtitle' => t('Example: bob@example.com, mary@example.com'),
- '$bang' => '',
- '$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
- '$profile_uid' => $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);
}
// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
@@ -208,52 +161,23 @@ function profile_content(&$a, $update = 0) {
if($tab === 'posts') {
$o .= '' . "\r\n";
$o .= "\r\n";
+ . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; \r\n";
}
}
- // Construct permissions
-
- // default permissions - anonymous user
-
- $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
-
- // Profile owner - everything is visible
-
if($is_owner) {
- $sql_extra = '';
-
- // Oh - while we're here... reset the Unseen messages
-
$r = q("UPDATE `item` SET `unseen` = 0
- WHERE `type` != 'remote' AND `unseen` = 1 AND `uid` = %d",
- intval($_SESSION['uid'])
+ WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
+ intval(local_user())
);
-
}
- // authenticated visitor - here lie dragons
- // If $remotecontact is true, we know that not only is this a remotely authenticated
- // person, but that it is *our* contact, which is important in multi-user mode.
-
- elseif($remote_contact) {
- $gs = '<<>>'; // should be impossible to match
- if(count($groups)) {
- foreach($groups as $g)
- $gs .= '|<' . intval($g) . '>';
- }
- $sql_extra = sprintf(
- " AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
- AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
- AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
- AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ",
-
- intval($_SESSION['visitor_id']),
- intval($_SESSION['visitor_id']),
- dbesc($gs),
- dbesc($gs)
- );
- }
+ /**
+ * 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 = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
+
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -295,12 +219,13 @@ function profile_content(&$a, $update = 0) {
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`,
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
- FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent` = `p`.`id`) AS `parentitem`, `contact`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+ AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`parent` IN ( %s )
+ AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
$sql_extra
- ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
+ ORDER BY `parentitem`.`created` DESC, `gravity` ASC, `item`.`created` ASC ",
intval($a->profile['profile_uid']),
dbesc($parents_str)
);
@@ -309,15 +234,11 @@ function profile_content(&$a, $update = 0) {
if($is_owner && ! $update)
$o .= get_birthdays();
-
-
$o .= conversation($a,$r,'profile',$update);
-
if(! $update) {
-
$o .= paginate($a);
- $o .= '';
+ $o .= cc_license();
}
return $o;