]> git.mxchange.org Git - friendica.git/blobdiff - mod/profile.php
Merge branch 'master' of git://github.com/friendika/friendika
[friendica.git] / mod / profile.php
index a12fd9af2c81236ef5da9dbe1ca473b1224262cb..587ac6288e7b1cfa60b7a5dded955091bddf6a95 100644 (file)
@@ -2,6 +2,9 @@
 
 function profile_init(&$a) {
 
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user()))
+               return;
+
        if($a->argc > 1)
                $which = $a->argv[1];
        else {
@@ -48,9 +51,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';
@@ -89,19 +97,27 @@ 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) ?     '<a href="events" id="profile-tab-events-link" class="profile-tabs" >' . t('Events') . '</a>' : ''),
+                       '$notes' => (($is_owner) ?      '<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >' . t('Personal Notes') . '</a>' : '')
                ));
 
 
@@ -112,6 +128,9 @@ function profile_content(&$a, $update = 0) {
                        return $o;
                }
 
+               if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
+                       $o .= '<a href="newmember">' . t('Tips for New Members') . '</a>' . EOL;
+
                $commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
                $commvisitor = (($commpage && $remote_contact == true) ? true : false);
 
@@ -119,66 +138,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 = '';
-                       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,
@@ -205,7 +177,7 @@ function profile_content(&$a, $update = 0) {
                // 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",
+                       WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
                        intval($_SESSION['uid'])
                );
 
@@ -274,12 +246,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)
                );
@@ -288,11 +261,7 @@ function profile_content(&$a, $update = 0) {
        if($is_owner && ! $update)
                $o .= get_birthdays();
 
-
-       require_once('include/conversation.php');
-
-       $o .= conversation($a,$r,'profile',$display);
-
+       $o .= conversation($a,$r,'profile',$update);
 
        if(! $update) {