]> git.mxchange.org Git - friendica.git/commitdiff
move some identity based functions to identity.php
authorrabuzarus <>
Fri, 26 Jun 2015 16:57:20 +0000 (18:57 +0200)
committerrabuzarus <>
Fri, 26 Jun 2015 16:57:20 +0000 (18:57 +0200)
boot.php
include/identity.php [new file with mode: 0644]
include/profile_advanced.php [deleted file]
mod/profile.php

index 0db66c09fa2a1ab89d6355a0869441d2843603a9..2767709b81567decb290fd910fac1b6a073f774b 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -10,6 +10,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
+require_once('include/identity.php');
 
 require_once('update.php');
 require_once('include/dbstructure.php');
@@ -533,14 +534,14 @@ if(! class_exists('App')) {
                                $this->cmd = trim($_GET['q'],'/\\');
 
 
-                        // fix query_string
-                        $this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
+                       // fix query_string
+                       $this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
 
 
                        // unix style "homedir"
 
                        if(substr($this->cmd,0,1) === '~')
-                               $this->cmd = 'profile/' . substr($this->cmd,1);
+                               $this->cmd = 'profile/' . substr($this->cmd,1);
 
                        // Diaspora style profile url
 
@@ -827,9 +828,9 @@ if(! class_exists('App')) {
                                if(x($v,"name")) $name = $v['name'];
                        }
                        if ($name===""){
-                               echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
+                               echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
                                killme();
-                       }
+                       }
                        $this->template_engines[$name] = $class;
                }
 
@@ -1375,528 +1376,6 @@ if(! function_exists('get_max_import_size')) {
        }
 }
 
