friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3890 from zeroadam/Cache-#3878 

Move Cache to src
This commit is contained in:
Hypolite Petovan 2017-11-09 12:28:52 -05:00 committed by GitHub
parent 8b673bf78d bc65cc2af1
commit 1474751f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 1011 additions and 773 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

548
boot.php
View File

File diff suppressed because it is too large Load Diff

1
include/Photo.php
View File

@ -5,6 +5,7 @@
*/
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Database\DBM;

1
include/bbcode.php
View File

@ -1,6 +1,7 @@
<?php
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\System;
use Friendica\Core\Config;

1
include/cronjobs.php
View File

@ -1,6 +1,7 @@
<?php
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Network\Probe;

2
include/discover_poco.php
View File

@ -1,5 +1,5 @@
<?php
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;

2
include/gprobe.php
View File

@ -1,5 +1,5 @@
<?php
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Network\Probe;

335
include/identity.php
View File

@ -4,6 +4,7 @@
*/
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
@ -13,7 +14,6 @@ use Friendica\Database\DBM;
require_once 'include/ForumManager.php';
require_once 'include/bbcode.php';
require_once 'mod/proxy.php';
require_once 'include/cache.php';
/**
*
@ -34,20 +34,21 @@ 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;
}
@ -56,7 +57,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
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;
}
@ -64,7 +65,8 @@ 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",
$x = q(
"SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval($pdata['profile_uid'])
);
if ($x && count($x))
@ -79,8 +81,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
if (!$profiledata && !PConfig::get(local_user(),'system','always_my_theme'))
if (!$profiledata && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
$_SESSION['theme'] = $a->profile['theme'];
}
$_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
@ -95,27 +98,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']
));
}
$block = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
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 = (((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();*/
@ -132,14 +140,14 @@ 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) {
@ -156,7 +164,8 @@ 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`.*
@ -169,7 +178,8 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
);
}
if (!DBM::is_result($r)) {
$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`.*
@ -203,7 +213,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 = '';
@ -230,7 +241,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'])) {
@ -258,7 +269,7 @@ function profile_sidebar($profile, $block = 0) {
if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect']))
$connect = false;
$remoteconnect = NULL;
$remoteconnect = null;
if (isset($profile['remoteconnect']))
$remoteconnect = $profile['remoteconnect'];
@ -272,15 +283,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"];
@ -293,10 +308,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')) {
if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(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());
$r = q(
"SELECT * FROM `profile` WHERE `uid` = %d",
local_user()
);
$profile['menu'] = array(
'chg_photo' => t('Change profile photo'),
@ -305,7 +322,6 @@ function profile_sidebar($profile, $block = 0) {
);
if (DBM::is_result($r)) {
foreach ($r as $rr) {
$profile['menu']['entries'][] = array(
'photo' => $rr['thumb'],
@ -315,14 +331,11 @@ 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')) {
if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(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'),
@ -334,34 +347,36 @@ 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))
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);
$marital = ((x($profile,'marital') == 1) ? t('Status:') : False);
$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
$about = ((x($profile,'about') == 1) ? t('About:') : False);
$xmpp = ((x($profile,'xmpp') == 1) ? t('XMPP:') : False);
if (($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
$location = $pdesc = $gender = $marital = $homepage = $about = False;
}
$firstname = ((strpos($profile['name'],' '))
? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
$gender = ((x($profile, 'gender') == 1) ? t('Gender:') : false);
if ($profile['guid'] != "")
$marital = ((x($profile, 'marital') == 1) ? t('Status:') : false);
$homepage = ((x($profile, 'homepage') == 1) ? t('Homepage:') : false);
$about = ((x($profile, 'about') == 1) ? t('About:') : false);
$xmpp = ((x($profile, 'xmpp') == 1) ? t('XMPP:') : false);
if (($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
$location = $pdesc = $gender = $marital = $homepage = $about = false;
}
$firstname = ((strpos($profile['name'], ' '))
? trim(substr($profile['name'], 0, strpos($profile['name'], ' '))) : $profile['name']);
$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'], strlen($firstname))));
if ($profile['guid'] != "") {
$diaspora = array(
'guid' => $profile['guid'],
'podloc' => System::baseUrl(),
@ -374,19 +389,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`
@ -396,33 +416,40 @@ 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')
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,
@ -433,7 +460,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,
@ -442,7 +469,8 @@ function profile_sidebar($profile, $block = 0) {
'$updated' => $updated,
'$diaspora' => $diaspora,
'$contact_block' => $contact_block,
));
)
);
$arr = array('profile' => &$profile, 'entry' => &$o);
@ -452,33 +480,36 @@ 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();
/**
* $mobile_detect = new Mobile_Detect();
* $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
* if ($is_mobile)
* return $o;
*/
// 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`
$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')
datetime_convert('UTC', 'UTC', 'now + 6 days'),
datetime_convert('UTC', 'UTC', 'now')
);
if (DBM::is_result($s)) {
$r = dba::inArray($s);
@ -492,21 +523,25 @@ 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 (! 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);
@ -520,14 +555,15 @@ function get_birthdays() {
$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(
return replace_macros(
$tpl,
array(
'$baseurl' => System::baseUrl(),
'$classtoday' => $classtoday,
'$count' => $total,
@ -536,13 +572,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();
@ -551,21 +587,23 @@ function get_events() {
return $o;
}
// $mobile_detect = new Mobile_Detect();
// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
/**
* $mobile_detect = new Mobile_Detect();
* $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
* if ($is_mobile)
* return $o;
*/
// 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`
$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')
datetime_convert('UTC', 'UTC', 'now + 7 days'),
datetime_convert('UTC', 'UTC', 'now - 1 days')
);
$r = array();
@ -579,29 +617,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;
@ -615,27 +653,32 @@ function get_events() {
$classtoday = (($istoday) ? 'event-today' : '');
}
$tpl = get_markup_template("events_reminder.tpl");
return replace_macros($tpl, array(
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();
@ -652,11 +695,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'
@ -751,7 +793,7 @@ function advanced_profile(App $a) {
}
//show subcribed forum if it is enabled in the usersettings
if (feature_enabled($uid,'forumlist_profile')) {
if (feature_enabled($uid, 'forumlist_profile')) {
$profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid));
}
@ -759,25 +801,29 @@ function advanced_profile(App $a) {
$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 "<pre>"; 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']));
}
@ -868,20 +914,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);
@ -898,7 +945,8 @@ function zrl_init(App $a) {
}
}
function zrl($s, $force = false) {
function zrl($s, $force = false)
{
if (! strlen($s)) {
return $s;
}
@ -930,7 +978,8 @@ 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()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
return local_user();

1
include/oembed.php
View File

@ -5,6 +5,7 @@
*/
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\System;
use Friendica\ParseUrl;
use Friendica\Core\Config;

359
include/ostatus.php
View File

@ -4,6 +4,7 @@
*/
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Database\DBM;
@ -23,14 +24,12 @@ require_once 'include/follow.php';
require_once 'include/api.php';
require_once 'mod/proxy.php';
require_once 'include/xml.php';
require_once 'include/cache.php';
/**
* @brief This class contain functions for the OStatus protocol
*
*/
class ostatus {
class ostatus
{
private static $itemlist;
private static $conv_list = array();
@ -45,8 +44,8 @@ class ostatus {
*
* @return array Array of author related entries for the item
*/
private static function fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch) {
private static function fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
{
$author = array();
$author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
$author["author-name"] = $xpath->evaluate('atom:author/atom:name/text()', $context)->item(0)->nodeValue;
@ -56,7 +55,7 @@ class ostatus {
$alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
if (is_object($alternate)) {
foreach ($alternate AS $attributes) {
foreach ($alternate as $attributes) {
if (($attributes->name == "href") && ($attributes->textContent != "")) {
$author["author-link"] = $attributes->textContent;
}
@ -117,10 +116,10 @@ class ostatus {
$avatarlist = array();
$avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
foreach ($avatars AS $avatar) {
foreach ($avatars as $avatar) {
$href = "";
$width = 0;
foreach ($avatar->attributes AS $attributes) {
foreach ($avatar->attributes as $attributes) {
if ($attributes->name == "href") {
$href = $attributes->textContent;
}
@ -148,7 +147,6 @@ class ostatus {
// Only update the contacts if it is an OStatus contact
if ($r && ($r['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
// This contact is vital, so we awake it from the dead
unmark_for_death($contact);
@ -238,8 +236,8 @@ class ostatus {
*
* @return array Array of author related entries for the item
*/
public static function salmon_author($xml, $importer) {
public static function salmon_author($xml, $importer)
{
if ($xml == "")
return;
@ -258,7 +256,7 @@ class ostatus {
$entries = $xpath->query('/atom:entry');
foreach ($entries AS $entry) {
foreach ($entries as $entry) {
// fetch the author
$author = self::fetchauthor($xpath, $entry, $importer, $contact, true);
return $author;
@ -272,10 +270,11 @@ class ostatus {
*
* @return array attributes
*/
private static function read_attributes($element) {
private static function read_attributes($element)
{
$attribute = array();
foreach ($element->attributes AS $attributes) {
foreach ($element->attributes as $attributes) {
$attribute[$attributes->name] = $attributes->textContent;
}
@ -287,10 +286,11 @@ class ostatus {
*
* @param string $xml The XML
* @param array $importer user record of the importing user
* @param array $contact
* @param array $contact contact
* @param string $hub Called by reference, returns the fetched hub data
*/
public static function import($xml, $importer, &$contact, &$hub) {
public static function import($xml, $importer, &$contact, &$hub)
{
self::process($xml, $importer, $contact, $hub);
}
@ -306,7 +306,8 @@ class ostatus {
*
* @return boolean Could the XML be processed?
*/
private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true) {
private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true)
{
if ($initialize) {
self::$itemlist = array();
self::$conv_list = array();
@ -333,7 +334,7 @@ class ostatus {
$hub = "";
$hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
if (is_object($hub_attributes)) {
foreach ($hub_attributes AS $hub_attribute) {
foreach ($hub_attributes as $hub_attribute) {
if ($hub_attribute->name == "href") {
$hub = $hub_attribute->textContent;
logger("Found hub ".$hub, LOGGER_DEBUG);
@ -380,11 +381,11 @@ class ostatus {
// Reverse the order of the entries
$entrylist = array();
foreach ($entries AS $entry) {
foreach ($entries as $entry) {
$entrylist[] = $entry;
}
foreach (array_reverse($entrylist) AS $entry) {
foreach (array_reverse($entrylist) as $entry) {
// fetch the author
$authorelement = $xpath->query('/atom:entry/atom:author', $entry);
@ -473,13 +474,13 @@ class ostatus {
$valid = !empty(self::$itemlist[0]['contact-id']);
if (!$valid) {
// If not, then it depends on this setting
$valid = !Config::get('system','ostatus_full_threads');
$valid = !Config::get('system', 'ostatus_full_threads');
}
if ($valid) {
// Never post a thread when the only interaction by our contact was a like
$valid = false;
$verbs = array(ACTIVITY_POST, ACTIVITY_SHARE);
foreach (self::$itemlist AS $item) {
foreach (self::$itemlist as $item) {
if (!empty($item['contact-id']) && in_array($item['verb'], $verbs)) {
$valid = true;
}
@ -500,7 +501,7 @@ class ostatus {
$default_contact = $item['contact-id'];
}
}
foreach (self::$itemlist AS $item) {
foreach (self::$itemlist as $item) {
$found = dba::exists('item', array('uid' => $importer["uid"], 'uri' => $item["uri"]));
if ($found) {
logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already exists.", LOGGER_DEBUG);
@ -526,8 +527,8 @@ class ostatus {
return true;
}
private static function deleteNotice($item) {
private static function deleteNotice($item)
{
$condition = array('uid' => $item['uid'], 'author-link' => $item['author-link'], 'uri' => $item['uri']);
$deleted = dba::select('item', array('id', 'parent-uri'), $condition, array('limit' => 1));
if (!DBM::is_result($deleted)) {
@ -536,9 +537,12 @@ class ostatus {
}
// Currently we don't have a central deletion function that we could use in this case. The function "item_drop" doesn't work for that case
dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
dba::update(
'item',
array('deleted' => true, 'title' => '', 'body' => '',
'edited' => datetime_convert(), 'changed' => datetime_convert()),
array('id' => $deleted["id"]));
array('id' => $deleted["id"])
);
delete_thread($deleted["id"], $deleted["parent-uri"]);
@ -553,7 +557,8 @@ class ostatus {
* @param array $item The item array
* @param array $importer user record of the importing user
*/
private static function processPost($xpath, $entry, &$item, $importer) {
private static function processPost($xpath, $entry, &$item, $importer)
{
$item["body"] = html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue);
$item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue;
if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
@ -570,7 +575,7 @@ class ostatus {
$conv = $xpath->query('ostatus:conversation', $entry);
if (is_object($conv->item(0))) {
foreach ($conv->item(0)->attributes AS $attributes) {
foreach ($conv->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item['conversation-uri'] = $attributes->textContent;
}
@ -584,7 +589,7 @@ class ostatus {
$inreplyto = $xpath->query('thr:in-reply-to', $entry);
if (is_object($inreplyto->item(0))) {
foreach ($inreplyto->item(0)->attributes AS $attributes) {
foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
}
@ -601,8 +606,8 @@ class ostatus {
$categories = $xpath->query('atom:category', $entry);
if ($categories) {
foreach ($categories AS $category) {
foreach ($category->attributes AS $attributes) {
foreach ($categories as $category) {
foreach ($category->attributes as $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
if (strlen($item["tag"])) {
@ -628,7 +633,7 @@ class ostatus {
$notice_info = $xpath->query('statusnet:notice_info', $entry);
if ($notice_info && ($notice_info->length > 0)) {
foreach ($notice_info->item(0)->attributes AS $attributes) {
foreach ($notice_info->item(0)->attributes as $attributes) {
if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
}
@ -648,7 +653,7 @@ class ostatus {
$item["body"] .= $add_body;
// Only add additional data when there is no picture in the post
if (!strstr($item["body"],'[/img]')) {
if (!strstr($item["body"], '[/img]')) {
$item["body"] = add_page_info_to_body($item["body"]);
}
@ -693,8 +698,8 @@ class ostatus {
* @param string $conversation The link to the conversation
* @param string $conversation_uri The conversation in "uri" format
*/
private static function fetchConversation($conversation, $conversation_uri) {
private static function fetchConversation($conversation, $conversation_uri)
{
// Ensure that we only store a conversation once in a process
if (isset(self::$conv_list[$conversation])) {
return;
@ -723,7 +728,7 @@ class ostatus {
$links = $xpath->query('//link');
if ($links) {
foreach ($links AS $link) {
foreach ($links as $link) {
$attribute = ostatus::read_attributes($link);
if (($attribute['rel'] == 'alternate') && ($attribute['type'] == 'application/atom+xml')) {
$file = $attribute['href'];
@ -750,8 +755,11 @@ class ostatus {
* @brief Store a feed in several conversation entries
*
* @param string $xml The feed
* @param string $conversation conversation
* @param string $conversation_uri conversation uri
*/
private static function storeConversation($xml, $conversation = '', $conversation_uri = '') {
private static function storeConversation($xml, $conversation = '', $conversation_uri = '')
{
$doc = new DOMDocument();
@$doc->loadXML($xml);
@ -763,7 +771,7 @@ class ostatus {
$entries = $xpath->query('/atom:feed/atom:entry');
// Now store the entries
foreach ($entries AS $entry) {
foreach ($entries as $entry) {
$doc2 = new DOMDocument();
$doc2->preserveWhiteSpace = false;
$doc2->formatOutput = true;
@ -776,7 +784,7 @@ class ostatus {
$inreplyto = $xpath->query('thr:in-reply-to', $entry);
if (is_object($inreplyto->item(0))) {
foreach ($inreplyto->item(0)->attributes AS $attributes) {
foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$conv_data['reply-to-uri'] = $attributes->textContent;
}
@ -788,7 +796,7 @@ class ostatus {
$conv = $xpath->query('ostatus:conversation', $entry);
if (is_object($conv->item(0))) {
foreach ($conv->item(0)->attributes AS $attributes) {
foreach ($conv->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$conv_data['conversation-uri'] = $attributes->textContent;
}
@ -833,7 +841,8 @@ class ostatus {
*
* @param string $self The link to the self item
*/
private static function fetchSelf($self, &$item) {
private static function fetchSelf($self, &$item)
{
$condition = array('`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON);
if (dba::exists('conversation', $condition)) {
logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG);
@ -866,7 +875,8 @@ class ostatus {
* @param string $related_uri The related item in "uri" format
* @param array $importer user record of the importing user
*/
private static function fetchRelated($related, $related_uri, $importer) {
private static function fetchRelated($related, $related_uri, $importer)
{
$condition = array('`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON);
$conversation = dba::select('conversation', array('source', 'protocol'), $condition, array('limit' => 1));
if (DBM::is_result($conversation)) {
@ -907,7 +917,7 @@ class ostatus {
$links = $xpath->query('//link');
if ($links) {
foreach ($links AS $link) {
foreach ($links as $link) {
$attribute = self::read_attributes($link);
if (($attribute['rel'] == 'alternate') && ($attribute['type'] == 'application/atom+xml')) {
$atom_file = $attribute['href'];
@ -974,7 +984,8 @@ class ostatus {
*
* @return array with data from links
*/
private static function processRepeatedItem($xpath, $entry, &$item, $importer) {
private static function processRepeatedItem($xpath, $entry, &$item, $importer)
{
$activityobjects = $xpath->query('activity:object', $entry)->item(0);
if (!is_object($activityobjects)) {
@ -1013,7 +1024,7 @@ class ostatus {
$inreplyto = $xpath->query('thr:in-reply-to', $activityobjects);
if (is_object($inreplyto->item(0))) {
foreach ($inreplyto->item(0)->attributes AS $attributes) {
foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
}
@ -1031,18 +1042,20 @@ class ostatus {
*
* @return array with data from the links
*/
private static function processLinks($links, &$item) {
private static function processLinks($links, &$item)
{
$link_data = array('add_body' => '', 'self' => '');
foreach ($links AS $link) {
foreach ($links as $link) {
$attribute = self::read_attributes($link);
if (($attribute['rel'] != "") && ($attribute['href'] != "")) {
switch ($attribute['rel']) {
case "alternate":
$item["plink"] = $attribute['href'];
if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) ||
($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
if (($item["object-type"] == ACTIVITY_OBJ_QUESTION)
|| ($item["object-type"] == ACTIVITY_OBJ_EVENT)
) {
$item["body"] .= add_page_info($attribute['href']);
}
break;
@ -1054,7 +1067,7 @@ class ostatus {
}
break;
case "enclosure":
$filetype = strtolower(substr($attribute['type'], 0, strpos($attribute['type'],'/')));
$filetype = strtolower(substr($attribute['type'], 0, strpos($attribute['type'], '/')));
if ($filetype == 'image') {
$link_data['add_body'] .= "\n[img]".$attribute['href'].'[/img]';
} else {
@ -1089,15 +1102,16 @@ class ostatus {
return $link_data;
}
/**
/**
* @brief Create an url out of an uri
*
* @param string $href URI in the format "parameter1:parameter1:..."
*
* @return string URL in the format http(s)://....
*/
public static function convert_href($href) {
$elements = explode(":",$href);
public static function convert_href($href)
{
$elements = explode(":", $href);
if ((count($elements) <= 2) || ($elements[0] != "tag"))
return $href;
@ -1126,7 +1140,8 @@ class ostatus {
*
* @return string The guid if the post is a reshare
*/
private static function get_reshared_guid($item) {
private static function get_reshared_guid($item)
{
$body = trim($item["body"]);
// Skip if it isn't a pure repeated messages
@ -1138,7 +1153,7 @@ class ostatus {
if (strlen($body) > (strrpos($body, "[/share]") + 8))
return "";
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
// Skip if there is no shared message in there
if ($body == $attributes)
return false;
@ -1162,14 +1177,16 @@ class ostatus {
*
* @return string The cleaned body
*/
private static function format_picture_post($body) {
private static function format_picture_post($body)
{
$siteinfo = get_attached_data($body);
if (($siteinfo["type"] == "photo")) {
if (isset($siteinfo["preview"]))
if (isset($siteinfo["preview"])) {
$preview = $siteinfo["preview"];
else
} else {
$preview = $siteinfo["image"];
}
// Is it a remote picture? Then make a smaller preview here
$preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
@ -1178,10 +1195,11 @@ class ostatus {
$preview = str_replace(array("-0.jpg", "-0.png"), array("-2.jpg", "-2.png"), $preview);
$preview = str_replace(array("-1.jpg", "-1.png"), array("-2.jpg", "-2.png"), $preview);
if (isset($siteinfo["url"]))
if (isset($siteinfo["url"])) {
$url = $siteinfo["url"];
else
} else {
$url = $siteinfo["image"];
}
$body = trim($siteinfo["text"])." [url]".$url."[/url]\n[img]".$preview."[/img]";
}
@ -1197,8 +1215,8 @@ class ostatus {
*
* @return object header root element
*/
private static function add_header($doc, $owner) {
private static function add_header($doc, $owner)
{
$a = get_app();
$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
@ -1256,8 +1274,10 @@ class ostatus {
*
* @param object $doc XML document
* @param object $root XML root element where the hub links are added
* @param object $nick nick
*/
public static function hublinks($doc, $root, $nick) {
public static function hublinks($doc, $root, $nick)
{
$h = System::baseUrl() . '/pubsubhubbub/'.$nick;
xml::add_element($doc, $root, "link", "", array("href" => $h, "rel" => "hub"));
}
@ -1269,7 +1289,8 @@ class ostatus {
* @param object $root XML root element where the hub links are added
* @param array $item Data of the item that is to be posted
*/
private static function get_attachment($doc, $root, $item) {
private static function get_attachment($doc, $root, $item)
{
$o = "";
$siteinfo = get_attached_data($item["body"]);
@ -1334,8 +1355,8 @@ class ostatus {
*
* @return object author element
*/
private static function add_author($doc, $owner) {
private static function add_author($doc, $owner)
{
$r = q("SELECT `homepage`, `publish` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"]));
if (DBM::is_result($r)) {
$profile = $r[0];
@ -1402,7 +1423,6 @@ class ostatus {
* @TODO Picture attachments should look like this:
* <a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
* class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
*
*/
/**
@ -1412,7 +1432,8 @@ class ostatus {
*
* @return string activity
*/
private static function construct_verb($item) {
private static function construct_verb($item)
{
if ($item['verb'])
return $item['verb'];
return ACTIVITY_POST;
@ -1425,7 +1446,8 @@ class ostatus {
*
* @return string Object type
*/
private static function construct_objecttype($item) {
private static function construct_objecttype($item)
{
if (in_array($item['object-type'], array(ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT)))
return $item['object-type'];
return ACTIVITY_OBJ_NOTE;
@ -1437,11 +1459,12 @@ class ostatus {
* @param object $doc XML document
* @param array $item Data of the item that is to be posted
* @param array $owner Contact data of the poster
* @param bool $toplevel
* @param bool $toplevel optional default false
*
* @return object Entry element
*/
private static function entry($doc, $item, $owner, $toplevel = false) {
private static function entry($doc, $item, $owner, $toplevel = false)
{
$repeated_guid = self::get_reshared_guid($item);
if ($repeated_guid != "")
$xml = self::reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel);
@ -1466,18 +1489,15 @@ class ostatus {
*
* @return object Source element
*/
private static function source_entry($doc, $contact) {
private static function source_entry($doc, $contact)
{
$source = $doc->createElement("source");
xml::add_element($doc, $source, "id", $contact["poll"]);
xml::add_element($doc, $source, "title", $contact["name"]);
xml::add_element($doc, $source, "link", "", array("rel" => "alternate",
"type" => "text/html",
"href" => $contact["alias"]));
xml::add_element($doc, $source, "link", "", array("rel" => "self",
"type" => "application/atom+xml",
"href" => $contact["poll"]));
xml::add_element($doc, $source, "link", "", array("rel" => "alternate", "type" => "text/html", "href" => $contact["alias"]));
xml::add_element($doc, $source, "link", "", array("rel" => "self", "type" => "application/atom+xml", "href" => $contact["poll"]));
xml::add_element($doc, $source, "icon", $contact["photo"]);
xml::add_element($doc, $source, "updated", datetime_convert("UTC","UTC",$contact["success_update"]."+00:00",ATOM_TIME));
xml::add_element($doc, $source, "updated", datetime_convert("UTC", "UTC", $contact["success_update"]."+00:00", ATOM_TIME));
return $source;
}
@ -1492,16 +1512,21 @@ class ostatus {
*/
private static function contact_entry($url, $owner) {
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
dbesc(normalise_link($url)), intval($owner["uid"]));
$r = q(
"SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
dbesc(normalise_link($url)),
intval($owner["uid"])
);
if (DBM::is_result($r)) {
$contact = $r[0];
$contact["uid"] = -1;
}
if (!DBM::is_result($r)) {
$r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($url)));
$r = q(
"SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($url))
);
if (DBM::is_result($r)) {
$contact = $r[0];
$contact["uid"] = -1;
@ -1509,19 +1534,22 @@ class ostatus {
}
}
if (!DBM::is_result($r))
if (!DBM::is_result($r)) {
$contact = owner;
}
if (!isset($contact["poll"])) {
$data = Probe::uri($url);
$contact["poll"] = $data["poll"];
if (!$contact["alias"])
if (!$contact["alias"]) {
$contact["alias"] = $data["alias"];
}
}
if (!isset($contact["alias"]))
if (!isset($contact["alias"])) {
$contact["alias"] = $contact["url"];
}
return $contact;
}
@ -1537,17 +1565,22 @@ class ostatus {
*
* @return object Entry element
*/
private static function reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel) {
private static function reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel)
{
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
$title = self::entry_header($doc, $entry, $owner, $toplevel);
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1",
intval($owner["uid"]), dbesc($repeated_guid),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
$r = q(
"SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1",
intval($owner["uid"]),
dbesc($repeated_guid),
dbesc(NETWORK_DFRN),
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_OSTATUS)
);
if (DBM::is_result($r)) {
$repeated_item = $r[0];
} else {
@ -1603,8 +1636,8 @@ class ostatus {
*
* @return object Entry element with "like"
*/
private static function like_entry($doc, $item, $owner, $toplevel) {
private static function like_entry($doc, $item, $owner, $toplevel)
{
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
@ -1616,8 +1649,11 @@ class ostatus {
$as_object = $doc->createElement("activity:object");
$parent = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
dbesc($item["thr-parent"]), intval($item["uid"]));
$parent = q(
"SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
dbesc($item["thr-parent"]),
intval($item["uid"])
);
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
xml::add_element($doc, $as_object, "activity:object-type", self::construct_objecttype($parent[0]));
@ -1640,8 +1676,8 @@ class ostatus {
*
* @return object author element
*/
private static function add_person_object($doc, $owner, $contact) {
private static function add_person_object($doc, $owner, $contact)
{
$object = $doc->createElement("activity:object");
xml::add_element($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
@ -1700,8 +1736,11 @@ class ostatus {
$item['follow'] = $contact['alias'];
}
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner['uid']), dbesc(normalise_link($contact["url"])));
$r = q(
"SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner['uid']),
dbesc(normalise_link($contact["url"]))
);
if (DBM::is_result($r)) {
$connect_id = $r[0]['id'];
@ -1719,8 +1758,8 @@ class ostatus {
$action = "unfollow";
}
$item["uri"] = $item['parent-uri'] = $item['thr-parent'] =
'tag:'.get_app()->get_hostname().
$item["uri"] = $item['parent-uri'] = $item['thr-parent']
= 'tag:'.get_app()->get_hostname().
','.date('Y-m-d').':'.$action.':'.$owner['uid'].
':person:'.$connect_id.':'.$item['created'];
@ -1748,8 +1787,8 @@ class ostatus {
*
* @return object Entry element
*/
private static function note_entry($doc, $item, $owner, $toplevel) {
private static function note_entry($doc, $item, $owner, $toplevel)
{
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
}
@ -1775,7 +1814,8 @@ class ostatus {
*
* @return string The title for the element
*/
private static function entry_header($doc, &$entry, $owner, $toplevel) {
private static function entry_header($doc, &$entry, $owner, $toplevel)
{
/// @todo Check if this title stuff is really needed (I guess not)
if (!$toplevel) {
$entry = $doc->createElement("entry");
@ -1811,10 +1851,11 @@ class ostatus {
* @param string $verb The activity verb
* @param bool $complete Add the "status_net" element?
*/
private static function entry_content($doc, $entry, $item, $owner, $title, $verb = "", $complete = true) {
if ($verb == "")
private static function entry_content($doc, $entry, $item, $owner, $title, $verb = "", $complete = true)
{
if ($verb == "") {
$verb = self::construct_verb($item);
}
xml::add_element($doc, $entry, "id", $item["uri"]);
xml::add_element($doc, $entry, "title", $title);
@ -1829,15 +1870,17 @@ class ostatus {
xml::add_element($doc, $entry, "content", $body, array("type" => "html"));
xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
"href" => System::baseUrl()."/display/".$item["guid"]));
"href" => System::baseUrl()."/display/".$item["guid"])
);
if ($complete && ($item["id"] > 0))
if ($complete && ($item["id"] > 0)) {
xml::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
}
xml::add_element($doc, $entry, "activity:verb", $verb);
xml::add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
xml::add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
xml::add_element($doc, $entry, "published", datetime_convert("UTC", "UTC", $item["created"]."+00:00", ATOM_TIME));
xml::add_element($doc, $entry, "updated", datetime_convert("UTC", "UTC", $item["edited"]."+00:00", ATOM_TIME));
}
/**
@ -1847,19 +1890,21 @@ class ostatus {
* @param object $entry The entry element where the elements are added
* @param array $item Data of the item that is to be posted
* @param array $owner Contact data of the poster
* @param $complete
* @param bool $complete default true
*/
private static function entry_footer($doc, $entry, $item, $owner, $complete = true) {
private static function entry_footer($doc, $entry, $item, $owner, $complete = true)
{
$mentioned = array();
if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
$parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$thrparent = q("SELECT `guid`, `author-link`, `owner-link`, `plink` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
$thrparent = q(
"SELECT `guid`, `author-link`, `owner-link`, `plink` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
intval($owner["uid"]),
dbesc($parent_item));
dbesc($parent_item)
);
if ($thrparent) {
$mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"];
$mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"];
@ -1909,31 +1954,43 @@ class ostatus {
$tags = item_getfeedtags($item);
if (count($tags))
foreach ($tags as $t)
if ($t[0] == "@")
if (count($tags)) {
foreach ($tags as $t) {
if ($t[0] == "@") {
$mentioned[$t[1]] = $t[1];
}
}
}
// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
$newmentions = array();
foreach ($mentioned AS $mention) {
foreach ($mentioned as $mention) {
$newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention);
$newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention);
}
$mentioned = $newmentions;
foreach ($mentioned AS $mention) {
$r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
foreach ($mentioned as $mention) {
$r = q(
"SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner["uid"]),
dbesc(normalise_link($mention)));
if ($r[0]["forum"] || $r[0]["prv"])
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
dbesc(normalise_link($mention))
);
if ($r[0]["forum"] || $r[0]["prv"]) {
xml::add_element($doc, $entry, "link", "",
array(
"rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
"href" => $mention));
else
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"href" => $mention)
);
} else {
xml::add_element($doc, $entry, "link", "",
array(
"rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
"href" => $mention));
"href" => $mention)
);
}
}
if (!$item["private"]) {
@ -1945,10 +2002,13 @@ class ostatus {
xml::add_element($doc, $entry, "mastodon:scope", "public");
}
if (count($tags))
foreach ($tags as $t)
if ($t[0] != "@")
if (count($tags)) {
foreach ($tags as $t) {
if ($t[0] != "@") {
xml::add_element($doc, $entry, "category", "", array("term" => $t[2]));
}
}
}
self::get_attachment($doc, $entry, $item);
@ -1959,11 +2019,13 @@ class ostatus {
$attributes = array("local_id" => $item["id"], "source" => $app);
if (isset($parent["id"]))
if (isset($parent["id"])) {
$attributes["repeat_of"] = $parent["id"];
}
if ($item["coord"] != "")
if ($item["coord"] != "") {
xml::add_element($doc, $entry, "georss:point", $item["coord"]);
}
xml::add_element($doc, $entry, "statusnet:notice_info", "", $attributes);
}
@ -1972,14 +2034,15 @@ class ostatus {
/**
* @brief Creates the XML feed for a given nickname
*
* @param App $a The application class
* @param object $a The application class
* @param string $owner_nick Nickname of the feed owner
* @param string $last_update Date of the last update
* @param integer $max_items Number of maximum items to fetch
*
* @return string XML feed
*/
public static function feed(App $a, $owner_nick, &$last_update, $max_items = 300) {
public static function feed(App $a, $owner_nick, &$last_update, $max_items = 300)
{
$stamp = microtime(true);
$cachekey = "ostatus:feed:".$owner_nick.":".$last_update;
@ -1993,10 +2056,12 @@ class ostatus {
return $result['feed'];
}
$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
$r = q(
"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
dbesc($owner_nick));
dbesc($owner_nick)
);
if (!DBM::is_result($r)) {
return;
}
@ -2007,10 +2072,11 @@ class ostatus {
$last_update = 'now -30 days';
}
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
$check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
$authorid = get_contact($owner["url"], 0);
$items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
$items = q(
"SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
WHERE `item`.`uid` = %d AND `item`.`contact-id` = %d AND
`item`.`author-id` = %d AND `item`.`created` > '%s' AND
@ -2019,14 +2085,15 @@ class ostatus {
ORDER BY `item`.`created` DESC LIMIT %d",
intval($owner["uid"]), intval($owner["id"]),
intval($authorid), dbesc($check_date),
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), intval($max_items));
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), intval($max_items)
);
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
$root = self::add_header($doc, $owner);
foreach ($items AS $item) {
foreach ($items as $item) {
if (Config::get('system', 'ostatus_debug')) {
$item['body'] .= '🍼';
}
@ -2056,8 +2123,8 @@ class ostatus {
*
* @return string XML for the salmon
*/
public static function salmon($item,$owner) {
public static function salmon($item, $owner)
{
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;

2
include/photos.php
View File

@ -3,7 +3,7 @@
* @file include/photos.php
* @brief Functions related to photo handling.
*/
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;

29
include/queue.php
View File

@ -1,5 +1,8 @@
<?php
/**
* @file include/queue.php
*/
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
@ -11,9 +14,9 @@ require_once 'include/datetime.php';
require_once 'include/items.php';
require_once 'include/bbcode.php';
require_once 'include/socgraph.php';
require_once 'include/cache.php';
function queue_run(&$argv, &$argc) {
function queue_run(&$argv, &$argc)
{
global $a;
if ($argc > 1) {
@ -26,15 +29,16 @@ function queue_run(&$argv, &$argc) {
$cachekey_server = 'queue_run:server:';
if (!$queue_id) {
logger('queue: start');
// Handling the pubsubhubbub requests
Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'pubsubpublish');
$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
$r = q(
"SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"
);
if (DBM::is_result($r)) {
foreach ($r as $rr) {
@ -66,8 +70,10 @@ function queue_run(&$argv, &$argc) {
require_once 'include/salmon.php';
$r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id));
$r = q(
"SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id)
);
if (!DBM::is_result($r)) {
return;
@ -75,7 +81,8 @@ function queue_run(&$argv, &$argc) {
$q_item = $r[0];
$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
$c = q(
"SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($q_item['cid'])
);
@ -111,7 +118,8 @@ function queue_run(&$argv, &$argc) {
}
}
$u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
$u = q(
"SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
FROM `user` WHERE `uid` = %d LIMIT 1",
intval($c[0]['uid'])
);
@ -176,7 +184,6 @@ function queue_run(&$argv, &$argc) {
update_queue_time($q_item['id']);
}
break;
}
logger('Deliver status '.(int)$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>');

39
include/session.php
View File

@ -1,27 +1,28 @@
<?php
// Session management functions. These provide database storage of PHP
// session info.
/**
* Session management functions. These provide database storage of PHP session info.
*/
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
require_once('include/cache.php');
$session_exists = 0;
$session_expire = 180000;
function ref_session_open($s, $n) {
function ref_session_open($s, $n)
{
return true;
}
function ref_session_read($id) {
function ref_session_read($id)
{
global $session_exists;
if (!x($id)) {
return '';
}
$memcache = cache::memcache();
$memcache = Cache::memcache();
if (is_object($memcache)) {
$data = $memcache->get(get_app()->get_hostname().":session:".$id);
if (!is_bool($data)) {
@ -56,7 +57,8 @@ function ref_session_read($id) {
* @param string $data Serialized session data
* @return boolean Returns false if parameters are missing, true otherwise
*/
function ref_session_write($id, $data) {
function ref_session_write($id, $data)
{
global $session_exists, $session_expire;
if (!$id || !$data) {
@ -66,7 +68,7 @@ function ref_session_write($id, $data) {
$expire = time() + $session_expire;
$default_expire = time() + 300;
$memcache = cache::memcache();
$memcache = Cache::memcache();
$a = get_app();
if (is_object($memcache) && is_object($a)) {
$memcache->set($a->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire);
@ -85,12 +87,14 @@ function ref_session_write($id, $data) {
return true;
}
function ref_session_close() {
function ref_session_close()
{
return true;
}
function ref_session_destroy($id) {
$memcache = cache::memcache();
function ref_session_destroy($id)
{
$memcache = Cache::memcache();
if (is_object($memcache)) {
$memcache->delete(get_app()->get_hostname().":session:".$id);
@ -101,7 +105,8 @@ function ref_session_destroy($id) {
return true;
}
function ref_session_gc($expire) {
function ref_session_gc($expire)
{
dba::delete('session', array("`expire` < ?", time()));
return true;
}
@ -117,7 +122,9 @@ if (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
}
if (!Config::get('system', 'disable_database_session')) {
session_set_save_handler('ref_session_open', 'ref_session_close',
session_set_save_handler(
'ref_session_open', 'ref_session_close',
'ref_session_read', 'ref_session_write',
'ref_session_destroy', 'ref_session_gc');
'ref_session_destroy', 'ref_session_gc'
);
}

1
include/socgraph.php
View File

@ -9,6 +9,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;

82
mod/ping.php
View File

@ -1,18 +1,20 @@
<?php
/**
* @file include/ping.php
*/
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\System;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
require_once('include/datetime.php');
require_once('include/bbcode.php');
require_once('include/ForumManager.php');
require_once('include/group.php');
require_once('mod/proxy.php');
require_once('include/xml.php');
require_once('include/cache.php');
require_once('include/enotify.php');
require_once 'include/datetime.php';
require_once 'include/bbcode.php';
require_once 'include/ForumManager.php';
require_once 'include/group.php';
require_once 'mod/proxy.php';
require_once 'include/xml.php';
require_once 'include/enotify.php';
/**
* @brief Outputs the counts and the lists of various notifications
@ -96,10 +98,9 @@ function ping_init(App $a)
$data['birthdays'] = $birthdays;
$data['birthdays-today'] = $birthdays_today;
if (local_user()){
if (local_user()) {
// Different login session than the page that is calling us.
if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
$data = array('result' => array('invalid' => 1));
if ($format == 'json') {
@ -120,7 +121,8 @@ function ping_init(App $a)
$notifs = ping_get_notifications(local_user());
$items_unseen = q("SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
$items_unseen = q(
"SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
`item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`
FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id` = `item`.`parent`
@ -128,7 +130,8 @@ function ping_init(App $a)
`item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
AND `item`.`contact-id` != %d
ORDER BY `item`.`created` DESC",
intval(local_user()), intval(local_user())
intval(local_user()),
intval(local_user())
);
if (DBM::is_result($items_unseen)) {
@ -169,13 +172,15 @@ function ping_init(App $a)
}
}
$intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`,
$intros1 = q(
"SELECT `intro`.`id`, `intro`.`datetime`,
`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
intval(local_user())
);
$intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`,
$intros2 = q(
"SELECT `intro`.`id`, `intro`.`datetime`,
`contact`.`name`, `contact`.`url`, `contact`.`photo`
FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
@ -186,17 +191,20 @@ function ping_init(App $a)
$intros = $intros1 + $intros2;
$myurl = System::baseUrl() . '/profile/' . $a->user['nickname'] ;
$mails = q("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
$mails = q(
"SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
intval(local_user()),
dbesc($myurl)
);
$mail_count = count($mails);
if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
$regs = q(
"SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
WHERE `contact`.`self` = 1");
WHERE `contact`.`self` = 1"
);
if (DBM::is_result($regs)) {
$register_count = $regs[0]['total'];
@ -206,7 +214,8 @@ function ping_init(App $a)
$cachekey = "ping_init:".local_user();
$ev = Cache::get($cachekey);
if (is_null($ev)) {
$ev = q("SELECT type, start, adjust FROM `event`
$ev = q(
"SELECT type, start, adjust FROM `event`
WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
ORDER BY `start` ASC ",
intval(local_user()),
@ -223,25 +232,25 @@ function ping_init(App $a)
if ($all_events) {
$str_now = datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d');
foreach($ev as $x) {
foreach ($ev as $x) {
$bd = false;
if ($x['type'] === 'birthday') {
$birthdays ++;
$bd = true;
}
else {
} else {
$events ++;
}
if (datetime_convert('UTC', ((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
$all_events_today ++;
if ($bd)
if ($bd) {
$birthdays_today ++;
else
} else {
$events_today ++;
}
}
}
}
}
$data['intro'] = $intro_count;
$data['mail'] = $mail_count;
@ -311,7 +320,7 @@ function ping_init(App $a)
}
// sort notifications by $[]['date']
$sort_function = function($a, $b) {
$sort_function = function ($a, $b) {
$adate = strtotime($a['date']);
$bdate = strtotime($b['date']);
@ -426,7 +435,8 @@ function ping_get_notifications($uid)
$a = get_app();
do {
$r = q("SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
$r = q(
"SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
AND NOT (`notify`.`type` IN (%d, %d))
@ -448,7 +458,7 @@ function ping_get_notifications($uid)
$offset += 50;
}
foreach ($r AS $notification) {
foreach ($r as $notification) {
if (is_null($notification["visible"])) {
$notification["visible"] = true;
}
@ -468,7 +478,8 @@ function ping_get_notifications($uid)
$notification["name"] = strip_tags(bbcode($notification["name"]));
$notification["message"] = format_notification_message($notification["name"], strip_tags(bbcode($notification["msg"])));
q("UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
q(
"UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
dbesc($notification["name"]),
dbesc($notification["message"]),
intval($notification["id"])
@ -477,8 +488,9 @@ function ping_get_notifications($uid)
$notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
if ($notification["visible"] && !$notification["spam"] &&
!$notification["deleted"] && !is_array($result[$notification["parent"]])) {
if ($notification["visible"] && !$notification["spam"]
&& !$notification["deleted"] && !is_array($result[$notification["parent"]])
) {
// Should we condense the notifications or show them all?
if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
$result[$notification["id"]] = $notification;
@ -497,7 +509,7 @@ function ping_get_notifications($uid)
* @deprecated
*
* @param array $data The initial ping data array
* @param int $sysnotify_count Number of unseen system notifications
* @param int $sysnotify Number of unseen system notifications
* @param array $notifs Complete list of notification
* @param array $sysmsgs List of system notice messages
* @param array $sysmsgs_info List of system info messages
@ -508,7 +520,7 @@ function ping_get_notifications($uid)
function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
{
$notifications = array();
foreach($notifs as $key => $notif) {
foreach ($notifs as $key => $notif) {
$notifications[$key . ':note'] = $notif['message'];
$notifications[$key . ':@attributes'] = array(
@ -524,10 +536,10 @@ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_inf
}
$sysmsg = array();
foreach ($sysmsgs as $key => $m){
foreach ($sysmsgs as $key => $m) {
$sysmsg[$key . ':notice'] = $m;
}
foreach ($sysmsgs_info as $key => $m){
foreach ($sysmsgs_info as $key => $m) {
$sysmsg[$key . ':info'] = $m;
}

1
mod/poco.php
View File

@ -4,6 +4,7 @@
// https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;

1
mod/search.php
View File

@ -1,6 +1,7 @@
<?php
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;

2
src/App.php
View File

@ -3,11 +3,11 @@
namespace Friendica;
use Friendica\Core\System;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
use Cache;
use dba;
use Detection\MobileDetect;

116
include/cache.php → src/Core/Cache.php
View File

@ -1,21 +1,25 @@
<?php
/**
* @file include/cache.php
*
* @brief Class for storing data for a short time
* @file src/Core/Cache.php
*/
namespace Friendica\Core;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
class Cache {
/**
* @brief Class for storing data for a short time
*/
class Cache
{
/**
* @brief Check for memcache and open a connection if configured
*
* @return object|boolean The memcache object - or "false" if not successful
*/
public static function memcache() {
public static function memcache()
{
if (!function_exists('memcache_connect')) {
return false;
}
@ -43,30 +47,31 @@ class Cache {
*
* @return integer The cache duration in seconds
*/
private static function duration($level) {
switch($level) {
case CACHE_MONTH;
private static function duration($level)
{
switch ($level) {
case CACHE_MONTH:
$seconds = 2592000;
break;
case CACHE_WEEK;
case CACHE_WEEK:
$seconds = 604800;
break;
case CACHE_DAY;
case CACHE_DAY:
$seconds = 86400;
break;
case CACHE_HOUR;
case CACHE_HOUR:
$seconds = 3600;
break;
case CACHE_HALF_HOUR;
case CACHE_HALF_HOUR:
$seconds = 1800;
break;
case CACHE_QUARTER_HOUR;
case CACHE_QUARTER_HOUR:
$seconds = 900;
break;
case CACHE_FIVE_MINUTES;
case CACHE_FIVE_MINUTES:
$seconds = 300;
break;
case CACHE_MINUTE;
case CACHE_MINUTE:
$seconds = 60;
break;
}
@ -80,8 +85,8 @@ class Cache {
*
* @return mixed Cached $value or "null" if not found
*/
public static function get($key) {
public static function get($key)
{
$memcache = self::memcache();
if (is_object($memcache)) {
// We fetch with the hostname as key to avoid problems with other applications
@ -101,7 +106,8 @@ class Cache {
// Frequently clear cache
self::clear($duration);
$r = q("SELECT `v` FROM `cache` WHERE `k`='%s' LIMIT 1",
$r = q(
"SELECT `v` FROM `cache` WHERE `k`='%s' LIMIT 1",
dbesc($key)
);
@ -126,11 +132,11 @@ class Cache {
* The input $value can have multiple formats.
*
* @param string $key The key to the cached data
* @param mixed $valie The value that is about to be stored
* @param mixed $value The value that is about to be stored
* @param integer $duration The cache lifespan
*/
public static function set($key, $value, $duration = CACHE_MONTH) {
public static function set($key, $value, $duration = CACHE_MONTH)
{
// Do we have an installed memcache? Use it instead.
$memcache = self::memcache();
if (is_object($memcache)) {
@ -140,70 +146,96 @@ class Cache {
}
/// @todo store the cache data in the same way like the config data
q("REPLACE INTO `cache` (`k`,`v`,`expire_mode`,`updated`) VALUES ('%s','%s',%d,'%s')",
q(
"REPLACE INTO `cache` (`k`,`v`,`expire_mode`,`updated`) VALUES ('%s','%s',%d,'%s')",
dbesc($key),
dbesc(serialize($value)),
intval($duration),
dbesc(datetime_convert()));
dbesc(datetime_convert())
);
}
/**
* @brief Remove outdated data from the cache
*
* @param integer $maxlevel The maximum cache level that is to be cleared
* @param integer $max_level The maximum cache level that is to be cleared
*/
public static function clear($max_level = CACHE_MONTH) {
public static function clear($max_level = CACHE_MONTH)
{
// Clear long lasting cache entries only once a day
if (Config::get("system", "cache_cleared_day") < time() - self::duration(CACHE_DAY)) {
if ($max_level == CACHE_MONTH) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 30 days")), intval(CACHE_MONTH));
q(
"DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC', 'UTC', "now - 30 days")),
intval(CACHE_MONTH)
);
}
if ($max_level <= CACHE_WEEK) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 7 days")), intval(CACHE_WEEK));
q(
"DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC', 'UTC', "now - 7 days")),
intval(CACHE_WEEK)
);
}
if ($max_level <= CACHE_DAY) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 1 days")), intval(CACHE_DAY));
q(
"DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC', 'UTC', "now - 1 days")),
intval(CACHE_DAY)
);
}
Config::set("system", "cache_cleared_day", time());
}
if (($max_level <= CACHE_HOUR) && (Config::get("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 1 hours")), intval(CACHE_HOUR));
q(
"DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC', 'UTC', "now - 1 hours")),
intval(CACHE_HOUR)
);
Config::set("system", "cache_cleared_hour", time());
}
if (($max_level <= CACHE_HALF_HOUR) && (Config::get("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 30 minutes")), intval(CACHE_HALF_HOUR));
q(
"DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC', 'UTC', "now - 30 minutes")),
intval(CACHE_HALF_HOUR)
);
Config::set("system", "cache_cleared_half_hour", time());
}
if (($max_level <= CACHE_QUARTER_HOUR) && (Config::get("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 15 minutes")), intval(CACHE_QUARTER_HOUR));
q(
"DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC', 'UTC', "now - 15 minutes")),
intval(CACHE_QUARTER_HOUR)
);
Config::set("system", "cache_cleared_quarter_hour", time());
}
if (($max_level <= CACHE_FIVE_MINUTES) && (Config::get("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 5 minutes")), intval(CACHE_FIVE_MINUTES));
q(
"DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC', 'UTC', "now - 5 minutes")),
intval(CACHE_FIVE_MINUTES)
);
Config::set("system", "cache_cleared_five_minute", time());
}
if (($max_level <= CACHE_MINUTE) && (Config::get("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 1 minutes")), intval(CACHE_MINUTE));
q(
"DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC', 'UTC', "now - 1 minutes")),
intval(CACHE_MINUTE)
);
Config::set("system", "cache_cleared_minute", time());
}

2
src/Network/Probe.php
View File

@ -10,11 +10,11 @@ namespace Friendica\Network;
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use dba;
use Cache;
use xml;
use DomXPath;

2
src/Protocol/Diaspora.php
View File

@ -11,13 +11,13 @@ namespace Friendica\Protocol;
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Network\Probe;
use Cache;
use dba;
use SimpleXMLElement;
use xml;

1
vendor/pear/text_languagedetect/phpcs.xml vendored
View File

@ -7,6 +7,7 @@
<exclude name="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps"/>
<exclude name="PEAR.WhiteSpace.ScopeIndent.IncorrectExact"/>
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
</rule>
<description>PSR2 with tabs instead of spaces.</description>