]> git.mxchange.org Git - friendica.git/blobdiff - include/identity.php
Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba
[friendica.git] / include / identity.php
index 35516efbeac42c490ba01aa64519c6b29aacfb08..3ab25cdc45724e68e1cba99869f7ceeb23ec2954 100644 (file)
@@ -3,9 +3,12 @@
  * @file include/identity.php
  */
 
-require_once('include/ForumManager.php');
-require_once('include/bbcode.php');
-require_once("mod/proxy.php");
+use Friendica\App;
+
+require_once 'include/ForumManager.php';
+require_once 'include/bbcode.php';
+require_once 'mod/proxy.php';
+require_once 'include/cache.php';
 
 /**
  *
@@ -31,13 +34,13 @@ 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)
        );
 
-       if(!$user && count($user) && !count($profiledata)) {
+       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;
@@ -46,7 +49,7 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
 
        $pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile);
 
-       if(($pdata === false) || (!count($pdata)) && !count($profiledata)) {
+       if (($pdata === false) || (!count($pdata)) && !count($profiledata)) {
                logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
                notice( t('Requested profile is not available.') . EOL );
                $a->error = 404;
@@ -55,11 +58,11 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
 
        // fetch user tags if this isn't the default profile
 
-       if(!$pdata['is-default']) {
+       if (!$pdata['is-default']) {
                $x = q("SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
                                intval($pdata['profile_uid'])
                );
-               if($x && count($x))
+               if ($x && count($x))
                        $pdata['pub_keywords'] = $x[0]['pub_keywords'];
        }
 
@@ -82,15 +85,15 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
 
        $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);
+       $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')))
+       if (! (x($a->page,'aside')))
                $a->page['aside'] = '';
 
-       if(local_user() && local_user() == $a->profile['uid'] && $profiledata) {
+       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']
@@ -109,7 +112,7 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
        else
                $a->page['aside'] .= profile_sidebar($a->profile, $block);
 
-       /*if(! $block)
+       /*if (! $block)
         $a->page['aside'] .= contact_block();*/
 
        return;
@@ -118,12 +121,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
@@ -132,9 +135,9 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
  *     Includes all available profile data
  */
 function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