-
-
-/**
- *
- * Function : profile_load
- * @parameter App    $a
- * @parameter string $nickname
- * @parameter int    $profile
- *
- * Summary: Loads a profile into the page sidebar.
- * The function requires a writeable copy of the main App structure, and the nickname
- * of a registered local account.
- *
- * 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.
- *
- * Profile information is placed in the App structure for later retrieval.
- * Honours the owner's chosen theme for display.
- *
- * IMPORTANT: Should only be run in the _init() functions of a module. That ensures that
- * the theme is chosen before the _init() function of a theme is run, which will usually
- * load a lot of theme-specific content
- *
- */
-
-if(! function_exists('profile_load')) {
-       function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
-
-               $user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
-                       dbesc($nickname)
-               );
-
-               if(!$user && count($user) && !count($profiledata)) {
-                       logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
-                       notice( t('Requested account is not available.') . EOL );
-                       $a->error = 404;
-                       return;
-               }
-
-               if(remote_user() && count($_SESSION['remote'])) {
-                       foreach($_SESSION['remote'] as $visitor) {
-                               if($visitor['uid'] == $user[0]['uid']) {
-                                       $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
-                                               intval($visitor['cid'])
-                                       );
-                                       if(count($r))
-                                               $profile = $r[0]['profile-id'];
-                                       break;
-                               }
-                       }
-               }
-
-               $r = null;
-
-               if($profile) {
-                       $profile_int = intval($profile);
-                       $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `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",
-                                       dbesc($nickname),
-                                       intval($profile_int)
-                       );
-               }
-               if((!$r) && (!count($r))) {
-                       $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `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",
-                                       dbesc($nickname)
-                       );
-               }
-
-               if(($r === false) || (!count($r)) && !count($profiledata)) {
-                       logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
-                       notice( t('Requested profile is not available.') . EOL );
-                       $a->error = 404;
-                       return;
-               }
-
-               // fetch user tags if this isn't the default profile
-
-               if(!$r[0]['is-default']) {
-                       $x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
-                                       intval($r[0]['profile_uid'])
-                       );
-                       if($x && count($x))
-                               $r[0]['pub_keywords'] = $x[0]['pub_keywords'];
-               }
-
-               $a->profile = $r[0];
-
-               $a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
-               $a->profile['network'] = NETWORK_DFRN;
-
-               $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
-
-               if (!$profiledata)
-                       $_SESSION['theme'] = $a->profile['theme'];
-
-               $_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
-
-               /**
-                * load/reload current theme info
-                */
-
-               $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
-
-               $theme_info_file = "view/theme/".current_theme()."/theme.php";
-               if (file_exists($theme_info_file)){
-                       require_once($theme_info_file);
-               }
-
-               if(! (x($a->page,'aside')))
-                       $a->page['aside'] = '';
-
-               if(local_user() && local_user() == $a->profile['uid'] && $profiledata) {
-                       $a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
-                               '$editprofile' => t('Edit profile'),
-                               '$profid' => $a->profile['id']
-                       ));
-               }
-
-               $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
-
-               // To-Do:
-               // By now, the contact block isn't shown, when a different profile is given
-               // But: When this profile was on the same server, then we could display the contacts
-               if ($profiledata)
-                       $a->page['aside'] .= profile_sidebar($profiledata, true);
-               else
-                       $a->page['aside'] .= profile_sidebar($a->profile, $block);
-
-
-               /*if(! $block)
-                $a->page['aside'] .= contact_block();*/
-
-               return;
-       }
-}
-
-
-/**
- *
- * Function: profile_sidebar
- *
- * Formats a profile for display in the sidebar.
- * It is very difficult to templatise the HTML completely
- * because of all the conditional logic.
- *
- * @parameter: array $profile
- *
- * Returns HTML string stuitable for sidebar inclusion
- * Exceptions: Returns empty string if passed $profile is wrong type or not populated
- *
- */
-
-
-if(! function_exists('profile_sidebar')) {
-       function profile_sidebar($profile, $block = 0) {
-               $a = get_app();
-
-               $o = '';
-               $location = false;
-               $address = false;
-               $pdesc = true;
-
-               if((! is_array($profile)) && (! count($profile)))
-                       return $o;
-
-               $profile['picdate'] = urlencode($profile['picdate']);
-
-               if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
-                       require_once('include/contact_selectors.php');
-                       if ($profile['url'] != "")
-                               $profile['network_name'] = '<a href="'.$profile['url'].'">'.network_to_name($profile['network'])."</a>";
-                       else
-                               $profile['network_name'] = network_to_name($profile['network']);
-               } else
-                       $profile['network_name'] = "";
-
-               call_hooks('profile_sidebar_enter', $profile);
-
-
-               // don't show connect link to yourself
-               $connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
-
-               // don't show connect link to authenticated visitors either
-               if(remote_user() && count($_SESSION['remote'])) {
-                       foreach($_SESSION['remote'] as $visitor) {
-                               if($visitor['uid'] == $profile['uid']) {
-                                       $connect = false;
-                                       break;
-                               }
-                       }
-               }
-
-               // Is the local user already connected to that user?
-               if ($connect AND local_user()) {
-                       if (isset($profile["url"]))
-                               $profile_url = normalise_link($profile["url"]);
-                       else
-                               $profile_url = normalise_link($a->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))
-                               $connect = false;
-               }
-
-               if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
-                               $connect = false;
-
-               if (isset($profile['remoteconnect']))
-                       $remoteconnect = $profile['remoteconnect'];
-
-               if( get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()) )
-                       $wallmessage = t('Message');
-               else
-                       $wallmessage = 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'));
-                       $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
-                                       local_user());
-
-                       $profile['menu'] = array(
-                               'chg_photo' => t('Change profile photo'),
-                               'cr_new' => t('Create New Profile'),
-                               'entries' => array(),
-                       );
-
-                       if(count($r)) {
-
-                               foreach($r as $rr) {
-                                       $profile['menu']['entries'][] = array(
-                                               'photo' => $rr['thumb'],
-                                               'id' => $rr['id'],
-                                               'alt' => t('Profile Image'),
-                                               'profile_name' => $rr['profile-name'],
-                                               'isdefault' => $rr['is-default'],
-                                               'visibile_to_everybody' =>  t('visible to everybody'),
-                                               'edit_visibility' => t('Edit visibility'),
-
-                                       );
-                               }
-
-
-                       }
-               }
-               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['menu'] = array(
-                               'chg_photo' => t('Change profile photo'),
-                               'cr_new' => null,
-                               'entries' => array(),
-                       );
-               }
-
-               if((x($profile,'address') == 1)
-                               || (x($profile,'locality') == 1)
-                               || (x($profile,'region') == 1)
-                               || (x($profile,'postal-code') == 1)
-                               || (x($profile,'country-name') == 1))
-                       $location = t('Location:');
-
-               $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
-
-
-               $marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
-
-               $homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
-
-               $about = ((x($profile,'about') == 1) ?  t('About:') : False);
-
-               if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
-                       $location = $pdesc = $gender = $marital = $homepage = $about = False;
-               }
-
-               $firstname = ((strpos($profile['name'],' '))
-                               ? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
-               $lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
-
-               $diaspora = array(
-                       '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_cached_avatar_image($a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg'),
-                       'photo100' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg'),
-                       'photo50' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg'),
-               );
-
-               if (!$block){
-                       $contact_block = contact_block();
-
-                       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))
-                                       $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
-                                               AND `network` IN ('%s', '%s', '%s', '')",
-                                       intval($profile['uid']),
-                                       dbesc(NETWORK_DFRN),
-                                       dbesc(NETWORK_DIASPORA),
-                                       dbesc(NETWORK_OSTATUS)
-                               );
-                               if(count($r))
-                                       $contacts = intval($r[0]['total']);
-                       }
-               }
-
-               $p = array();
-               foreach($profile as $k => $v) {
-                       $k = str_replace('-','_',$k);
-                       $p[$k] = $v;
-               }
-
-               if($a->theme['template_engine'] === 'internal')
-                       $location = template_escape($location);
-
-               $tpl = get_markup_template('profile_vcard.tpl');
-               $o .= replace_macros($tpl, array(
-                       '$profile' => $p,
-                       '$connect'  => $connect,
-                       '$remoteconnect'  => $remoteconnect,
-                       '$wallmessage' => $wallmessage,
-                       '$location' => $location,
-                       '$gender'   => $gender,
-                       '$pdesc'        => $pdesc,
-                       '$marital'  => $marital,
-                       '$homepage' => $homepage,
-                       '$about' => $about,
-                       '$network' =>  t('Network:'),
-                       '$contacts' => $contacts,
-                       '$updated' => $updated,
-                       '$diaspora' => $diaspora,
-                       '$contact_block' => $contact_block,
-               ));
-
-
-               $arr = array('profile' => &$profile, 'entry' => &$o);
-
-               call_hooks('profile_sidebar', $arr);
-
-               return $o;
-       }
-}
-
-
-if(! function_exists('get_birthdays')) {
-       function get_birthdays() {
-
-               $a = get_app();
-               $o = '';
-
-               if(! local_user() || $a->is_mobile || $a->is_tablet)
-                       return $o;
-
-//             $mobile_detect = new Mobile_Detect();
-//             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
-
-//             if($is_mobile)
-//                     return $o;
-
-               $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)) {
-                       $total = 0;
-                       $now = strtotime('now');
-                       $cids = array();
-
-                       $istoday = false;
-                       foreach($r as $rr) {
-                               if(strlen($rr['name']))
-                                       $total ++;
-                               if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
-                                       $istoday = true;
-                       }
-                       $classtoday = $istoday ? ' birthday-today ' : '';
-                       if($total) {
-                               foreach($r as &$rr) {
-                                       if(! strlen($rr['name']))
-                                               continue;
-
-                                       // avoid duplicates
-
-                                       if(in_array($rr['cid'],$cids))
-                                               continue;
-                                       $cids[] = $rr['cid'];
-
-                                       $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
-                                       $sparkle = '';
-                                       $url = $rr['url'];
-                                       if($rr['network'] === NETWORK_DFRN) {
-                                               $sparkle = " sparkle";
-                                               $url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
-                                       }
-
-                                       $rr['link'] = $url;
-                                       $rr['title'] = $rr['name'];
-                                       $rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '');
-                                       $rr['startime'] = Null;
-                                       $rr['today'] = $today;
-
-                               }
-                       }
-               }
-               $tpl = get_markup_template("birthdays_reminder.tpl");
-               return replace_macros($tpl, array(
-                       '$baseurl' => $a->get_baseurl(),
-                       '$classtoday' => $classtoday,
-                       '$count' => $total,
-                       '$event_reminders' => t('Birthday Reminders'),
-                       '$event_title' => t('Birthdays this week:'),
-                       '$events' => $r,
-                       '$lbr' => '{',  // raw brackets mess up if/endif macro processing
-                       '$rbr' => '}'
-
-               ));
-       }
-}
-
-
-if(! function_exists('get_events')) {
-       function get_events() {
-
-               require_once('include/bbcode.php');
-
-               $a = get_app();
-
-               if(! local_user() || $a->is_mobile || $a->is_tablet)
-                       return $o;
-
-
-//             $mobile_detect = new Mobile_Detect();
-//             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
-
-//             if($is_mobile)
-//                     return $o;
-
-               $bd_format = t('g A l F d') ; // 8 AM Friday January 18
-               $bd_short = t('F d');
-
-               $r = q("SELECT `event`.* FROM `event`
-                               WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` >= '%s'
-                               ORDER BY `start` ASC ",
-                               intval(local_user()),
-                               dbesc(datetime_convert('UTC','UTC','now + 7 days')),
-                               dbesc(datetime_convert('UTC','UTC','now - 1 days'))
-               );
-
-               if($r && count($r)) {
-                       $now = strtotime('now');
-                       $istoday = false;
-                       foreach($r as $rr) {
-                               if(strlen($rr['name']))
-                                       $total ++;
-
-                               $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
-                               if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
-                                       $istoday = true;
-                       }
-                       $classtoday = (($istoday) ? 'event-today' : '');
-
-                       $skip = 0;
-
-                       foreach($r as &$rr) {
-                               $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
-
-                               if(strlen($title) > 35)
-                                       $title = substr($title,0,32) . '... ';
-
-                               $description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
-                               if(! $description)
-                                       $description = t('[No description]');
-
-                               $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
-
-                               if(substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
-                                       $skip++;
-                                       continue;
-                               }
-
-                               $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
-                               
-                               $rr['title'] = $title;
-                               $rr['description'] = $desciption;
-                               $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
-                               $rr['startime'] = $strt;
-                               $rr['today'] = $today;
-                       }
-               }
-
-               $tpl = get_markup_template("events_reminder.tpl");
-               return replace_macros($tpl, array(
-                       '$baseurl' => $a->get_baseurl(),
-                       '$classtoday' => $classtoday,
-                       '$count' => count($r) - $skip,
-                       '$event_reminders' => t('Event Reminders'),
-                       '$event_title' => t('Events this week:'),
-                       '$events' => $r,
-               ));
-       }
-}
-
-
 /**
  *
  * Wrap calls to proc_close(proc_open()) and call hook
@@ -1945,10 +1424,10 @@ if(! function_exists('proc_run')) {
                if(count($args) && $args[0] === 'php')
                        $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
-        // add baseurl to args. cli scripts can't construct it
-        $args[] = $a->get_baseurl();
+               // add baseurl to args. cli scripts can't construct it
+               $args[] = $a->get_baseurl();
 
-        for($x = 0; $x < count($args); $x ++)
+               for($x = 0; $x < count($args); $x ++)
                        $args[$x] = escapeshellarg($args[$x]);
 
 
@@ -2113,119 +1592,6 @@ if(! function_exists('load_contact_links')) {
        }
 }
 
-if(! function_exists('profile_tabs')){
-       function profile_tabs($a, $is_owner=False, $nickname=Null){
-               //echo "<pre>"; var_dump($a->user); killme();
-
-               if (is_null($nickname))
-                       $nickname  = $a->user['nickname'];
-
-               if(x($_GET,'tab'))
-                       $tab = notags(trim($_GET['tab']));
-
-               $url = $a->get_baseurl() . '/profile/' . $nickname;
-
-               $tabs = array(
-                       array(
-                               'label'=>t('Status'),
-                               'url' => $url,
-                               'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
-                               'title' => t('Status Messages and Posts'),
-                               'id' => 'status-tab',
-                       ),
-                       array(
-                               'label' => t('Profile'),
-                               'url'   => $url.'/?tab=profile',
-                               'sel'   => ((isset($tab) && $tab=='profile')?'active':''),
-                               'title' => t('Profile Details'),
-                               'id' => 'profile-tab',
-                       ),
-                       array(
-                               'label' => t('Photos'),
-                               'url'   => $a->get_baseurl() . '/photos/' . $nickname,
-                               'sel'   => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
-                               'title' => t('Photo Albums'),
-                               'id' => 'photo-tab',
-                       ),
-                       array(
-                               'label' => t('Videos'),
-                               'url'   => $a->get_baseurl() . '/videos/' . $nickname,
-                               'sel'   => ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
-                               'title' => t('Videos'),
-                               'id' => 'video-tab',
-                       ),
-               );
-
-               if ($is_owner){
-                       $tabs[] = array(
-                               'label' => t('Events'),
-                               'url'   => $a->get_baseurl() . '/events',
-                               'sel'   =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
-                               'title' => t('Events and Calendar'),
-                               'id' => 'events-tab',
-                       );
-                       $tabs[] = array(
-                               'label' => t('Personal Notes'),
-                               'url'   => $a->get_baseurl() . '/notes',
-                               'sel'   =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
-                               'title' => t('Only You Can See This'),
-                               'id' => 'notes-tab',
-                       );
-               }
-
-
-               $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
-               call_hooks('profile_tabs', $arr);
-
-               $tpl = get_markup_template('common_tabs.tpl');
-
-               return replace_macros($tpl,array('$tabs' => $arr['tabs']));
-       }
-}
-
-function get_my_url() {
-       if(x($_SESSION,'my_url'))
-               return $_SESSION['my_url'];
-       return false;
-}
-
-function zrl_init(&$a) {
-       $tmp_str = get_my_url();
-       if(validate_url($tmp_str)) {
-
-               // Is it a DDoS attempt?
-               // The check fetches the cached value from gprobe to reduce the load for this system
-               $urlparts = parse_url($tmp_str);
-
-               $result = Cache::get("gprobe:".$urlparts["host"]);
-               if (!is_null($result)) {
-                       $result = unserialize($result);
-                       if ($result["network"] == NETWORK_FEED) {
-                               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));
-               $arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
-               call_hooks('zrl_init',$arr);
-       }
-}
-
-function zrl($s,$force = false) {
-       if(! strlen($s))
-               return $s;
-       if((! strpos($s,'/profile/')) && (! $force))
-               return $s;
-       if($force && substr($s,-1,1) !== '/')
-               $s = $s . '/';
-       $achar = strpos($s,'?') ? '&' : '?';
-       $mine = get_my_url();
-       if($mine and ! link_compare($mine,$s))
-               return $s . $achar . 'zrl=' . urlencode($mine);
-       return $s;
-}
-
 /**
 * returns querystring as string from a mapped array
 *
@@ -2425,8 +1791,8 @@ function set_template_engine(&$a, $engine = 'internal') {
 }
 
 if(!function_exists('exif_imagetype')) {
-        function exif_imagetype($file) {
-                $size = getimagesize($file);
-                return($size[2]);
-        }
+       function exif_imagetype($file) {
+               $size = getimagesize($file);
+               return($size[2]);
+       }
 }
diff --git a/include/identity.php b/include/identity.php
new file mode 100644 (file)
index 0000000..bc930a3
--- /dev/null
@@ -0,0 +1,728 @@
+<?php
+
+
+/**
+ *
+ * Function : profile_load
+ * @parameter App    $a
+ * @parameter string $nickname
+ * @parameter int    $profile
+ *
+ * Summary: Loads a profile into the page sidebar.
+ * The function requires a writeable copy of the main App structure, and the nickname
+ * of a registered local account.
+ *
+ * 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.
+ *
+ * Profile information is placed in the App structure for later retrieval.
+ * Honours the owner's chosen theme for display.
+ *
+ * IMPORTANT: Should only be run in the _init() functions of a module. That ensures that
+ * the theme is chosen before the _init() function of a theme is run, which will usually
+ * load a lot of theme-specific content
+ *
+ */
+
+if(! function_exists('profile_load')) {
+       function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
+
+               $user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+                       dbesc($nickname)
+               );
+
+               if(!$user && count($user) && !count($profiledata)) {
+                       logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+                       notice( t('Requested account is not available.') . EOL );
+                       $a->error = 404;
+                       return;
+               }
+
+               if(remote_user() && count($_SESSION['remote'])) {
+                       foreach($_SESSION['remote'] as $visitor) {
+                               if($visitor['uid'] == $user[0]['uid']) {
+                                       $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
+                                               intval($visitor['cid'])
+                                       );
+                                       if(count($r))
+                                               $profile = $r[0]['profile-id'];
+                                       break;
+                               }
+                       }
+               }
+
+               $r = null;
+
+               if($profile) {
+                       $profile_int = intval($profile);
+                       $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `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",
+                                       dbesc($nickname),
+                                       intval($profile_int)
+                       );
+               }
+               if((!$r) && (!count($r))) {
+                       $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `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",
+                                       dbesc($nickname)
+                       );
+               }
+
+               if(($r === false) || (!count($r)) && !count($profiledata)) {
+                       logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+                       notice( t('Requested profile is not available.') . EOL );
+                       $a->error = 404;
+                       return;
+               }
+
+               // fetch user tags if this isn't the default profile
+
+               if(!$r[0]['is-default']) {
+                       $x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
+                                       intval($r[0]['profile_uid'])
+                       );
+                       if($x && count($x))
+                               $r[0]['pub_keywords'] = $x[0]['pub_keywords'];
+               }
+
+               $a->profile = $r[0];
+
+               $a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
+               $a->profile['network'] = NETWORK_DFRN;
+
+               $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
+
+               if (!$profiledata)
+                       $_SESSION['theme'] = $a->profile['theme'];
+
+               $_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
+
+               /**
+                * load/reload current theme info
+                */
+
+               $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
+
+               $theme_info_file = "view/theme/".current_theme()."/theme.php";
+               if (file_exists($theme_info_file)){
+                       require_once($theme_info_file);
+               }
+
+               if(! (x($a->page,'aside')))
+                       $a->page['aside'] = '';
+
+               if(local_user() && local_user() == $a->profile['uid'] && $profiledata) {
+                       $a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
+                               '$editprofile' => t('Edit profile'),
+                               '$profid' => $a->profile['id']
+                       ));
+               }
+
+               $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+
+               // To-Do:
+               // By now, the contact block isn't shown, when a different profile is given
+               // But: When this profile was on the same server, then we could display the contacts
+               if ($profiledata)
+                       $a->page['aside'] .= profile_sidebar($profiledata, true);
+               else
+                       $a->page['aside'] .= profile_sidebar($a->profile, $block);
+
+
+               /*if(! $block)
+                $a->page['aside'] .= contact_block();*/
+
+               return;
+       }
+}
+
+
+/**
+ *
+ * Function: profile_sidebar
+ *
+ * Formats a profile for display in the sidebar.
+ * It is very difficult to templatise the HTML completely
+ * because of all the conditional logic.
+ *
+ * @parameter: array $profile
+ *
+ * Returns HTML string stuitable for sidebar inclusion
+ * Exceptions: Returns empty string if passed $profile is wrong type or not populated
+ *
+ */
+
+
+if(! function_exists('profile_sidebar')) {
+       function profile_sidebar($profile, $block = 0) {
+               $a = get_app();
+
+               $o = '';
+               $location = false;
+               $address = false;
+               $pdesc = true;
+
+               if((! is_array($profile)) && (! count($profile)))
+                       return $o;
+
+               $profile['picdate'] = urlencode($profile['picdate']);
+
+               if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
+                       require_once('include/contact_selectors.php');
+                       if ($profile['url'] != "")
+                               $profile['network_name'] = '<a href="'.$profile['url'].'">'.network_to_name($profile['network'])."</a>";
+                       else
+                               $profile['network_name'] = network_to_name($profile['network']);
+               } else
+                       $profile['network_name'] = "";
+
+               call_hooks('profile_sidebar_enter', $profile);
+
+
+               // don't show connect link to yourself
+               $connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
+
+               // don't show connect link to authenticated visitors either
+               if(remote_user() && count($_SESSION['remote'])) {
+                       foreach($_SESSION['remote'] as $visitor) {
+                               if($visitor['uid'] == $profile['uid']) {
+                                       $connect = false;
+                                       break;
+                               }
+                       }
+               }
+
+               // Is the local user already connected to that user?
+               if ($connect AND local_user()) {
+                       if (isset($profile["url"]))
+                               $profile_url = normalise_link($profile["url"]);
+                       else
+                               $profile_url = normalise_link($a->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))
+                               $connect = false;
+               }
+
+               if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
+                               $connect = false;
+
+               if (isset($profile['remoteconnect']))
+                       $remoteconnect = $profile['remoteconnect'];
+
+               if( get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()) )
+                       $wallmessage = t('Message');
+               else
+                       $wallmessage = 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'));
+                       $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
+                                       local_user());
+
+                       $profile['menu'] = array(
+                               'chg_photo' => t('Change profile photo'),
+                               'cr_new' => t('Create New Profile'),
+                               'entries' => array(),
+                       );
+
+                       if(count($r)) {
+
+                               foreach($r as $rr) {
+                                       $profile['menu']['entries'][] = array(
+                                               'photo' => $rr['thumb'],
+                                               'id' => $rr['id'],
+                                               'alt' => t('Profile Image'),
+                                               'profile_name' => $rr['profile-name'],
+                                               'isdefault' => $rr['is-default'],
+                                               'visibile_to_everybody' =>  t('visible to everybody'),
+                                               'edit_visibility' => t('Edit visibility'),
+
+                                       );
+                               }
+
+
+                       }
+               }
+               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['menu'] = array(
+                               'chg_photo' => t('Change profile photo'),
+                               'cr_new' => null,
+                               'entries' => array(),
+                       );
+               }
+
+               if((x($profile,'address') == 1)
+                               || (x($profile,'locality') == 1)
+                               || (x($profile,'region') == 1)
+                               || (x($profile,'postal-code') == 1)
+                               || (x($profile,'country-name') == 1))
+                       $location = t('Location:');
+
+               $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
+
+
+               $marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
+
+               $homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
+
+               $about = ((x($profile,'about') == 1) ?  t('About:') : False);
+
+               if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
+                       $location = $pdesc = $gender = $marital = $homepage = $about = False;
+               }
+
+               $firstname = ((strpos($profile['name'],' '))
+                               ? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
+               $lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
+
+               $diaspora = array(
+                       '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_cached_avatar_image($a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg'),
+                       'photo100' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg'),
+                       'photo50' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg'),
+               );
+
+               if (!$block){
+                       $contact_block = contact_block();
+
+                       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))
+                                       $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
+                                               AND `network` IN ('%s', '%s', '%s', '')",
+                                       intval($profile['uid']),
+                                       dbesc(NETWORK_DFRN),
+                                       dbesc(NETWORK_DIASPORA),
+                                       dbesc(NETWORK_OSTATUS)
+                               );
+                               if(count($r))
+                                       $contacts = intval($r[0]['total']);
+                       }
+               }
+
+               $p = array();
+               foreach($profile as $k => $v) {
+                       $k = str_replace('-','_',$k);
+                       $p[$k] = $v;
+               }
+
+               if($a->theme['template_engine'] === 'internal')
+                       $location = template_escape($location);
+
+               $tpl = get_markup_template('profile_vcard.tpl');
+               $o .= replace_macros($tpl, array(
+                       '$profile' => $p,
+                       '$connect'  => $connect,
+                       '$remoteconnect'  => $remoteconnect,
+                       '$wallmessage' => $wallmessage,
+                       '$location' => $location,
+                       '$gender'   => $gender,
+                       '$pdesc'        => $pdesc,
+                       '$marital'  => $marital,
+                       '$homepage' => $homepage,
+                       '$about' => $about,
+                       '$network' =>  t('Network:'),
+                       '$contacts' => $contacts,
+                       '$updated' => $updated,
+                       '$diaspora' => $diaspora,
+                       '$contact_block' => $contact_block,
+               ));
+
+
+               $arr = array('profile' => &$profile, 'entry' => &$o);
+
+               call_hooks('profile_sidebar', $arr);
+
+               return $o;
+       }
+}
+
+
+if(! function_exists('get_birthdays')) {
+       function get_birthdays() {
+
+               $a = get_app();
+               $o = '';
+
+               if(! local_user() || $a->is_mobile || $a->is_tablet)
+                       return $o;
+
+//             $mobile_detect = new Mobile_Detect();
+//             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+
+//             if($is_mobile)
+//                     return $o;
+
+               $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)) {
+                       $total = 0;
+                       $now = strtotime('now');
+                       $cids = array();
+
+                       $istoday = false;
+                       foreach($r as $rr) {
+                               if(strlen($rr['name']))
+                                       $total ++;
+                               if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
+                                       $istoday = true;
+                       }
+                       $classtoday = $istoday ? ' birthday-today ' : '';
+                       if($total) {
+                               foreach($r as &$rr) {
+                                       if(! strlen($rr['name']))
+                                               continue;
+
+                                       // avoid duplicates
+
+                                       if(in_array($rr['cid'],$cids))
+                                               continue;
+                                       $cids[] = $rr['cid'];
+
+                                       $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
+                                       $sparkle = '';
+                                       $url = $rr['url'];
+                                       if($rr['network'] === NETWORK_DFRN) {
+                                               $sparkle = " sparkle";
+                                               $url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
+                                       }
+
+                                       $rr['link'] = $url;
+                                       $rr['title'] = $rr['name'];
+                                       $rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '');
+                                       $rr['startime'] = Null;
+                                       $rr['today'] = $today;
+
+                               }
+                       }
+               }
+               $tpl = get_markup_template("birthdays_reminder.tpl");
+               return replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(),
+                       '$classtoday' => $classtoday,
+                       '$count' => $total,
+                       '$event_reminders' => t('Birthday Reminders'),
+                       '$event_title' => t('Birthdays this week:'),
+                       '$events' => $r,
+                       '$lbr' => '{',  // raw brackets mess up if/endif macro processing
+                       '$rbr' => '}'
+
+               ));
+       }
+}
+
+
+if(! function_exists('get_events')) {
+       function get_events() {
+
+               require_once('include/bbcode.php');
+
+               $a = get_app();
+
+               if(! local_user() || $a->is_mobile || $a->is_tablet)
+                       return $o;
+
+
+//             $mobile_detect = new Mobile_Detect();
+//             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+
+//             if($is_mobile)
+//                     return $o;
+
+               $bd_format = t('g A l F d') ; // 8 AM Friday January 18
+               $bd_short = t('F d');
+
+               $r = q("SELECT `event`.* FROM `event`
+                               WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` >= '%s'
+                               ORDER BY `start` ASC ",
+                               intval(local_user()),
+                               dbesc(datetime_convert('UTC','UTC','now + 7 days')),
+                               dbesc(datetime_convert('UTC','UTC','now - 1 days'))
+               );
+
+               if($r && count($r)) {
+                       $now = strtotime('now');
+                       $istoday = false;
+                       foreach($r as $rr) {
+                               if(strlen($rr['name']))
+                                       $total ++;
+
+                               $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
+                               if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
+                                       $istoday = true;
+                       }
+                       $classtoday = (($istoday) ? 'event-today' : '');
+
+                       $skip = 0;
+
+                       foreach($r as &$rr) {
+                               $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
+
+                               if(strlen($title) > 35)
+                                       $title = substr($title,0,32) . '... ';
+
+                               $description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
+                               if(! $description)
+                                       $description = t('[No description]');
+
+                               $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
+
+                               if(substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
+                                       $skip++;
+                                       continue;
+                               }
+
+                               $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
+                               
+                               $rr['title'] = $title;
+                               $rr['description'] = $desciption;
+                               $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
+                               $rr['startime'] = $strt;
+                               $rr['today'] = $today;
+                       }
+               }
+
+               $tpl = get_markup_template("events_reminder.tpl");
+               return replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(),
+                       '$classtoday' => $classtoday,
+                       '$count' => count($r) - $skip,
+                       '$event_reminders' => t('Event Reminders'),
+                       '$event_title' => t('Events this week:'),
+                       '$events' => $r,
+               ));
+       }
+}
+
+function advanced_profile(&$a) {
+
+       $o = '';
+
+       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
+               '$title' => t('Profile')
+       ));
+
+       if($a->profile['name']) {
+
+               $tpl = get_markup_template('profile_advanced.tpl');
+               
+               $profile = array();
+               
+               $profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ;
+               
+               if($a->profile['gender']) $profile['gender'] = array( t('Gender:'),  $a->profile['gender'] );
+               
+
+               if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
+               
+                       $year_bd_format = t('j F, Y');
+                       $short_bd_format = t('j F');
+
+               
+                       $val = ((intval($a->profile['dob'])) 
+                               ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
+                               : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format)));
+
+                       $profile['birthday'] = array( t('Birthday:'), $val);
+
+               }
+
+               if($age = age($a->profile['dob'],$a->profile['timezone'],''))  $profile['age'] = array( t('Age:'), $age );
+                       
+
+               if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
+
+
+               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($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['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['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
+
+               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['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['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['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['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['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['education'])) $profile['education'] = array( t('School/education:'), $txt );
+               
+               if ($a->profile['uid'] == local_user())
+                       $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+               
+               return replace_macros($tpl, array(
+                       '$title' => t('Profile'),
+                       '$profile' => $profile
+               ));
+       }
+
+       return '';
+}
+
+if(! function_exists('profile_tabs')){
+       function profile_tabs($a, $is_owner=False, $nickname=Null){
+               //echo "<pre>"; var_dump($a->user); killme();
+
+               if (is_null($nickname))
+                       $nickname  = $a->user['nickname'];
+
+               if(x($_GET,'tab'))
+                       $tab = notags(trim($_GET['tab']));
+
+               $url = $a->get_baseurl() . '/profile/' . $nickname;
+
+               $tabs = array(
+                       array(
+                               'label'=>t('Status'),
+                               'url' => $url,
+                               'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
+                               'title' => t('Status Messages and Posts'),
+                               'id' => 'status-tab',
+                       ),
+                       array(
+                               'label' => t('Profile'),
+                               'url'   => $url.'/?tab=profile',
+                               'sel'   => ((isset($tab) && $tab=='profile')?'active':''),
+                               'title' => t('Profile Details'),
+                               'id' => 'profile-tab',
+                       ),
+                       array(
+                               'label' => t('Photos'),
+                               'url'   => $a->get_baseurl() . '/photos/' . $nickname,
+                               'sel'   => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
+                               'title' => t('Photo Albums'),
+                               'id' => 'photo-tab',
+                       ),
+                       array(
+                               'label' => t('Videos'),
+                               'url'   => $a->get_baseurl() . '/videos/' . $nickname,
+                               'sel'   => ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
+                               'title' => t('Videos'),
+                               'id' => 'video-tab',
+                       ),
+               );
+
+               if ($is_owner){
+                       $tabs[] = array(
+                               'label' => t('Events'),
+                               'url'   => $a->get_baseurl() . '/events',
+                               'sel'   =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
+                               'title' => t('Events and Calendar'),
+                               'id' => 'events-tab',
+                       );
+                       $tabs[] = array(
+                               'label' => t('Personal Notes'),
+                               'url'   => $a->get_baseurl() . '/notes',
+                               'sel'   =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
+                               'title' => t('Only You Can See This'),
+                               'id' => 'notes-tab',
+                       );
+               }
+
+
+               $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
+               call_hooks('profile_tabs', $arr);
+
+               $tpl = get_markup_template('common_tabs.tpl');
+
+               return replace_macros($tpl,array('$tabs' => $arr['tabs']));
+       }
+}
+
+function get_my_url() {
+       if(x($_SESSION,'my_url'))
+               return $_SESSION['my_url'];
+       return false;
+}
+
+function zrl_init(&$a) {
+       $tmp_str = get_my_url();
+       if(validate_url($tmp_str)) {
+
+               // Is it a DDoS attempt?
+               // The check fetches the cached value from gprobe to reduce the load for this system
+               $urlparts = parse_url($tmp_str);
+
+               $result = Cache::get("gprobe:".$urlparts["host"]);
+               if (!is_null($result)) {
+                       $result = unserialize($result);
+                       if ($result["network"] == NETWORK_FEED) {
+                               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));
+               $arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
+               call_hooks('zrl_init',$arr);
+       }
+}
+
+function zrl($s,$force = false) {
+       if(! strlen($s))
+               return $s;
+       if((! strpos($s,'/profile/')) && (! $force))
+               return $s;
+       if($force && substr($s,-1,1) !== '/')
+               $s = $s . '/';
+       $achar = strpos($s,'?') ? '&' : '?';
+       $mine = get_my_url();
+       if($mine and ! link_compare($mine,$s))
+               return $s . $achar . 'zrl=' . urlencode($mine);
+       return $s;
+}
diff --git a/include/profile_advanced.php b/include/profile_advanced.php
deleted file mode 100644 (file)
index 1db9590..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-function advanced_profile(&$a) {
-
-       $o = '';
-
-       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
-               '$title' => t('Profile')
-       ));
-
-       if($a->profile['name']) {
-
-               $tpl = get_markup_template('profile_advanced.tpl');
-               
-               $profile = array();
-               
-               $profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ;
-               
-               if($a->profile['gender']) $profile['gender'] = array( t('Gender:'),  $a->profile['gender'] );
-               
-
-               if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-               
-                       $year_bd_format = t('j F, Y');
-                       $short_bd_format = t('j F');
-
-               
-                       $val = ((intval($a->profile['dob'])) 
-                               ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
-                               : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format)));
-
-                       $profile['birthday'] = array( t('Birthday:'), $val);
-
-               }
-
-               if($age = age($a->profile['dob'],$a->profile['timezone'],''))  $profile['age'] = array( t('Age:'), $age );
-                       
-
-               if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
-
-
-               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($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['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['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
-
-               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['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['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['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['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['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['education'])) $profile['education'] = array( t('School/education:'), $txt );
-               
-               if ($a->profile['uid'] == local_user())
-                       $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
-               
-               return replace_macros($tpl, array(
-                       '$title' => t('Profile'),
-                       '$profile' => $profile
-               ));
-       }
-
-       return '';
-}
index e81cfd22c94878023c604fd4c80f6d2a02e32ec7..04611f583516aa03c4a489f04fc78c8c630d3a8f 100644 (file)
@@ -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;