keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

And more reverts:

Browse source 
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-15 09:49:00 +01:00
parent 7849b3f8e3
commit f42935421e
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/oembed.php
View file

@ -149,8 +149,6 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
} }
function oembed_format_object($j){ function oembed_format_object($j){
$a = get_app();
require_once("mod/proxy.php"); require_once("mod/proxy.php");
$embedurl = $j->embedurl; $embedurl = $j->embedurl;
@ -167,7 +165,7 @@ function oembed_format_object($j){
$th=120; $tw = $th*$tr; $th=120; $tw = $th*$tr;
$tpl=get_markup_template('oembed_video.tpl'); $tpl=get_markup_template('oembed_video.tpl');
$ret.=replace_macros($tpl, array( $ret.=replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(), '$baseurl' => App::get_baseurl(),
'$embedurl' => $embedurl, '$embedurl' => $embedurl,
'$escapedhtml' => base64_encode($jhtml), '$escapedhtml' => base64_encode($jhtml),
'$tw' => $tw, '$tw' => $tw,

15
include/queue_fn.php
View file

@ -23,19 +23,26 @@ function remove_queue_item($id) {
* @return bool The communication with this contact has currently problems * @return bool The communication with this contact has currently problems
*/ */
function was_recently_delayed($cid) { function was_recently_delayed($cid) {
$was_delayed = false;
// Are there queue entries that were recently added?
$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
AND `last` > UTC_TIMESTAMP() - INTVAL 15 MINUTE LIMIT 1", AND `last` > UTC_TIMESTAMP() - INTVAL 15 MINUTE LIMIT 1",
intval($cid) intval($cid)
); );
if (dbm::is_result($r))
return true;
$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` != '' AND `term-date` != '0000-00-00 00:00:00' LIMIT 1", $was_delayed = dbm::is_result($r);
// We set "term-date" to a current date if the communication has problems.
// If the communication works again we reset this value.
if ($was_delayed) {
$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
intval($cid) intval($cid)
); );
$was_delayed = !dbm::is_result($r);
}
return (dbm::is_result($r)); return $was_delayed;;
} }