MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some more caching

Browse source
This commit is contained in:
Michael 2017-01-13 17:31:10 +00:00
parent 844fefc9c4
commit 3af099298c
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/identity.php
View file

@ -6,6 +6,7 @@
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');
/** /**
* *
@ -453,15 +454,21 @@ function get_birthdays() {
$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'); $bd_short = t('F d');
$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` $cachekey = "get_birthdays:".local_user();
INNER JOIN `contact` ON `contact`.`id` = `event`.`cid` $r = Cache::get($cachekey);
WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s' if (is_null($r)) {
ORDER BY `start` ASC ", $r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
intval(local_user()), INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
dbesc(datetime_convert('UTC','UTC','now + 6 days')), WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
dbesc(datetime_convert('UTC','UTC','now')) ORDER BY `start` ASC ",
); intval(local_user()),
dbesc(datetime_convert('UTC','UTC','now + 6 days')),
dbesc(datetime_convert('UTC','UTC','now'))
);
if (dbm::is_result($r)) {
Cache::set($cachekey, $r, CACHE_HOUR);
}
}
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
$total = 0; $total = 0;
$now = strtotime('now'); $now = strtotime('now');

7
mod/ping.php
View file

@ -196,7 +196,7 @@ function ping_init(App $a)
} }
} }
$cachekey = "ping:events:".local_user(); $cachekey = "ping_init:".local_user();
$ev = Cache::get($cachekey); $ev = Cache::get($cachekey);
if (is_null($ev)) { if (is_null($ev)) {
$ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event` $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event`
@ -206,11 +206,12 @@ function ping_init(App $a)
dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')), dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
dbesc(datetime_convert('UTC', 'UTC', 'now')) dbesc(datetime_convert('UTC', 'UTC', 'now'))
); );
if (dbm::is_result($ev)) {
Cache::set($cachekey, $ev, CACHE_HOUR);
}
} }
if (dbm::is_result($ev)) { if (dbm::is_result($ev)) {
Cache::set($cachekey, $ev, CACHE_HOUR);
$all_events = intval($ev[0]['total']); $all_events = intval($ev[0]['total']);
if ($all_events) { if ($all_events) {