X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fidentity.php;h=8f515580f475cba0cb28651a24a71b6ccb41447d;hb=0305aa2d8218a0919526a08910ffaebfdc5bb2c5;hp=7ce18309bd2b5ef77552567b57ea3556c01f228b;hpb=217a8ce6ee8fd163d81c71044d9497646296862f;p=friendica.git diff --git a/include/identity.php b/include/identity.php index 7ce18309bd..8f515580f4 100644 --- a/include/identity.php +++ b/include/identity.php @@ -4,11 +4,19 @@ */ use Friendica\App; +use Friendica\Content\Feature; +use Friendica\Content\ForumManager; +use Friendica\Core\Cache; +use Friendica\Core\Config; +use Friendica\Core\PConfig; +use Friendica\Core\System; +use Friendica\Core\Worker; +use Friendica\Database\DBM; +use Friendica\Model\Contact; +use Friendica\Protocol\Diaspora; -require_once 'include/ForumManager.php'; require_once 'include/bbcode.php'; require_once 'mod/proxy.php'; -require_once 'include/cache.php'; /** * @@ -29,29 +37,30 @@ require_once 'include/cache.php'; * the theme is chosen before the _init() function of a theme is run, which will usually * load a lot of theme-specific content * - * @param App $a - * @param string $nickname - * @param int $profile - * @param array $profiledata + * @param object $a App + * @param string $nickname string + * @param int $profile int + * @param array $profiledata array */ -function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { - - $user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1", +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)) { logger('profile error: ' . $a->query_string, LOGGER_DEBUG); - notice( t('Requested account is not available.') . EOL ); + notice(t('Requested account is not available.') . EOL); $a->error = 404; return; } $pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile); - if (($pdata === false) || (!count($pdata)) && !count($profiledata)) { + if (empty($pdata) && empty($profiledata)) { logger('profile error: ' . $a->query_string, LOGGER_DEBUG); - notice( t('Requested profile is not available.') . EOL ); + notice(t('Requested profile is not available.') . EOL); $a->error = 404; return; } @@ -59,8 +68,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { // fetch user tags if this isn't the default profile if (!$pdata['is-default']) { - $x = q("SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", - intval($pdata['profile_uid']) + $x = q( + "SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", + intval($pdata['profile_uid']) ); if ($x && count($x)) $pdata['pub_keywords'] = $x[0]['pub_keywords']; @@ -69,13 +79,14 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { $a->profile = $pdata; $a->profile_uid = $pdata['profile_uid']; - $a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme'); + $a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme'); $a->profile['network'] = NETWORK_DFRN; $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename']; - if (!$profiledata && !get_pconfig(local_user(),'system','always_my_theme')) - $_SESSION['theme'] = $a->profile['theme']; + if (!$profiledata && !PConfig::get(local_user(), 'system', 'always_my_theme')) { + $_SESSION['theme'] = $a->profile['theme']; + } $_SESSION['mobile-theme'] = $a->profile['mobile-theme']; @@ -90,27 +101,32 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { 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) { - $a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array( - '$editprofile' => t('Edit profile'), - '$profid' => $a->profile['id'] - )); + $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); + $block = (((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) ? true : false); /** * @todo * 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) + if ($profiledata) { $a->page['aside'] .= profile_sidebar($profiledata, true); - else + } else { $a->page['aside'] .= profile_sidebar($a->profile, $block); + } /*if (! $block) $a->page['aside'] .= contact_block();*/ @@ -127,19 +143,19 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { * 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 - * ID of the profile + * @param string $nickname nick + * @param int $uid uid + * @param int $profile ID of the profile * @returns array * Includes all available profile data */ -function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) { +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) { $r = dba::select('contact', array('profile-id'), array('id' => $visitor['cid']), array('limit' => 1)); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $profile = $r['profile-id']; } break; @@ -151,28 +167,30 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) { if ($profile) { $profile_int = intval($profile); - $r = dba::fetch_first("SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`, + $r = dba::fetch_first( + "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`, `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`, `profile`.`uid` AS `profile_uid`, `profile`.*, - `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* + `contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.* FROM `profile` INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = ? AND `profile`.`id` = ? LIMIT 1", - $nickname, - $profile_int + $nickname, + $profile_int ); } - if (!dbm::is_result($r)) { - $r = dba::fetch_first("SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`, + if (!DBM::is_result($r)) { + $r = dba::fetch_first( + "SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`, `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`, `profile`.`uid` AS `profile_uid`, `profile`.*, - `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* + `contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.* FROM `profile` INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` AND `contact`.`self` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = ? AND `profile`.`is-default` LIMIT 1", - $nickname + $nickname ); } @@ -198,7 +216,8 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) { * @hooks 'profile_sidebar' * array $arr */ -function profile_sidebar($profile, $block = 0) { +function profile_sidebar($profile, $block = 0) +{ $a = get_app(); $o = ''; @@ -225,7 +244,7 @@ function profile_sidebar($profile, $block = 0) { // don't show connect link to yourself - $connect = (($profile['uid'] != local_user()) ? t('Connect') : False); + $connect = (($profile['uid'] != local_user()) ? t('Connect') : false); // don't show connect link to authenticated visitors either if (remote_user() && count($_SESSION['remote'])) { @@ -242,16 +261,18 @@ function profile_sidebar($profile, $block = 0) { if (isset($profile["url"])) { $profile_url = normalise_link($profile["url"]); } else { - $profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]); + $profile_url = normalise_link(System::baseUrl()."/profile/".$profile["nickname"]); } - $connect = !dba::exists('contact', array('pending' => false, 'uid' => local_user(), 'nurl' => $profile_url)); + if (dba::exists('contact', array('pending' => false, 'uid' => local_user(), 'nurl' => $profile_url))) { + $connect = false; + } } if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect'])) $connect = false; - $remoteconnect = NULL; + $remoteconnect = null; if (isset($profile['remoteconnect'])) $remoteconnect = $profile['remoteconnect']; @@ -265,15 +286,19 @@ function profile_sidebar($profile, $block = 0) { $wallmessage_link = "wallmessage/".$profile["nickname"]; if (remote_user()) { - $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d", + $r = q( + "SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d", intval($profile['uid']), intval(remote_user()), - intval(CONTACT_IS_FRIEND)); + intval(CONTACT_IS_FRIEND) + ); } else { - $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d", + $r = q( + "SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d", intval($profile['uid']), dbesc(normalise_link(get_my_url())), - intval(CONTACT_IS_FRIEND)); + intval(CONTACT_IS_FRIEND) + ); } if ($r) { $remote_url = $r[0]["url"]; @@ -286,10 +311,12 @@ function profile_sidebar($profile, $block = 0) { } // show edit profile to yourself - 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()); + if (!$is_contact && $profile['uid'] == local_user() && Feature::isEnabled(local_user(), 'multi_profiles')) { + $profile['edit'] = array(System::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'), @@ -297,8 +324,7 @@ function profile_sidebar($profile, $block = 0) { 'entries' => array(), ); - if (dbm::is_result($r)) { - + if (DBM::is_result($r)) { foreach ($r as $rr) { $profile['menu']['entries'][] = array( 'photo' => $rr['thumb'], @@ -308,15 +334,12 @@ function profile_sidebar($profile, $block = 0) { 'isdefault' => $rr['is-default'], 'visibile_to_everybody' => t('visible to everybody'), 'edit_visibility' => t('Edit visibility'), - ); } - - } } - 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')); + if (!$is_contact && $profile['uid'] == local_user() && !Feature::isEnabled(local_user(), 'multi_profiles')) { + $profile['edit'] = array(System::baseUrl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile')); $profile['menu'] = array( 'chg_photo' => t('Change profile photo'), 'cr_new' => null, @@ -325,39 +348,41 @@ function profile_sidebar($profile, $block = 0) { } // Fetch the account type - $account_type = account_type($profile); - - if ((x($profile,'address') == 1) - || (x($profile,'location') == 1) - || (x($profile,'locality') == 1) - || (x($profile,'region') == 1) - || (x($profile,'postal-code') == 1) - || (x($profile,'country-name') == 1)) + $account_type = Contact::getAccountType($profile); + + if ((x($profile, 'address') == 1) + || (x($profile, 'location') == 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); + $gender = ((x($profile, 'gender') == 1) ? t('Gender:') : false); - $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); + $marital = ((x($profile, 'marital') == 1) ? t('Status:') : false); - $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); + $homepage = ((x($profile, 'homepage') == 1) ? t('Homepage:') : false); - $about = ((x($profile,'about') == 1) ? t('About:') : False); + $about = ((x($profile, 'about') == 1) ? t('About:') : false); - $xmpp = ((x($profile,'xmpp') == 1) ? t('XMPP:') : False); + $xmpp = ((x($profile, 'xmpp') == 1) ? t('XMPP:') : false); if (($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) { - $location = $pdesc = $gender = $marital = $homepage = $about = False; + $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)))); + $split_name = Diaspora::splitName($profile['name']); + $firstname = $split_name['first']; + $lastname = $split_name['last']; - if ($profile['guid'] != "") + if ($profile['guid'] != "") { $diaspora = array( 'guid' => $profile['guid'], - 'podloc' => App::get_baseurl(), + 'podloc' => System::baseUrl(), 'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ), 'nickname' => $profile['nickname'], 'fullname' => $profile['name'], @@ -367,19 +392,24 @@ function profile_sidebar($profile, $block = 0) { 'photo100' => $profile['contact_thumb'], 'photo50' => $profile['contact_micro'], ); - else + } else { $diaspora = false; + } if (!$block) { $contact_block = contact_block(); if (is_array($a->profile) && !$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)) + $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` + $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` @@ -389,33 +419,36 @@ function profile_sidebar($profile, $block = 0) { dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS) ); - if (dbm::is_result($r)) + if (DBM::is_result($r)) { $contacts = intval($r[0]['total']); + } } } $p = array(); foreach ($profile as $k => $v) { - $k = str_replace('-','_',$k); + $k = str_replace('-', '_', $k); $p[$k] = $v; } - if (isset($p["about"])) + if (isset($p["about"])) { $p["about"] = bbcode($p["about"]); + } - if (isset($p["address"])) + if (isset($p["address"])) { $p["address"] = bbcode($p["address"]); - else + } else { $p["address"] = bbcode($p["location"]); + } if (isset($p["photo"])) { $p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL); } - if ($a->theme['template_engine'] === 'internal') - $location = template_escape($location); $tpl = get_markup_template('profile_vcard.tpl'); - $o .= replace_macros($tpl, array( + $o .= replace_macros( + $tpl, + array( '$profile' => $p, '$xmpp' => $xmpp, '$connect' => $connect, @@ -426,7 +459,7 @@ function profile_sidebar($profile, $block = 0) { '$account_type' => $account_type, '$location' => $location, '$gender' => $gender, -// '$pdesc' => $pdesc, + // '$pdesc' => $pdesc, '$marital' => $marital, '$homepage' => $homepage, '$about' => $about, @@ -435,7 +468,8 @@ function profile_sidebar($profile, $block = 0) { '$updated' => $updated, '$diaspora' => $diaspora, '$contact_block' => $contact_block, - )); + ) + ); $arr = array('profile' => &$profile, 'entry' => &$o); @@ -445,61 +479,68 @@ function profile_sidebar($profile, $block = 0) { } -function get_birthdays() { - +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) -// 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_format = t('g A l F d'); // 8 AM Friday January 18 $bd_short = t('F d'); $cachekey = "get_birthdays:".local_user(); $r = Cache::get($cachekey); if (is_null($r)) { - $s = dba::p("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` - INNER JOIN `contact` ON `contact`.`id` = `event`.`cid` - WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ? - ORDER BY `start` ASC ", - local_user(), - datetime_convert('UTC','UTC','now + 6 days'), - datetime_convert('UTC','UTC','now') + $s = dba::p( + "SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` + INNER JOIN `contact` ON `contact`.`id` = `event`.`cid` + WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ? + ORDER BY `start` ASC ", + local_user(), + datetime_convert('UTC', 'UTC', 'now + 6 days'), + datetime_convert('UTC', 'UTC', 'now') ); - if (dbm::is_result($s)) { + if (DBM::is_result($s)) { $r = dba::inArray($s); Cache::set($cachekey, $r, CACHE_HOUR); } } - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $total = 0; $now = strtotime('now'); $cids = array(); $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 (! 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); @@ -507,21 +548,22 @@ function get_birthdays() { $url = $rr['url']; if ($rr['network'] === NETWORK_DFRN) { $sparkle = " sparkle"; - $url = App::get_baseurl() . '/redir/' . $rr['cid']; + $url = System::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['startime'] = null; $rr['today'] = $today; - } } } $tpl = get_markup_template("birthdays_reminder.tpl"); - return replace_macros($tpl, array( - '$baseurl' => App::get_baseurl(), + return replace_macros( + $tpl, + array( + '$baseurl' => System::baseUrl(), '$classtoday' => $classtoday, '$count' => $total, '$event_reminders' => t('Birthday Reminders'), @@ -529,13 +571,13 @@ function get_birthdays() { '$events' => $r, '$lbr' => '{', // raw brackets mess up if/endif macro processing '$rbr' => '}' - - )); + ) + ); } -function get_events() { - +function get_events() +{ require_once 'include/bbcode.php'; $a = get_app(); @@ -544,26 +586,28 @@ function get_events() { return $o; } -// $mobile_detect = new Mobile_Detect(); -// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); - -// if ($is_mobile) -// 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_format = t('g A l F d'); // 8 AM Friday January 18 $bd_short = t('F d'); - $s = dba::p("SELECT `event`.* FROM `event` - WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ? - ORDER BY `start` ASC ", - local_user(), - datetime_convert('UTC','UTC','now + 7 days'), - datetime_convert('UTC','UTC','now - 1 days') + $s = dba::p( + "SELECT `event`.* FROM `event` + WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ? + ORDER BY `start` ASC ", + local_user(), + datetime_convert('UTC', 'UTC', 'now + 7 days'), + datetime_convert('UTC', 'UTC', 'now - 1 days') ); $r = array(); - if (dbm::is_result($s)) { + if (DBM::is_result($s)) { $now = strtotime('now'); $istoday = false; @@ -572,29 +616,29 @@ function get_events() { $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')) { + $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; } - $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); + $title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8')); if (strlen($title) > 35) { - $title = substr($title,0,32) . '... '; + $title = substr($title, 0, 32) . '... '; } - $description = substr(strip_tags(bbcode($rr['desc'])),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']); + $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')) { continue; } - $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false); + $today = ((substr($strt, 0, 10) === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) ? true : false); $rr['title'] = $title; $rr['description'] = $desciption; @@ -608,27 +652,32 @@ function get_events() { $classtoday = (($istoday) ? 'event-today' : ''); } $tpl = get_markup_template("events_reminder.tpl"); - return replace_macros($tpl, array( - '$baseurl' => App::get_baseurl(), + return replace_macros( + $tpl, + array( + '$baseurl' => System::baseUrl(), '$classtoday' => $classtoday, '$count' => count($r), '$event_reminders' => t('Event Reminders'), '$event_title' => t('Events this week:'), '$events' => $r, - )); + ) + ); } -function advanced_profile(App $a) { - +function advanced_profile(App $a) +{ $o = ''; $uid = $a->profile['uid']; - $o .= replace_macros(get_markup_template('section_title.tpl'),array( + $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(); @@ -645,11 +694,10 @@ function advanced_profile(App $a) { $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))); + ? 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 (!empty($a->profile['dob']) && $a->profile['dob'] > '0001-01-01' @@ -744,37 +792,41 @@ function advanced_profile(App $a) { } //show subcribed forum if it is enabled in the usersettings - if (feature_enabled($uid,'forumlist_profile')) { - $profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid)); + if (Feature::isEnabled($uid, 'forumlist_profile')) { + $profile['forumlist'] = array( t('Forums:'), ForumManager::profileAdvanced($uid)); } if ($a->profile['uid'] == local_user()) { - $profile['edit'] = array(App::get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile')); + $profile['edit'] = array(System::baseUrl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile')); } - return replace_macros($tpl, array( + return replace_macros( + $tpl, + array( '$title' => t('Profile'), '$basic' => t('Basic'), '$advanced' => t('Advanced'), '$profile' => $profile - )); + ) + ); } return ''; } -function profile_tabs($a, $is_owner=False, $nickname=Null) { +function profile_tabs($a, $is_owner = false, $nickname = null) +{ //echo "
"; var_dump($a->user); killme(); 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; + $url = System::baseUrl() . '/profile/' . $nickname; $tabs = array( array( @@ -795,7 +847,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) { ), array( 'label' => t('Photos'), - 'url' => App::get_baseurl() . '/photos/' . $nickname, + 'url' => System::baseUrl() . '/photos/' . $nickname, 'sel' => ((!isset($tab) && $a->argv[0]=='photos') ? 'active' : ''), 'title' => t('Photo Albums'), 'id' => 'photo-tab', @@ -803,7 +855,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) { ), array( 'label' => t('Videos'), - 'url' => App::get_baseurl() . '/videos/' . $nickname, + 'url' => System::baseUrl() . '/videos/' . $nickname, 'sel' => ((!isset($tab) && $a->argv[0]=='videos') ? 'active' : ''), 'title' => t('Videos'), 'id' => 'video-tab', @@ -815,18 +867,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) { if ($is_owner && $a->theme_events_in_profile) { $tabs[] = array( 'label' => t('Events'), - 'url' => App::get_baseurl() . '/events', + 'url' => System::baseUrl() . '/events', 'sel' =>((!isset($tab) && $a->argv[0]=='events') ? 'active' : ''), 'title' => t('Events and Calendar'), 'id' => 'events-tab', 'accesskey' => 'e', ); - // if the user is not the owner of the calendar we only show a calendar - // with the public events of the calendar owner + // if the user is not the owner of the calendar we only show a calendar + // with the public events of the calendar owner } elseif (! $is_owner) { $tabs[] = array( 'label' => t('Events'), - 'url' => App::get_baseurl() . '/cal/' . $nickname, + 'url' => System::baseUrl() . '/cal/' . $nickname, 'sel' =>((!isset($tab) && $a->argv[0]=='cal') ? 'active' : ''), 'title' => t('Events and Calendar'), 'id' => 'events-tab', @@ -837,7 +889,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) { if ($is_owner) { $tabs[] = array( 'label' => t('Personal Notes'), - 'url' => App::get_baseurl() . '/notes', + 'url' => System::baseUrl() . '/notes', 'sel' =>((!isset($tab) && $a->argv[0]=='notes') ? 'active' : ''), 'title' => t('Only You Can See This'), 'id' => 'notes-tab', @@ -848,7 +900,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) { if ((! $is_owner) && ((count($a->profile)) || (! $a->profile['hide-friends']))) { $tabs[] = array( 'label' => t('Contacts'), - 'url' => App::get_baseurl() . '/viewcontacts/' . $nickname, + 'url' => System::baseUrl() . '/viewcontacts/' . $nickname, 'sel' => ((!isset($tab) && $a->argv[0]=='viewcontacts') ? 'active' : ''), 'title' => t('Contacts'), 'id' => 'viewcontacts-tab', @@ -861,20 +913,21 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) { $tpl = get_markup_template('common_tabs.tpl'); - return replace_macros($tpl,array('$tabs' => $arr['tabs'])); + return replace_macros($tpl, array('$tabs' => $arr['tabs'])); } -function get_my_url() { +function get_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)) { - // 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); @@ -885,13 +938,14 @@ function zrl_init(App $a) { return; } - proc_run(PRIORITY_LOW, 'include/gprobe.php', $tmp_str); + Worker::add(PRIORITY_LOW, 'GProbe', $tmp_str); $arr = array('zrl' => $tmp_str, 'url' => $a->cmd); call_hooks('zrl_init', $arr); } } -function zrl($s, $force = false) { +function zrl($s, $force = false) +{ if (! strlen($s)) { return $s; } @@ -923,9 +977,10 @@ function zrl($s, $force = false) { * @note Returns local_user instead of user ID if "always_my_theme" * is set to true */ -function get_theme_uid() { +function get_theme_uid() +{ $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0); - if ((local_user()) && ((get_pconfig(local_user(), 'system', 'always_my_theme')) || (! $uid))) { + if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (! $uid))) { return local_user(); }