Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 11:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into task/3878-move-session-to-src

Browse source
This commit is contained in:
Hypolite Petovan 2018-02-03 11:59:43 -05:00 • committed by GitHub
commit 876acd68a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
70 changed files with 1346 additions and 1091 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Core/Cache.php
View file

@ -6,7 +6,9 @@ namespace Friendica\Core;
use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Util\DateTimeFormat;
use dba;
use Memcache;
require_once 'include/dba.php';
@ -22,7 +24,7 @@ class Cache
*/
public static function memcache()
{
if (!class_exists('\Memcache', false)) {
if (!class_exists('Memcache', false)) {
return false;
}
@ -33,7 +35,7 @@ class Cache
$memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
$memcache_port = Config::get('system', 'memcache_port', 11211);
$memcache = new \Memcache();
$memcache = new Memcache();
if (!$memcache->connect($memcache_host, $memcache_port)) {
return false;
@ -145,7 +147,7 @@ class Cache
$memcache->set(get_app()->get_hostname().":".$key, serialize($value), MEMCACHE_COMPRESSED, self::duration($duration));
return;
}
$fields = ['v' => serialize($value), 'expire_mode' => $duration, 'updated' => datetime_convert()];
$fields = ['v' => serialize($value), 'expire_mode' => $duration, 'updated' => DateTimeFormat::utcNow()];
$condition = ['k' => $key];
dba::update('cache', $fields, $condition, true);
}
@ -163,21 +165,21 @@ class Cache
if (Config::get("system", "cache_cleared_day") < time() - self::duration(CACHE_DAY)) {
if ($max_level == CACHE_MONTH) {
$condition = ["`updated` < ? AND `expire_mode` = ?",
datetime_convert('UTC', 'UTC', "now - 30 days"),
DateTimeFormat::utc("now - 30 days"),
CACHE_MONTH];
dba::delete('cache', $condition);
}
if ($max_level <= CACHE_WEEK) {
$condition = ["`updated` < ? AND `expire_mode` = ?",
datetime_convert('UTC', 'UTC', "now - 7 days"),
DateTimeFormat::utc("now - 7 days"),
CACHE_WEEK];
dba::delete('cache', $condition);
}
if ($max_level <= CACHE_DAY) {
$condition = ["`updated` < ? AND `expire_mode` = ?",
datetime_convert('UTC', 'UTC', "now - 1 days"),
DateTimeFormat::utc("now - 1 days"),
CACHE_DAY];
dba::delete('cache', $condition);
}
@ -186,7 +188,7 @@ class Cache
if (($max_level <= CACHE_HOUR) && (Config::get("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) {
$condition = ["`updated` < ? AND `expire_mode` = ?",
datetime_convert('UTC', 'UTC', "now - 1 hours"),
DateTimeFormat::utc("now - 1 hours"),
CACHE_HOUR];
dba::delete('cache', $condition);
@ -195,7 +197,7 @@ class Cache
if (($max_level <= CACHE_HALF_HOUR) && (Config::get("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) {
$condition = ["`updated` < ? AND `expire_mode` = ?",
datetime_convert('UTC', 'UTC', "now - 30 minutes"),
DateTimeFormat::utc("now - 30 minutes"),
CACHE_HALF_HOUR];
dba::delete('cache', $condition);
@ -204,7 +206,7 @@ class Cache
if (($max_level <= CACHE_QUARTER_HOUR) && (Config::get("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
$condition = ["`updated` < ? AND `expire_mode` = ?",
datetime_convert('UTC', 'UTC', "now - 15 minutes"),
DateTimeFormat::utc("now - 15 minutes"),
CACHE_QUARTER_HOUR];
dba::delete('cache', $condition);
@ -213,7 +215,7 @@ class Cache
if (($max_level <= CACHE_FIVE_MINUTES) && (Config::get("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) {
$condition = ["`updated` < ? AND `expire_mode` = ?",
datetime_convert('UTC', 'UTC', "now - 5 minutes"),
DateTimeFormat::utc("now - 5 minutes"),
CACHE_FIVE_MINUTES];
dba::delete('cache', $condition);
@ -222,7 +224,7 @@ class Cache
if (($max_level <= CACHE_MINUTE) && (Config::get("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) {
$condition = ["`updated` < ? AND `expire_mode` = ?",
datetime_convert('UTC', 'UTC', "now - 1 minutes"),
DateTimeFormat::utc("now - 1 minutes"),
CACHE_MINUTE];
dba::delete('cache', $condition);

9
src/Core/NotificationsManager.php
View file

@ -13,6 +13,7 @@ use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\XML;
require_once 'include/dba.php';
@ -42,7 +43,7 @@ class NotificationsManager extends BaseObject
{
$rets = [];
foreach ($notes as $n) {
$local_time = datetime_convert('UTC', date_default_timezone_get(), $n['date']);
$local_time = DateTimeFormat::local($n['date']);
$n['timestamp'] = strtotime($local_time);
$n['date_rel'] = relative_date($n['date']);
$n['msg_html'] = bbcode($n['msg'], false, false, false, false);
@ -243,7 +244,7 @@ class NotificationsManager extends BaseObject
$default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
$default_item_url = $it['url'];
$default_item_text = strip_tags(bbcode($it['msg']));
$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['date'], 'r');
$default_item_when = DateTimeFormat::local($it['date'], 'r');
$default_item_ago = relative_date($it['date']);
break;
@ -253,7 +254,7 @@ class NotificationsManager extends BaseObject
$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
$default_item_url = $it['author-link'];
$default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']);
$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
$default_item_when = DateTimeFormat::local($it['created'], 'r');
$default_item_ago = relative_date($it['created']);
break;
@ -265,7 +266,7 @@ class NotificationsManager extends BaseObject
$default_item_text = (($it['id'] == $it['parent'])
? L10n::t("%s created a new post", $it['author-name'])
: L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']));
$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
$default_item_when = DateTimeFormat::local($it['created'], 'r');
$default_item_ago = relative_date($it['created']);
}

17
src/Core/Worker.php
View file

@ -9,6 +9,7 @@ use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Lock;
use Friendica\Util\Network;
use dba;
@ -233,7 +234,7 @@ class Worker
if ($age > 1) {
$stamp = (float)microtime(true);
dba::update('workerqueue', ['executed' => datetime_convert()], ['pid' => $mypid, 'done' => false]);
dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
self::$db_duration += (microtime(true) - $stamp);
}
@ -243,7 +244,7 @@ class Worker
$stamp = (float)microtime(true);
if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
Config::set('system', 'last_poller_execution', datetime_convert());
Config::set('system', 'last_poller_execution', DateTimeFormat::utcNow());
}
self::$db_duration = (microtime(true) - $stamp);
@ -276,7 +277,7 @@ class Worker
if ($age > 1) {
$stamp = (float)microtime(true);
dba::update('workerqueue', ['executed' => datetime_convert()], ['pid' => $mypid, 'done' => false]);
dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
self::$db_duration += (microtime(true) - $stamp);
}
@ -284,7 +285,7 @@ class Worker
$stamp = (float)microtime(true);
if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
Config::set('system', 'last_poller_execution', datetime_convert());
Config::set('system', 'last_poller_execution', DateTimeFormat::utcNow());
}
self::$db_duration = (microtime(true) - $stamp);
} else {
@ -572,7 +573,7 @@ class Worker
}
dba::update(
'workerqueue',
['executed' => NULL_DATE, 'created' => datetime_convert(), 'priority' => $new_priority, 'pid' => 0],
['executed' => NULL_DATE, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
['id' => $entry["id"]]
);
} else {
@ -823,7 +824,7 @@ class Worker
if ($found) {
$condition = "`id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`";
array_unshift($ids, $condition);
dba::update('workerqueue', ['executed' => datetime_convert(), 'pid' => $mypid], $ids);
dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow(), 'pid' => $mypid], $ids);
}
return $found;
@ -951,7 +952,7 @@ class Worker
/// @todo We should clean up the corresponding workerqueue entries as well
$condition = ["`created` < ? AND `command` = 'worker.php'",
datetime_convert('UTC', 'UTC', "now - ".$timeout." minutes")];
DateTimeFormat::utc("now - ".$timeout." minutes")];
dba::delete('process', $condition);
}
@ -1038,7 +1039,7 @@ class Worker
$priority = PRIORITY_MEDIUM;
$dont_fork = Config::get("system", "worker_dont_fork");
$created = datetime_convert();
$created = DateTimeFormat::utcNow();
if (is_int($run_parameter)) {
$priority = $run_parameter;