bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Move Cache to src

Browse source 
relocate the cache class to Friendica\Core namespace
This commit is contained in:
Adam Magness 2017-11-09 11:05:18 -05:00
parent 8b673bf78d
commit 06c3af9b60
21 changed files with 1177 additions and 728 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

570
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\App;
use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;

1
include/bbcode.php
View file

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

1
include/cronjobs.php
View file

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

2
include/discover_poco.php
View file

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

2
include/gprobe.php
View file

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

363
include/identity.php
View file

@ -4,6 +4,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
@ -13,7 +14,6 @@ use Friendica\Database\DBM;
require_once 'include/ForumManager.php'; require_once 'include/ForumManager.php';
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
require_once 'mod/proxy.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 * the theme is chosen before the _init() function of a theme is run, which will usually
* load a lot of theme-specific content * load a lot of theme-specific content
* *
* @param App $a * @param object $a App
* @param string $nickname * @param string $nickname string
* @param int $profile * @param int $profile int
* @param array $profiledata * @param array $profiledata array
*/ */
function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) { function profile_load(App $a, $nickname, $profile = 0, $profiledata = array())
{
$user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1", $user = q(
"SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
dbesc($nickname) dbesc($nickname)
); );
if (!$user && count($user) && !count($profiledata)) { if (!$user && count($user) && !count($profiledata)) {
logger('profile error: ' . $a->query_string, LOGGER_DEBUG); 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; $a->error = 404;
return; return;
} }
@ -56,7 +57,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
if (empty($pdata) && empty($profiledata)) { if (empty($pdata) && empty($profiledata)) {
logger('profile error: ' . $a->query_string, LOGGER_DEBUG); 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; $a->error = 404;
return; return;
} }
@ -64,8 +65,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
// fetch user tags if this isn't the default profile // fetch user tags if this isn't the default profile
if (!$pdata['is-default']) { if (!$pdata['is-default']) {
$x = q("SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", $x = q(
intval($pdata['profile_uid']) "SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval($pdata['profile_uid'])
); );
if ($x && count($x)) if ($x && count($x))
$pdata['pub_keywords'] = $x[0]['pub_keywords']; $pdata['pub_keywords'] = $x[0]['pub_keywords'];
@ -79,8 +81,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename']; $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['theme'] = $a->profile['theme'];
}
$_SESSION['mobile-theme'] = $a->profile['mobile-theme']; $_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
@ -92,30 +95,35 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
$theme_info_file = "view/theme/" . current_theme() . "/theme.php"; $theme_info_file = "view/theme/" . current_theme() . "/theme.php";
if (file_exists($theme_info_file)) { if (file_exists($theme_info_file)) {
require_once $theme_info_file; include_once $theme_info_file;
} }
if (! (x($a->page,'aside'))) if (! (x($a->page, 'aside'))) {
$a->page['aside'] = ''; $a->page['aside'] = '';
}
if (local_user() && local_user() == $a->profile['uid'] && $profiledata) { if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array( $a->page['aside'] .= replace_macros(
'$editprofile' => t('Edit profile'), get_markup_template('profile_edlink.tpl'),
'$profid' => $a->profile['id'] array(
)); '$editprofile' => t('Edit profile'),
'$profid' => $a->profile['id']
)
);
} }
$block = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); $block = (((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) ? true : false);
/** /**
* @todo * @todo
* By now, the contact block isn't shown, when a different profile is given * 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 * 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); $a->page['aside'] .= profile_sidebar($profiledata, true);
else } else {
$a->page['aside'] .= profile_sidebar($a->profile, $block); $a->page['aside'] .= profile_sidebar($a->profile, $block);
}
/*if (! $block) /*if (! $block)
$a->page['aside'] .= contact_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 * Passing a non-zero profile ID can also allow a preview of a selected profile
* by the owner * by the owner
* *
* @param string $nickname * @param string $nickname nick
* @param int $uid * @param int $uid uid
* @param int $profile * @param int $profile ID of the profile
* ID of the profile
* @returns array * @returns array
* Includes all available profile data * 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'])) { if (remote_user() && count($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $visitor) { foreach ($_SESSION['remote'] as $visitor) {
if ($visitor['uid'] == $uid) { if ($visitor['uid'] == $uid) {
@ -156,7 +164,8 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
if ($profile) { if ($profile) {
$profile_int = intval($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`, `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
`profile`.`uid` AS `profile_uid`, `profile`.*, `profile`.`uid` AS `profile_uid`, `profile`.*,
`contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
@ -164,12 +173,13 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self` INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = ? AND `profile`.`id` = ? LIMIT 1", WHERE `user`.`nickname` = ? AND `profile`.`id` = ? LIMIT 1",
$nickname, $nickname,
$profile_int $profile_int
); );
} }
if (!DBM::is_result($r)) { 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`, `contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
`profile`.`uid` AS `profile_uid`, `profile`.*, `profile`.`uid` AS `profile_uid`, `profile`.*,
`contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
@ -177,7 +187,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` AND `contact`.`self` INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`nickname` = ? AND `profile`.`is-default` LIMIT 1", WHERE `user`.`nickname` = ? AND `profile`.`is-default` LIMIT 1",
$nickname $nickname
); );
} }
@ -203,7 +213,8 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
* @hooks 'profile_sidebar' * @hooks 'profile_sidebar'
* array $arr * array $arr
*/ */
function profile_sidebar($profile, $block = 0) { function profile_sidebar($profile, $block = 0)
{
$a = get_app(); $a = get_app();
$o = ''; $o = '';
@ -230,7 +241,7 @@ function profile_sidebar($profile, $block = 0) {
// don't show connect link to yourself // 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 // don't show connect link to authenticated visitors either
if (remote_user() && count($_SESSION['remote'])) { 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'])) if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect']))
$connect = false; $connect = false;
$remoteconnect = NULL; $remoteconnect = null;
if (isset($profile['remoteconnect'])) if (isset($profile['remoteconnect']))
$remoteconnect = $profile['remoteconnect']; $remoteconnect = $profile['remoteconnect'];
@ -272,15 +283,19 @@ function profile_sidebar($profile, $block = 0) {
$wallmessage_link = "wallmessage/".$profile["nickname"]; $wallmessage_link = "wallmessage/".$profile["nickname"];
if (remote_user()) { 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($profile['uid']),
intval(remote_user()), intval(remote_user()),
intval(CONTACT_IS_FRIEND)); intval(CONTACT_IS_FRIEND)
);
} else { } 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']), intval($profile['uid']),
dbesc(normalise_link(get_my_url())), dbesc(normalise_link(get_my_url())),
intval(CONTACT_IS_FRIEND)); intval(CONTACT_IS_FRIEND)
);
} }
if ($r) { if ($r) {
$remote_url = $r[0]["url"]; $remote_url = $r[0]["url"];
@ -293,10 +308,12 @@ function profile_sidebar($profile, $block = 0) {
} }
// show edit profile to yourself // 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')); $profile['edit'] = array(System::baseUrl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
$r = q("SELECT * FROM `profile` WHERE `uid` = %d", $r = q(
local_user()); "SELECT * FROM `profile` WHERE `uid` = %d",
local_user()
);
$profile['menu'] = array( $profile['menu'] = array(
'chg_photo' => t('Change profile photo'), 'chg_photo' => t('Change profile photo'),
@ -305,7 +322,6 @@ function profile_sidebar($profile, $block = 0) {
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$profile['menu']['entries'][] = array( $profile['menu']['entries'][] = array(
'photo' => $rr['thumb'], 'photo' => $rr['thumb'],
@ -315,14 +331,11 @@ function profile_sidebar($profile, $block = 0) {
'isdefault' => $rr['is-default'], 'isdefault' => $rr['is-default'],
'visibile_to_everybody' => t('visible to everybody'), 'visibile_to_everybody' => t('visible to everybody'),
'edit_visibility' => t('Edit visibility'), '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['edit'] = array(System::baseUrl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
$profile['menu'] = array( $profile['menu'] = array(
'chg_photo' => t('Change profile photo'), 'chg_photo' => t('Change profile photo'),
@ -334,34 +347,36 @@ function profile_sidebar($profile, $block = 0) {
// Fetch the account type // Fetch the account type
$account_type = account_type($profile); $account_type = account_type($profile);
if ((x($profile,'address') == 1) if ((x($profile, 'address') == 1)
|| (x($profile,'location') == 1) || (x($profile, 'location') == 1)
|| (x($profile,'locality') == 1) || (x($profile, 'locality') == 1)
|| (x($profile,'region') == 1) || (x($profile, 'region') == 1)
|| (x($profile,'postal-code') == 1) || (x($profile, 'postal-code') == 1)
|| (x($profile,'country-name') == 1)) || (x($profile, 'country-name') == 1)
) {
$location = t('Location:'); $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'],' ')) $gender = ((x($profile, 'gender') == 1) ? t('Gender:') : false);
? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
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( $diaspora = array(
'guid' => $profile['guid'], 'guid' => $profile['guid'],
'podloc' => System::baseUrl(), 'podloc' => System::baseUrl(),
@ -374,19 +389,24 @@ function profile_sidebar($profile, $block = 0) {
'photo100' => $profile['contact_thumb'], 'photo100' => $profile['contact_thumb'],
'photo50' => $profile['contact_micro'], 'photo50' => $profile['contact_micro'],
); );
else } else {
$diaspora = false; $diaspora = false;
}
if (!$block) { if (!$block) {
$contact_block = contact_block(); $contact_block = contact_block();
if (is_array($a->profile) && !$a->profile['hide-friends']) { 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", $r = q(
intval($a->profile['uid'])); "SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
if (DBM::is_result($r)) intval($a->profile['uid'])
);
if (DBM::is_result($r)) {
$updated = date("c", strtotime($r[0]['updated'])); $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 WHERE `uid` = %d
AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `self` AND NOT `blocked` AND NOT `pending`
AND NOT `hidden` AND NOT `archive` AND NOT `hidden` AND NOT `archive`
@ -396,33 +416,40 @@ function profile_sidebar($profile, $block = 0) {
dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_OSTATUS) dbesc(NETWORK_OSTATUS)
); );
if (DBM::is_result($r)) if (DBM::is_result($r)) {
$contacts = intval($r[0]['total']); $contacts = intval($r[0]['total']);
}
} }
} }
$p = array(); $p = array();
foreach ($profile as $k => $v) { foreach ($profile as $k => $v) {
$k = str_replace('-','_',$k); $k = str_replace('-', '_', $k);
$p[$k] = $v; $p[$k] = $v;
} }
if (isset($p["about"])) if (isset($p["about"])) {
$p["about"] = bbcode($p["about"]); $p["about"] = bbcode($p["about"]);
}
if (isset($p["address"])) if (isset($p["address"])) {
$p["address"] = bbcode($p["address"]); $p["address"] = bbcode($p["address"]);
else } else {
$p["address"] = bbcode($p["location"]); $p["address"] = bbcode($p["location"]);
}
if (isset($p["photo"])) { if (isset($p["photo"])) {
$p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL); $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); $location = template_escape($location);
}
$tpl = get_markup_template('profile_vcard.tpl'); $tpl = get_markup_template('profile_vcard.tpl');
$o .= replace_macros($tpl, array( $o .= replace_macros(
$tpl,
array(
'$profile' => $p, '$profile' => $p,
'$xmpp' => $xmpp, '$xmpp' => $xmpp,
'$connect' => $connect, '$connect' => $connect,
@ -433,7 +460,7 @@ function profile_sidebar($profile, $block = 0) {
'$account_type' => $account_type, '$account_type' => $account_type,
'$location' => $location, '$location' => $location,
'$gender' => $gender, '$gender' => $gender,
// '$pdesc' => $pdesc, // '$pdesc' => $pdesc,
'$marital' => $marital, '$marital' => $marital,
'$homepage' => $homepage, '$homepage' => $homepage,
'$about' => $about, '$about' => $about,
@ -442,7 +469,8 @@ function profile_sidebar($profile, $block = 0) {
'$updated' => $updated, '$updated' => $updated,
'$diaspora' => $diaspora, '$diaspora' => $diaspora,
'$contact_block' => $contact_block, '$contact_block' => $contact_block,
)); )
);
$arr = array('profile' => &$profile, 'entry' => &$o); $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(); $a = get_app();
$o = ''; $o = '';
if (! local_user() || $a->is_mobile || $a->is_tablet) if (! local_user() || $a->is_mobile || $a->is_tablet) {
return $o; 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) $bd_format = t('g A l F d'); // 8 AM Friday January 18
// return $o;
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
$bd_short = t('F d'); $bd_short = t('F d');
$cachekey = "get_birthdays:".local_user(); $cachekey = "get_birthdays:".local_user();
$r = Cache::get($cachekey); $r = Cache::get($cachekey);
if (is_null($r)) { if (is_null($r)) {
$s = dba::p("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` $s = dba::p(
INNER JOIN `contact` ON `contact`.`id` = `event`.`cid` "SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ? INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
ORDER BY `start` ASC ", WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
local_user(), ORDER BY `start` ASC ",
datetime_convert('UTC','UTC','now + 6 days'), local_user(),
datetime_convert('UTC','UTC','now') 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); $r = dba::inArray($s);
@ -492,21 +523,25 @@ function get_birthdays() {
$istoday = false; $istoday = false;
foreach ($r as $rr) { foreach ($r as $rr) {
if (strlen($rr['name'])) if (strlen($rr['name'])) {
$total ++; $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; $istoday = true;
}
} }
$classtoday = $istoday ? ' birthday-today ' : ''; $classtoday = $istoday ? ' birthday-today ' : '';
if ($total) { if ($total) {
foreach ($r as &$rr) { foreach ($r as &$rr) {
if (! strlen($rr['name'])) if (! strlen($rr['name'])) {
continue; continue;
}
// avoid duplicates // avoid duplicates
if (in_array($rr['cid'],$cids)) if (in_array($rr['cid'], $cids)) {
continue; continue;
}
$cids[] = $rr['cid']; $cids[] = $rr['cid'];
$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); $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['link'] = $url;
$rr['title'] = $rr['name']; $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['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; $rr['today'] = $today;
} }
} }
} }
$tpl = get_markup_template("birthdays_reminder.tpl"); $tpl = get_markup_template("birthdays_reminder.tpl");
return replace_macros($tpl, array( return replace_macros(
$tpl,
array(
'$baseurl' => System::baseUrl(), '$baseurl' => System::baseUrl(),
'$classtoday' => $classtoday, '$classtoday' => $classtoday,
'$count' => $total, '$count' => $total,
@ -536,14 +572,14 @@ function get_birthdays() {
'$events' => $r, '$events' => $r,
'$lbr' => '{', // raw brackets mess up if/endif macro processing '$lbr' => '{', // raw brackets mess up if/endif macro processing
'$rbr' => '}' '$rbr' => '}'
)
)); );
} }
function get_events() { function get_events()
{
require_once 'include/bbcode.php'; include_once 'include/bbcode.php';
$a = get_app(); $a = get_app();
@ -551,21 +587,23 @@ function get_events() {
return $o; 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) $bd_format = t('g A l F d'); // 8 AM Friday January 18
// return $o;
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
$bd_short = t('F d'); $bd_short = t('F d');
$s = dba::p("SELECT `event`.* FROM `event` $s = dba::p(
WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ? "SELECT `event`.* FROM `event`
ORDER BY `start` ASC ", WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
local_user(), ORDER BY `start` ASC ",
datetime_convert('UTC','UTC','now + 7 days'), local_user(),
datetime_convert('UTC','UTC','now - 1 days') datetime_convert('UTC', 'UTC', 'now + 7 days'),
datetime_convert('UTC', 'UTC', 'now - 1 days')
); );
$r = array(); $r = array();
@ -579,29 +617,29 @@ function get_events() {
$total ++; $total ++;
} }
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'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')) { if ($strt === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) {
$istoday = true; $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) { 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) { if (! $description) {
$description = t('[No 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; 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['title'] = $title;
$rr['description'] = $desciption; $rr['description'] = $desciption;
@ -615,27 +653,32 @@ function get_events() {
$classtoday = (($istoday) ? 'event-today' : ''); $classtoday = (($istoday) ? 'event-today' : '');
} }
$tpl = get_markup_template("events_reminder.tpl"); $tpl = get_markup_template("events_reminder.tpl");
return replace_macros($tpl, array( return replace_macros(
$tpl,
array(
'$baseurl' => System::baseUrl(), '$baseurl' => System::baseUrl(),
'$classtoday' => $classtoday, '$classtoday' => $classtoday,
'$count' => count($r), '$count' => count($r),
'$event_reminders' => t('Event Reminders'), '$event_reminders' => t('Event Reminders'),
'$event_title' => t('Events this week:'), '$event_title' => t('Events this week:'),
'$events' => $r, '$events' => $r,
)); )
);
} }
function advanced_profile(App $a) { function advanced_profile(App $a)
{
$o = ''; $o = '';
$uid = $a->profile['uid']; $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') '$title' => t('Profile')
)); )
);
if ($a->profile['name']) { if ($a->profile['name']) {
$tpl = get_markup_template('profile_advanced.tpl'); $tpl = get_markup_template('profile_advanced.tpl');
$profile = array(); $profile = array();
@ -652,11 +695,10 @@ function advanced_profile(App $a) {
$val = ((intval($a->profile['dob'])) $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', $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', '2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)));
$profile['birthday'] = array( t('Birthday:'), $val); $profile['birthday'] = array( t('Birthday:'), $val);
} }
if (!empty($a->profile['dob']) if (!empty($a->profile['dob'])
&& $a->profile['dob'] > '0001-01-01' && $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 //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)); $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')); $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'), '$title' => t('Profile'),
'$basic' => t('Basic'), '$basic' => t('Basic'),
'$advanced' => t('Advanced'), '$advanced' => t('Advanced'),
'$profile' => $profile '$profile' => $profile
)); )
);
} }
return ''; 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(); //echo "<pre>"; var_dump($a->user); killme();
if (is_null($nickname)) { if (is_null($nickname)) {
$nickname = $a->user['nickname']; $nickname = $a->user['nickname'];
} }
if (x($_GET,'tab')) { if (x($_GET, 'tab')) {
$tab = notags(trim($_GET['tab'])); $tab = notags(trim($_GET['tab']));
} }
@ -828,8 +874,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
'id' => 'events-tab', 'id' => 'events-tab',
'accesskey' => 'e', 'accesskey' => 'e',
); );
// if the user is not the owner of the calendar we only show a calendar // if the user is not the owner of the calendar we only show a calendar
// with the public events of the calendar owner // with the public events of the calendar owner
} elseif (! $is_owner) { } elseif (! $is_owner) {
$tabs[] = array( $tabs[] = array(
'label' => t('Events'), 'label' => t('Events'),
@ -868,20 +914,21 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
$tpl = get_markup_template('common_tabs.tpl'); $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')) { if (x($_SESSION, 'my_url')) {
return $_SESSION['my_url']; return $_SESSION['my_url'];
} }
return false; return false;
} }
function zrl_init(App $a) { function zrl_init(App $a)
{
$tmp_str = get_my_url(); $tmp_str = get_my_url();
if (validate_url($tmp_str)) { if (validate_url($tmp_str)) {
// Is it a DDoS attempt? // Is it a DDoS attempt?
// The check fetches the cached value from gprobe to reduce the load for this system // The check fetches the cached value from gprobe to reduce the load for this system
$urlparts = parse_url($tmp_str); $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)) { if (! strlen($s)) {
return $s; return $s;
} }
@ -930,7 +978,8 @@ function zrl($s, $force = false) {
* @note Returns local_user instead of user ID if "always_my_theme" * @note Returns local_user instead of user ID if "always_my_theme"
* is set to true * is set to true
*/ */
function get_theme_uid() { function get_theme_uid()
{
$uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0); $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (! $uid))) { if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
return local_user(); return local_user();

1
include/oembed.php
View file

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

535
include/ostatus.php
View file

File diff suppressed because it is too large Load diff

2
include/photos.php
View file

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

31
include/queue.php
View file

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

49
include/session.php
View file

@ -1,27 +1,28 @@
<?php <?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\Core\Config;
use Friendica\Database\DBM; use Friendica\Database\DBM;
require_once('include/cache.php');
$session_exists = 0; $session_exists = 0;
$session_expire = 180000; $session_expire = 180000;
function ref_session_open($s, $n) { function ref_session_open($s, $n)
{
return true; return true;
} }
function ref_session_read($id) { function ref_session_read($id)
{
global $session_exists; global $session_exists;
if (!x($id)) { if (!x($id)) {
return ''; return '';
} }
$memcache = cache::memcache(); $memcache = Cache::memcache();
if (is_object($memcache)) { if (is_object($memcache)) {
$data = $memcache->get(get_app()->get_hostname().":session:".$id); $data = $memcache->get(get_app()->get_hostname().":session:".$id);
if (!is_bool($data)) { if (!is_bool($data)) {
@ -50,13 +51,14 @@ function ref_session_read($id) {
* on the case. Uses the $session_expire global for existing session, 5 minutes * on the case. Uses the $session_expire global for existing session, 5 minutes
* for newly created session. * for newly created session.
* *
* @global bool $session_exists Whether a session with the given id already exists * @global bool $session_exists Whether a session with the given id already exists
* @global int $session_expire Session expiration delay in seconds * @global int $session_expire Session expiration delay in seconds
* @param string $id Session ID with format: [a-z0-9]{26} * @param string $id Session ID with format: [a-z0-9]{26}
* @param string $data Serialized session data * @param string $data Serialized session data
* @return boolean Returns false if parameters are missing, true otherwise * @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; global $session_exists, $session_expire;
if (!$id || !$data) { if (!$id || !$data) {
@ -66,7 +68,7 @@ function ref_session_write($id, $data) {
$expire = time() + $session_expire; $expire = time() + $session_expire;
$default_expire = time() + 300; $default_expire = time() + 300;
$memcache = cache::memcache(); $memcache = Cache::memcache();
$a = get_app(); $a = get_app();
if (is_object($memcache) && is_object($a)) { if (is_object($memcache) && is_object($a)) {
$memcache->set($a->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire); $memcache->set($a->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire);
@ -85,12 +87,14 @@ function ref_session_write($id, $data) {
return true; return true;
} }
function ref_session_close() { function ref_session_close()
{
return true; return true;
} }
function ref_session_destroy($id) { function ref_session_destroy($id)
$memcache = cache::memcache(); {
$memcache = Cache::memcache();
if (is_object($memcache)) { if (is_object($memcache)) {
$memcache->delete(get_app()->get_hostname().":session:".$id); $memcache->delete(get_app()->get_hostname().":session:".$id);
@ -101,7 +105,8 @@ function ref_session_destroy($id) {
return true; return true;
} }
function ref_session_gc($expire) { function ref_session_gc($expire)
{
dba::delete('session', array("`expire` < ?", time())); dba::delete('session', array("`expire` < ?", time()));
return true; return true;
} }
@ -117,7 +122,9 @@ if (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
} }
if (!Config::get('system', 'disable_database_session')) { if (!Config::get('system', 'disable_database_session')) {
session_set_save_handler('ref_session_open', 'ref_session_close', session_set_save_handler(
'ref_session_read', 'ref_session_write', 'ref_session_open', 'ref_session_close',
'ref_session_destroy', 'ref_session_gc'); 'ref_session_read', 'ref_session_write',
'ref_session_destroy', 'ref_session_gc'
);
} }

1
include/socgraph.php
View file

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

94
mod/ping.php
View file

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

1
mod/search.php
View file

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

2
src/App.php
View file

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

243
src/Core/Cache.php Normal file
View file

@ -0,0 +1,243 @@
<?php
/**
* @file src/Core/Cache.php
*/
namespace Friendica\Core;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
/**
* @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()
{
if (!function_exists('memcache_connect')) {
return false;
}
if (!Config::get('system', 'memcache')) {
return false;
}
$memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
$memcache_port = Config::get('system', 'memcache_port', 11211);
$memcache = new Memcache;
if (!$memcache->connect($memcache_host, $memcache_port)) {
return false;
}
return $memcache;
}
/**
* @brief Return the duration for a given cache level
*
* @param integer $level Cache level
*
* @return integer The cache duration in seconds
*/
private static function duration($level)
{
switch ($level) {
case CACHE_MONTH:
$seconds = 2592000;
break;
case CACHE_WEEK:
$seconds = 604800;
break;
case CACHE_DAY:
$seconds = 86400;
break;
case CACHE_HOUR:
$seconds = 3600;
break;
case CACHE_HALF_HOUR:
$seconds = 1800;
break;
case CACHE_QUARTER_HOUR:
$seconds = 900;
break;
case CACHE_FIVE_MINUTES:
$seconds = 300;
break;
case CACHE_MINUTE:
$seconds = 60;
break;
}
return $seconds;
}
/**
* @brief Fetch cached data according to the key
*
* @param string $key The key to the cached data
*
* @return mixed Cached $value or "null" if not found
*/
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
$cached = $memcache->get(get_app()->get_hostname().":".$key);
$value = @unserialize($cached);
// Only return a value if the serialized value is valid.
// We also check if the db entry is a serialized
// boolean 'false' value (which we want to return).
if ($cached === serialize(false) || $value !== false) {
return $value;
}
return null;
}
// Frequently clear cache
self::clear($duration);
$r = q(
"SELECT `v` FROM `cache` WHERE `k`='%s' LIMIT 1",
dbesc($key)
);
if (DBM::is_result($r)) {
$cached = $r[0]['v'];
$value = @unserialize($cached);
// Only return a value if the serialized value is valid.
// We also check if the db entry is a serialized
// boolean 'false' value (which we want to return).
if ($cached === serialize(false) || $value !== false) {
return $value;
}
}
return null;
}
/**
* @brief Put data in the cache according to the key
*
* The input $value can have multiple formats.
*
* @param string $key The key to the cached data
* @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)
{
// Do we have an installed memcache? Use it instead.
$memcache = self::memcache();
if (is_object($memcache)) {
// We store with the hostname as key to avoid problems with other applications
$memcache->set(get_app()->get_hostname().":".$key, serialize($value), MEMCACHE_COMPRESSED, self::duration($duration));
return;
}
/// @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')",
dbesc($key),
dbesc(serialize($value)),
intval($duration),
dbesc(datetime_convert())
);
}
/**
* @brief Remove outdated data from the cache
*
* @param integer $max_level The maximum cache level that is to be cleared
*/
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)
);
}
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)
);
}
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)
);
}
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)
);
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)
);
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)
);
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)
);
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)
);
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\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use dba; use dba;
use Cache;
use xml; use xml;
use DomXPath; use DomXPath;

2
src/Protocol/Diaspora.php
View file

@ -11,13 +11,13 @@ namespace Friendica\Protocol;
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Cache;
use dba; use dba;
use SimpleXMLElement; use SimpleXMLElement;
use xml; 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.ValidVariableName.PrivateNoUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore"/> <exclude name="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore"/>
<exclude name="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps"/> <exclude name="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps"/>
<exclude name="PEAR.WhiteSpace.ScopeIndent.IncorrectExact"/>
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/> <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
</rule> </rule>
<description>PSR2 with tabs instead of spaces.</description> <description>PSR2 with tabs instead of spaces.</description>