-       if(remote_user() && count($_SESSION['remote'])) {
-                       foreach($_SESSION['remote'] as $visitor) {
-                               if($visitor['uid'] == $uid) {
+       if (remote_user() && count($_SESSION['remote'])) {
+                       foreach ($_SESSION['remote'] as $visitor) {
+                               if ($visitor['uid'] == $uid) {
                                        $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
                                                intval($visitor['cid'])
                                        );
@@ -147,7 +150,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
 
        $r = null;
 
-       if($profile) {
+       if ($profile) {
                $profile_int = intval($profile);
                $r = q("SELECT `contact`.`id` AS `contact_id`, `profile`.`uid` AS `profile_uid`, `profile`.*,
                                `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
@@ -177,17 +180,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'
@@ -199,17 +202,22 @@ function profile_sidebar($profile, $block = 0) {
        $o = '';
        $location = false;
        $address = false;
-//             $pdesc = true;
+       // $pdesc = true;
 
-       if((! is_array($profile)) && (! count($profile)))
+       // This function can also use contact information in $profile
+       $is_contact = x($profile, 'cid');
+
+       if ((! is_array($profile)) && (! count($profile))) {
                return $o;
+       }
 
        $profile['picdate'] = urlencode($profile['picdate']);
 
        if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
-               $profile['network_name'] = format_network_name($profile['network'],$profile['url']);
-       } else
+               $profile['network_name'] = format_network_name($profile['network'], $profile['url']);
+       } else {
                $profile['network_name'] = "";
+       }
 
        call_hooks('profile_sidebar_enter', $profile);
 
@@ -218,9 +226,9 @@ function profile_sidebar($profile, $block = 0) {
        $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']) {
+       if (remote_user() && count($_SESSION['remote'])) {
+               foreach ($_SESSION['remote'] as $visitor) {
+                       if ($visitor['uid'] == $profile['uid']) {
                                $connect = false;
                                break;
                        }
@@ -231,8 +239,7 @@ function profile_sidebar($profile, $block = 0) {
        if ($connect AND local_user()) {
                if (isset($profile["url"])) {
                        $profile_url = normalise_link($profile["url"]);
-               }
-               else {
+               } else {
                        $profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]);
                }
 
@@ -281,7 +288,7 @@ function profile_sidebar($profile, $block = 0) {
        }
 
        // show edit profile to yourself
-       if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
+       if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
                $profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
                $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
                                local_user());
@@ -310,7 +317,7 @@ function profile_sidebar($profile, $block = 0) {
 
                }
        }
-       if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
+       if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
                $profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
                $profile['menu'] = array(
                        'chg_photo' => t('Change profile photo'),
@@ -322,7 +329,7 @@ function profile_sidebar($profile, $block = 0) {
        // Fetch the account type
        $account_type = account_type($profile);
 
-       if((x($profile,'address') == 1)
+       if ((x($profile,'address') == 1)
                        || (x($profile,'location') == 1)
                        || (x($profile,'locality') == 1)
                        || (x($profile,'region') == 1)
@@ -341,7 +348,7 @@ function profile_sidebar($profile, $block = 0) {
 
        $xmpp = ((x($profile,'xmpp') == 1) ?  t('XMPP:') : False);
 
-       if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
+       if (($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
                $location = $pdesc = $gender = $marital = $homepage = $about = False;
        }
 
@@ -365,16 +372,19 @@ function profile_sidebar($profile, $block = 0) {
        else
                $diaspora = false;
 
-       if (!$block){
+       if (!$block) {
                $contact_block = contact_block();
 
-               if(is_array($a->profile) AND !$a->profile['hide-friends']) {
+               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 (dbm::is_result($r))
                                $updated =  date("c", strtotime($r[0]['updated']));
 
-                       $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `hidden` AND NOT `archive`
+                       $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),
@@ -387,7 +397,7 @@ function profile_sidebar($profile, $block = 0) {
        }
 
        $p = array();
-       foreach($profile as $k => $v) {
+       foreach ($profile as $k => $v) {
                $k = str_replace('-','_',$k);
                $p[$k] = $v;
        }
@@ -403,7 +413,7 @@ function profile_sidebar($profile, $block = 0) {
        if (isset($p["photo"]))
                $p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL);
 
-       if($a->theme['template_engine'] === 'internal')
+       if ($a->theme['template_engine'] === 'internal')
                $location = template_escape($location);
 
        $tpl = get_markup_template('profile_vcard.tpl');
@@ -442,27 +452,33 @@ function get_birthdays() {
        $a = get_app();
        $o = '';
 
-       if(! local_user() || $a->is_mobile || $a->is_tablet)
+       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)
+//             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'))
-       );
-
+       $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');
@@ -470,27 +486,27 @@ function get_birthdays() {
 
                $istoday = false;
                foreach ($r as $rr) {
-                       if(strlen($rr['name']))
+                       if (strlen($rr['name']))
                                $total ++;
-                       if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
+                       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']))
+               if ($total) {
+                       foreach ($r as &$rr) {
+                               if (! strlen($rr['name']))
                                        continue;
 
                                // avoid duplicates
 
-                               if(in_array($rr['cid'],$cids))
+                               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) {
+                               if ($rr['network'] === NETWORK_DFRN) {
                                        $sparkle = " sparkle";
                                        $url = App::get_baseurl() . '/redir/'  . $rr['cid'];
                                }
@@ -521,18 +537,18 @@ function get_birthdays() {
 
 function get_events() {
 
-       require_once('include/bbcode.php');
+       require_once 'include/bbcode.php';
 
        $a = get_app();
 
-       if(! local_user() || $a->is_mobile || $a->is_tablet)
+       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)
+//             if ($is_mobile)
 //                     return $o;
 
        $bd_format = t('g A l F d') ; // 8 AM Friday January 18
@@ -550,30 +566,34 @@ function get_events() {
                $now = strtotime('now');
                $istoday = false;
                foreach ($r as $rr) {
-                       if(strlen($rr['name']))
+                       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'))
+                       if ($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
                                $istoday = true;
+                       }
                }
                $classtoday = (($istoday) ? 'event-today' : '');
 
                $skip = 0;
 
-               foreach($r as &$rr) {
+               foreach ($r as &$rr) {
                        $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
 
-                       if(strlen($title) > 35)
+                       if (strlen($title) > 35) {
                                $title = substr($title,0,32) . '... ';
+                       }
 
                        $description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
-                       if(! $description)
+                       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')) {
+                       if (substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
                                $skip++;
                                continue;
                        }
@@ -599,7 +619,7 @@ function get_events() {
        ));
 }
 
-function advanced_profile(App &$a) {
+function advanced_profile(App $a) {
 
        $o = '';
        $uid = $a->profile['uid'];
@@ -608,7 +628,7 @@ function advanced_profile(App &$a) {
                '$title' => t('Profile')
        ));
 
-       if($a->profile['name']) {
+       if ($a->profile['name']) {
 
                $tpl = get_markup_template('profile_advanced.tpl');
 
@@ -616,11 +636,11 @@ function advanced_profile(App &$a) {
 
                $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')) {
+               if ($a->profile['gender']) {
+                       $profile['gender'] = array( t('Gender:'),  $a->profile['gender'] );
+               }
 
+               if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) {
                        $year_bd_format = t('j F, Y');
                        $short_bd_format = t('j F');
 
@@ -633,55 +653,95 @@ function advanced_profile(App &$a) {
 
                }
 
-               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 ($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'];
+               /// @TODO Maybe use x() here, plus below?
+               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));
@@ -702,14 +762,16 @@ function advanced_profile(App &$a) {
        return '';
 }
 
-function profile_tabs($a, $is_owner=False, $nickname=Null){
+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 = App::get_baseurl() . '/profile/' . $nickname;
 
@@ -717,7 +779,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
                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',
@@ -725,7 +787,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
                array(
                        'label' => t('Profile'),
                        'url'   => $url.'/?tab=profile',
-                       'sel'   => ((isset($tab) && $tab=='profile')?'active':''),
+                       'sel'   => ((isset($tab) && $tab=='profile') ? 'active' : ''),
                        'title' => t('Profile Details'),
                        'id' => 'profile-tab',
                        'accesskey' => 'r',
@@ -733,7 +795,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
                array(
                        'label' => t('Photos'),
                        'url'   => App::get_baseurl() . '/photos/' . $nickname,
-                       'sel'   => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
+                       'sel'   => ((!isset($tab) && $a->argv[0]=='photos') ? 'active' : ''),
                        'title' => t('Photo Albums'),
                        'id' => 'photo-tab',
                        'accesskey' => 'h',
@@ -741,7 +803,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
                array(
                        'label' => t('Videos'),
                        'url'   => App::get_baseurl() . '/videos/' . $nickname,
-                       'sel'   => ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
+                       'sel'   => ((!isset($tab) && $a->argv[0]=='videos') ? 'active' : ''),
                        'title' => t('Videos'),
                        'id' => 'video-tab',
                        'accesskey' => 'v',
@@ -753,7 +815,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
                        $tabs[] = array(
                                'label' => t('Events'),
                                'url'   => App::get_baseurl() . '/events',
-                               'sel'   =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
+                               'sel'   =>((!isset($tab) && $a->argv[0]=='events') ? 'active' : ''),
                                'title' => t('Events and Calendar'),
                                'id' => 'events-tab',
                                'accesskey' => 'e',
@@ -764,18 +826,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
                $tabs[] = array(
                                'label' => t('Events'),
                                'url'   => App::get_baseurl() . '/cal/' . $nickname,
-                               'sel'   =>((!isset($tab)&&$a->argv[0]=='cal')?'active':''),
+                               'sel'   =>((!isset($tab) && $a->argv[0]=='cal') ? 'active' : ''),
                                'title' => t('Events and Calendar'),
                                'id' => 'events-tab',
                                'accesskey' => 'e',
                        );
        }
 
-       if ($is_owner){
+       if ($is_owner) {
                $tabs[] = array(
                        'label' => t('Personal Notes'),
                        'url'   => App::get_baseurl() . '/notes',
-                       'sel'   =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
+                       'sel'   =>((!isset($tab) && $a->argv[0]=='notes') ? 'active' : ''),
                        'title' => t('Only You Can See This'),
                        'id' => 'notes-tab',
                        'accesskey' => 't',
@@ -786,7 +848,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
                $tabs[] = array(
                        'label' => t('Contacts'),
                        'url'   => App::get_baseurl() . '/viewcontacts/' . $nickname,
-                       'sel'   => ((!isset($tab)&&$a->argv[0]=='viewcontacts')?'active':''),
+                       'sel'   => ((!isset($tab) && $a->argv[0]=='viewcontacts') ? 'active' : ''),
                        'title' => t('Contacts'),
                        'id' => 'viewcontacts-tab',
                        'accesskey' => 'k',
@@ -802,44 +864,47 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 }
 
 function get_my_url() {
-       if(x($_SESSION,'my_url'))
+       if (x($_SESSION, 'my_url')) {
                return $_SESSION['my_url'];
+       }
        return false;
 }
 
-function zrl_init(App &$a) {
+function zrl_init(App $a) {
        $tmp_str = get_my_url();
-       if(validate_url($tmp_str)) {
+       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)) {
-                       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;
-                       }
+               $result = Cache::get("gprobe:" . $urlparts["host"]);
+               if ((!is_null($result)) && (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(PRIORITY_LOW, '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);
+               call_hooks('zrl_init', $arr);
        }
 }
 
-function zrl($s,$force = false) {
-       if(! strlen($s))
+function zrl($s, $force = false) {
+       if (! strlen($s)) {
                return $s;
-       if((! strpos($s,'/profile/')) && (! $force))
+       }
+       if ((! strpos($s, '/profile/')) && (! $force)) {
                return $s;
-       if($force && substr($s,-1,1) !== '/')
+       }
+       if ($force && substr($s, -1, 1) !== '/') {
                $s = $s . '/';
-       $achar = strpos($s,'?') ? '&' : '?';
+       }
+       $achar = strpos($s, '?') ? '&' : '?';
        $mine = get_my_url();
-       if($mine and ! link_compare($mine,$s))
+       if ($mine && ! link_compare($mine, $s)) {
                return $s . $achar . 'zrl=' . urlencode($mine);
+       }
        return $s;
 }
 
@@ -853,15 +918,14 @@ 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
  */
 function get_theme_uid() {
        $uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
-       if(local_user()) {
-               if((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))
-                       return local_user();
+       if ((local_user()) && ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))) {
+               return local_user();
        }
 
        return $uid;