And more reverts:

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

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/include/oembed.php b/include/oembed.php
index f860a545fb7b3717b8717013079401e6105724e9..a1945894fcaf3fb877ff36c7e2b5a2ec1e0b7e71 100755 (executable)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -149,8 +149,6 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 }
 
 function oembed_format_object($j){
-       $a = get_app();
-
        require_once("mod/proxy.php");
 
        $embedurl = $j->embedurl;
@@ -167,12 +165,12 @@ function oembed_format_object($j){
                                $th=120; $tw = $th*$tr;
                                $tpl=get_markup_template('oembed_video.tpl');
                                $ret.=replace_macros($tpl, array(
-                                       '$baseurl' => $a->get_baseurl(),
-                                       '$embedurl'=>$embedurl,
-                                       '$escapedhtml'=>base64_encode($jhtml),
-                                       '$tw'=>$tw,
-                                       '$th'=>$th,
-                                       '$turl'=>$j->thumbnail_url,
+                                       '$baseurl'     => App::get_baseurl(),
+                                       '$embedurl'    => $embedurl,
+                                       '$escapedhtml' => base64_encode($jhtml),
+                                       '$tw'          => $tw,
+                                       '$th'          => $th,
+                                       '$turl'        => $j->thumbnail_url,
                                ));
 
                        } else {

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 81bcf0f2b3d86ad22b8e20cacaf06cb028a91118..3b5eddf1a37ac1f9db560b3113ca3e168e0782c3 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -23,19 +23,26 @@ function remove_queue_item($id) {
  * @return bool The communication with this contact has currently problems
  */
 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
                AND `last` > UTC_TIMESTAMP() - INTVAL 15 MINUTE LIMIT 1",
                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",
-               intval($cid)
-       );
+       $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)
+               );
+               $was_delayed = !dbm::is_result($r);
+       }
 
-       return (dbm::is_result($r));
+       return $was_delayed;;
 }