]> git.mxchange.org Git - friendica.git/blobdiff - include/identity.php
Only import new OStatus posts if they are from our followers
[friendica.git] / include / identity.php
index 888a09ee6ff88c945384a278a1a0c2b4af3f6dc8..8138e9b046871ac8f757082db961201f968c805a 100644 (file)
@@ -6,6 +6,7 @@
 require_once('include/ForumManager.php');
 require_once('include/bbcode.php');
 require_once("mod/proxy.php");
+require_once('include/cache.php');
 
 /**
  *
@@ -31,7 +32,7 @@ require_once("mod/proxy.php");
  * @param int $profile
  * @param array $profiledata
  */
-function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
+function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
 
        $user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
                dbesc($nickname)
@@ -71,8 +72,8 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
 
        $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
 
-//             if (!$profiledata)
-//                     $_SESSION['theme'] = $a->profile['theme'];
+               if (!$profiledata  && !get_pconfig(local_user(),'system','always_my_theme'))
+                       $_SESSION['theme'] = $a->profile['theme'];
 
        $_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
 
@@ -118,12 +119,12 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
 
 /**
  * @brief Get all profil data of a local user
- * 
+ *
  * If the viewer is an authenticated remote viewer, the profile displayed is the
  * one that has been configured for his/her viewing in the Contact manager.
  * Passing a non-zero profile ID can also allow a preview of a selected profile
  * by the owner
- * 
+ *
  * @param string $nickname
  * @param int $uid
  * @param int $profile
@@ -138,7 +139,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
                                        $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
                                                intval($visitor['cid'])
                                        );
-                                       if(count($r))
+                                       if (dbm::is_result($r))
                                                $profile = $r[0]['profile-id'];
                                        break;
                                }
@@ -149,17 +150,23 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
 
        if($profile) {
                $profile_int = intval($profile);
-               $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* FROM `profile`
-                               INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-                               WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d AND `contact`.`self` = 1 LIMIT 1",
+               $r = q("SELECT `contact`.`id` AS `contact_id`, `profile`.`uid` AS `profile_uid`, `profile`.*,
+                               `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
+                       FROM `profile`
+                       INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
+                       INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
+                       WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d LIMIT 1",
                                dbesc($nickname),
                                intval($profile_int)
                );
        }
-       if((!$r) && (!count($r))) {
-               $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* FROM `profile`
-                               INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-                               WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 AND `contact`.`self` = 1 LIMIT 1",
+       if (!dbm::is_result($r)) {
+               $r = q("SELECT `contact`.`id` AS `contact_id`, `profile`.`uid` AS `profile_uid`, `profile`.*,
+                               `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
+                       FROM `profile`
+                       INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
+                       INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
+                       WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` LIMIT 1",
                                dbesc($nickname)
                );
        }
@@ -171,17 +178,17 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
 
 /**
  * @brief Formats a profile for display in the sidebar.
- * 
+ *
  * It is very difficult to templatise the HTML completely
  * because of all the conditional logic.
- * 
+ *
  * @param array $profile
  * @param int $block
- * 
+ *
  * @return HTML string stuitable for sidebar inclusion
- * 
+ *
  * @note Returns empty string if passed $profile is wrong type or not populated
- * 
+ *
  * @hooks 'profile_sidebar_enter'
  *      array $profile - profile data
  * @hooks 'profile_sidebar'
@@ -223,14 +230,16 @@ function profile_sidebar($profile, $block = 0) {
 
        // Is the local user already connected to that user?
        if ($connect AND local_user()) {
-               if (isset($profile["url"]))
+               if (isset($profile["url"])) {
                        $profile_url = normalise_link($profile["url"]);
-               else
-                       $profile_url = normalise_link($a->get_baseurl()."/profile/".$profile["nickname"]);
+               } else {
+                       $profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]);
+               }
 
                $r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'",
                        local_user(), $profile_url);
-               if (count($r))
+
+               if (dbm::is_result($r))
                        $connect = false;
        }
 
@@ -246,14 +255,34 @@ function profile_sidebar($profile, $block = 0) {
        else
                $subscribe_feed = false;
 
-       if(get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))
+       if (remote_user() OR (get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))) {
                $wallmessage = t('Message');
-       else
+               $wallmessage_link = "wallmessage/".$profile["nickname"];
+
+               if (remote_user()) {
+                       $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d",
+                               intval($profile['uid']),
+                               intval(remote_user()),
+                               intval(CONTACT_IS_FRIEND));
+               } else {
+                       $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
+                               intval($profile['uid']),
+                               dbesc(normalise_link(get_my_url())),
+                               intval(CONTACT_IS_FRIEND));
+               }
+               if ($r) {
+                       $remote_url = $r[0]["url"];
+                       $message_path = preg_replace("=(.*)/profile/(.*)=ism", "$1/message/new/", $remote_url);
+                       $wallmessage_link = $message_path.base64_encode($profile["addr"]);
+               }
+       } else {
                $wallmessage = false;
+               $wallmessage_link = false;
+       }
 
        // show edit profile to yourself
        if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
-               $profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
+               $profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
                $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
                                local_user());
 
@@ -263,9 +292,9 @@ function profile_sidebar($profile, $block = 0) {
                        'entries' => array(),
                );
 
-               if(count($r)) {
+               if (dbm::is_result($r)) {
 
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
                                $profile['menu']['entries'][] = array(
                                        'photo' => $rr['thumb'],
                                        'id' => $rr['id'],
@@ -282,7 +311,7 @@ function profile_sidebar($profile, $block = 0) {
                }
        }
        if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
-               $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
+               $profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
                $profile['menu'] = array(
                        'chg_photo' => t('Change profile photo'),
                        'cr_new' => null,
@@ -290,15 +319,8 @@ function profile_sidebar($profile, $block = 0) {
                );
        }
 
-       // check if profile is a forum
-       if((intval($profile['page-flags']) == PAGE_COMMUNITY)
-                       || (intval($profile['page-flags']) == PAGE_PRVGROUP)
-                       || (isset($profile['forum']) && intval($profile['forum']))
-                       || (isset($profile['prv']) && intval($profile['prv']))
-                       || (isset($profile['community']) && intval($profile['community'])))
-               $account_type = t('Forum');
-       else
-               $account_type = "";
+       // Fetch the account type
+       $account_type = account_type($profile);
 
        if((x($profile,'address') == 1)
                        || (x($profile,'location') == 1)
@@ -317,6 +339,8 @@ function profile_sidebar($profile, $block = 0) {
 
        $about = ((x($profile,'about') == 1) ?  t('About:') : False);
 
+       $xmpp = ((x($profile,'xmpp') == 1) ?  t('XMPP:') : False);
+
        if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
                $location = $pdesc = $gender = $marital = $homepage = $about = False;
        }
@@ -325,18 +349,21 @@ function profile_sidebar($profile, $block = 0) {
                        ? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
        $lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
 
-       $diaspora = array(
-               'guid' => $profile['guid'],
-               'podloc' => $a->get_baseurl(),
-               'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
-               'nickname' => $profile['nickname'],
-               'fullname' => $profile['name'],
-               'firstname' => $firstname,
-               'lastname' => $lastname,
-               'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
-               'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
-               'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
-       );
+       if ($profile['guid'] != "")
+               $diaspora = array(
+                       'guid' => $profile['guid'],
+                       'podloc' => App::get_baseurl(),
+                       'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
+                       'nickname' => $profile['nickname'],
+                       'fullname' => $profile['name'],
+                       'firstname' => $firstname,
+                       'lastname' => $lastname,
+                       'photo300' => App::get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
+                       'photo100' => App::get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
+                       'photo50' => App::get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
+               );
+       else
+               $diaspora = false;
 
        if (!$block){
                $contact_block = contact_block();
@@ -344,17 +371,20 @@ function profile_sidebar($profile, $block = 0) {
                if(is_array($a->profile) AND !$a->profile['hide-friends']) {
                        $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
                                intval($a->profile['uid']));
-                       if(count($r))
+                       if (dbm::is_result($r))
                                $updated =  date("c", strtotime($r[0]['updated']));
 
-                       $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+                       $r = q("SELECT COUNT(*) AS `total` FROM `contact`
+                               WHERE `uid` = %d
+                                       AND NOT `self` AND NOT `blocked` AND NOT `pending`
+                                       AND NOT `hidden` AND NOT `archive`
                                        AND `network` IN ('%s', '%s', '%s', '')",
                                intval($profile['uid']),
                                dbesc(NETWORK_DFRN),
                                dbesc(NETWORK_DIASPORA),
                                dbesc(NETWORK_OSTATUS)
                        );
-                       if(count($r))
+                       if (dbm::is_result($r))
                                $contacts = intval($r[0]['total']);
                }
        }
@@ -382,10 +412,12 @@ function profile_sidebar($profile, $block = 0) {
        $tpl = get_markup_template('profile_vcard.tpl');
        $o .= replace_macros($tpl, array(
                '$profile' => $p,
+               '$xmpp' => $xmpp,
                '$connect'  => $connect,
                '$remoteconnect'  => $remoteconnect,
                '$subscribe_feed' => $subscribe_feed,
                '$wallmessage' => $wallmessage,
+               '$wallmessage_link' => $wallmessage_link,
                '$account_type' => $account_type,
                '$location' => $location,
                '$gender'   => $gender,
@@ -400,7 +432,6 @@ function profile_sidebar($profile, $block = 0) {
                '$contact_block' => $contact_block,
        ));
 
-
        $arr = array('profile' => &$profile, 'entry' => &$o);
 
        call_hooks('profile_sidebar', $arr);
@@ -426,22 +457,28 @@ function get_birthdays() {
        $bd_format = t('g A l F d') ; // 8 AM Friday January 18
        $bd_short = t('F d');
 
-       $r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
-                       INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
-                       WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
-                       ORDER BY `start` ASC ",
-                       intval(local_user()),
-                       dbesc(datetime_convert('UTC','UTC','now + 6 days')),
-                       dbesc(datetime_convert('UTC','UTC','now'))
-       );
-
-       if($r && count($r)) {
+       $cachekey = "get_birthdays:".local_user();
+       $r = Cache::get($cachekey);
+       if (is_null($r)) {
+               $r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
+                               INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
+                               WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
+                               ORDER BY `start` ASC ",
+                               intval(local_user()),
+                               dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+                               dbesc(datetime_convert('UTC','UTC','now'))
+               );
+               if (dbm::is_result($r)) {
+                       Cache::set($cachekey, $r, CACHE_HOUR);
+               }
+       }
+       if (dbm::is_result($r)) {
                $total = 0;
                $now = strtotime('now');
                $cids = array();
 
                $istoday = false;
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        if(strlen($rr['name']))
                                $total ++;
                        if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
@@ -464,7 +501,7 @@ function get_birthdays() {
                                $url = $rr['url'];
                                if($rr['network'] === NETWORK_DFRN) {
                                        $sparkle = " sparkle";
-                                       $url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
+                                       $url = App::get_baseurl() . '/redir/'  . $rr['cid'];
                                }
 
                                $rr['link'] = $url;
@@ -478,7 +515,7 @@ function get_birthdays() {
        }
        $tpl = get_markup_template("birthdays_reminder.tpl");
        return replace_macros($tpl, array(
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => App::get_baseurl(),
                '$classtoday' => $classtoday,
                '$count' => $total,
                '$event_reminders' => t('Birthday Reminders'),
@@ -518,10 +555,10 @@ function get_events() {
                        dbesc(datetime_convert('UTC','UTC','now - 1 days'))
        );
 
-       if($r && count($r)) {
+       if (dbm::is_result($r)) {
                $now = strtotime('now');
                $istoday = false;
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        if(strlen($rr['name']))
                                $total ++;
 
@@ -562,7 +599,7 @@ function get_events() {
 
        $tpl = get_markup_template("events_reminder.tpl");
        return replace_macros($tpl, array(
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => App::get_baseurl(),
                '$classtoday' => $classtoday,
                '$count' => count($r) - $skip,
                '$event_reminders' => t('Event Reminders'),
@@ -571,7 +608,7 @@ function get_events() {
        ));
 }
 
-function advanced_profile(&$a) {
+function advanced_profile(App $a) {
 
        $o = '';
        $uid = $a->profile['uid'];
@@ -610,60 +647,100 @@ function advanced_profile(&$a) {
 
                if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
 
+               /// @TODO Maybe use x() here, plus below?
+               if ($a->profile['with']) {
+                       $profile['marital']['with'] = $a->profile['with'];
+               }
 
-               if($a->profile['with']) $profile['marital']['with'] = $a->profile['with'];
-
-               if(strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') {
-                               $profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
+               if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
+                       $profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
                }
 
-               if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] );
+               if ($a->profile['sexual']) {
+                       $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] );
+               }
 
-               if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
+               if ($a->profile['homepage']) {
+                       $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
+               }
 
-               if($a->profile['hometown']) $profile['hometown'] = array( t('Hometown:'), linkify($a->profile['hometown']) );
+               if ($a->profile['hometown']) {
+                       $profile['hometown'] = array( t('Hometown:'), linkify($a->profile['hometown']) );
+               }
 
-               if($a->profile['pub_keywords']) $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
+               if ($a->profile['pub_keywords']) {
+                       $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
+               }
 
-               if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
+               if ($a->profile['politic']) {
+                       $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
+               }
 
-               if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']);
+               if ($a->profile['religion']) {
+                       $profile['religion'] = array( t('Religion:'), $a->profile['religion']);
+               }
 
-               if($txt = prepare_text($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
+               if ($txt = prepare_text($a->profile['about'])) {
+                       $profile['about'] = array( t('About:'), $txt );
+               }
 
-               if($txt = prepare_text($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
+               if ($txt = prepare_text($a->profile['interest'])) {
+                       $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
+               }
 
-               if($txt = prepare_text($a->profile['likes'])) $profile['likes'] = array( t('Likes:'), $txt);
+               if ($txt = prepare_text($a->profile['likes'])) {
+                       $profile['likes'] = array( t('Likes:'), $txt);
+               }
 
-               if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
+               if ($txt = prepare_text($a->profile['dislikes'])) {
+                       $profile['dislikes'] = array( t('Dislikes:'), $txt);
+               }
 
+               if ($txt = prepare_text($a->profile['contact'])) {
+                       $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
+               }
 
-               if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
+               if ($txt = prepare_text($a->profile['music'])) {
+                       $profile['music'] = array( t('Musical interests:'), $txt);
+               }
 
-               if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
+               if ($txt = prepare_text($a->profile['book'])) {
+                       $profile['book'] = array( t('Books, literature:'), $txt);
+               }
 
-               if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
+               if ($txt = prepare_text($a->profile['tv'])) {
+                       $profile['tv'] = array( t('Television:'), $txt);
+               }
 
-               if($txt = prepare_text($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
+               if ($txt = prepare_text($a->profile['film'])) {
+                       $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
+               }
 
-               if($txt = prepare_text($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
+               if ($txt = prepare_text($a->profile['romance'])) {
+                       $profile['romance'] = array( t('Love/Romance:'), $txt);
+               }
 
-               if($txt = prepare_text($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
+               if ($txt = prepare_text($a->profile['work'])) {
+                       $profile['work'] = array( t('Work/employment:'), $txt);
+               }
 
-               if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
+               if ($txt = prepare_text($a->profile['education'])) {
+                       $profile['education'] = array( t('School/education:'), $txt );
+               }
 
-               if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-       
                //show subcribed forum if it is enabled in the usersettings
                if (feature_enabled($uid,'forumlist_profile')) {
                        $profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid));
                }
 
-               if ($a->profile['uid'] == local_user())
-                       $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+               if ($a->profile['uid'] == local_user()) {
+                       $profile['edit'] = array(App::get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+               }
 
                return replace_macros($tpl, array(
                        '$title' => t('Profile'),
+                       '$basic' => t('Basic'),
+                       '$advanced' => t('Advanced'),
                        '$profile' => $profile
                ));
        }
@@ -674,19 +751,21 @@ function advanced_profile(&$a) {
 function profile_tabs($a, $is_owner=False, $nickname=Null){
        //echo "<pre>"; var_dump($a->user); killme();
 
-       if (is_null($nickname))
+       if (is_null($nickname)) {
                $nickname  = $a->user['nickname'];
+       }
 
-       if(x($_GET,'tab'))
+       if (x($_GET,'tab')) {
                $tab = notags(trim($_GET['tab']));
+       }
 
-       $url = $a->get_baseurl() . '/profile/' . $nickname;
+       $url = App::get_baseurl() . '/profile/' . $nickname;
 
        $tabs = array(
                array(
                        'label'=>t('Status'),
                        'url' => $url,
-                       'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
+                       'sel' => ((!isset($tab) && $a->argv[0]=='profile')?'active':''),
                        'title' => t('Status Messages and Posts'),
                        'id' => 'status-tab',
                        'accesskey' => 'm',
@@ -701,36 +780,50 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
                ),
                array(
                        'label' => t('Photos'),
-                       'url'   => $a->get_baseurl() . '/photos/' . $nickname,
-                       'sel'   => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
+                       'url'   => App::get_baseurl() . '/photos/' . $nickname,
+                       'sel'   => ((!isset($tab) && $a->argv[0]=='photos')?'active':''),
                        'title' => t('Photo Albums'),
                        'id' => 'photo-tab',
                        'accesskey' => 'h',
                ),
                array(
                        'label' => t('Videos'),
-                       'url'   => $a->get_baseurl() . '/videos/' . $nickname,
-                       'sel'   => ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
+                       'url'   => App::get_baseurl() . '/videos/' . $nickname,
+                       'sel'   => ((!isset($tab) && $a->argv[0]=='videos')?'active':''),
                        'title' => t('Videos'),
                        'id' => 'video-tab',
                        'accesskey' => 'v',
                ),
        );
 
-       if ($is_owner){
-               if ($a->theme_events_in_profile)
+       // the calendar link for the full featured events calendar
+       if ($is_owner && $a->theme_events_in_profile) {
                        $tabs[] = array(
                                'label' => t('Events'),
-                               'url'   => $a->get_baseurl() . '/events',
-                               'sel'   =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
+                               'url'   => App::get_baseurl() . '/events',
+                               'sel'   =>((!isset($tab) && $a->argv[0]=='events')?'active':''),
                                'title' => t('Events and Calendar'),
                                'id' => 'events-tab',
                                'accesskey' => 'e',
                        );
+       // if the user is not the owner of the calendar we only show a calendar
+       // with the public events of the calendar owner
+       } elseif (! $is_owner) {
+               $tabs[] = array(
+                               'label' => t('Events'),
+                               'url'   => App::get_baseurl() . '/cal/' . $nickname,
+                               'sel'   =>((!isset($tab) && $a->argv[0]=='cal')?'active':''),
+                               'title' => t('Events and Calendar'),
+                               'id' => 'events-tab',
+                               'accesskey' => 'e',
+                       );
+       }
+
+       if ($is_owner){
                $tabs[] = array(
                        'label' => t('Personal Notes'),
-                       'url'   => $a->get_baseurl() . '/notes',
-                       'sel'   =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
+                       'url'   => App::get_baseurl() . '/notes',
+                       'sel'   =>((!isset($tab) && $a->argv[0]=='notes')?'active':''),
                        'title' => t('Only You Can See This'),
                        'id' => 'notes-tab',
                        'accesskey' => 't',
@@ -740,8 +833,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
        if ((! $is_owner) && ((count($a->profile)) || (! $a->profile['hide-friends']))) {
                $tabs[] = array(
                        'label' => t('Contacts'),
-                       'url'   => $a->get_baseurl() . '/viewcontacts/' . $nickname,
-                       'sel'   => ((!isset($tab)&&$a->argv[0]=='viewcontacts')?'active':''),
+                       'url'   => App::get_baseurl() . '/viewcontacts/' . $nickname,
+                       'sel'   => ((!isset($tab) && $a->argv[0]=='viewcontacts')?'active':''),
                        'title' => t('Contacts'),
                        'id' => 'viewcontacts-tab',
                        'accesskey' => 'k',
@@ -762,7 +855,7 @@ function get_my_url() {
        return false;
 }
 
-function zrl_init(&$a) {
+function zrl_init(App $a) {
        $tmp_str = get_my_url();
        if(validate_url($tmp_str)) {
 
@@ -772,14 +865,13 @@ function zrl_init(&$a) {
 
                $result = Cache::get("gprobe:".$urlparts["host"]);
                if (!is_null($result)) {
-                       $result = unserialize($result);
                        if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
                                logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
                                return;
                        }
                }
 
-               proc_run('php','include/gprobe.php',bin2hex($tmp_str));
+               proc_run(PRIORITY_LOW, 'include/gprobe.php',bin2hex($tmp_str));
                $arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
                call_hooks('zrl_init',$arr);
        }
@@ -809,7 +901,7 @@ function zrl($s,$force = false) {
  * settings except their own while on this site.
  *
  * @return int user ID
- * 
+ *
  * @note Returns local_user instead of user ID if "always_my_theme"
  *      is set to true
  */