Better content detection for posts to Twitter

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index f02539b0053c7f49b95661488270b724fd2052b7..d87d97a31ec86600aeab135d8d5abd42c02610ac 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/items.php');
 require_once('include/auth.php');
@@ -22,7 +23,7 @@ function dfrn_poll_init(App $a) {
        if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {
                $nickname = $a->argv[1];
                header("Content-type: application/atom+xml");
-               echo ostatus::feed($a, $nickname, $last_update);
+               echo ostatus::feed($a, $nickname, $last_update, 10);
                killme();
        }
 
@@ -77,7 +78,7 @@ function dfrn_poll_init(App $a) {
                                $my_id = '0:' . $dfrn_id;
                                break;
                        default:
-                               goaway(z_root());
+                               goaway(System::baseUrl());
                                break; // NOTREACHED
                }
 
@@ -121,9 +122,9 @@ function dfrn_poll_init(App $a) {
                                }
                        }
                        $profile = $r[0]['nickname'];
-                       goaway((strlen($destination_url)) ? $destination_url : App::get_baseurl() . '/profile/' . $profile);
+                       goaway((strlen($destination_url)) ? $destination_url : System::baseUrl() . '/profile/' . $profile);
                }
-               goaway(z_root());
+               goaway(System::baseUrl());
 
        }
 
@@ -321,7 +322,7 @@ function dfrn_poll_post(App $a) {
                        $my_id = '0:' . $dfrn_id;
                        break;
                default:
-                       goaway(z_root());
+                       goaway(System::baseUrl());
                        break; // NOTREACHED
        }
 
@@ -446,7 +447,7 @@ function dfrn_poll_content(App $a) {
                                $my_id = '0:' . $dfrn_id;
                                break;
                        default:
-                               goaway(z_root());
+                               goaway(System::baseUrl());
                                break; // NOTREACHED
                }
 
@@ -510,14 +511,14 @@ function dfrn_poll_content(App $a) {
 
                        switch($destination_url) {
                                case 'profile':
-                                       $dest = App::get_baseurl() . '/profile/' . $profile . '?f=&tab=profile';
+                                       $dest = System::baseUrl() . '/profile/' . $profile . '?f=&tab=profile';
                                        break;
                                case 'photos':
-                                       $dest = App::get_baseurl() . '/photos/' . $profile;
+                                       $dest = System::baseUrl() . '/photos/' . $profile;
                                        break;
                                case 'status':
                                case '':
-                                       $dest = App::get_baseurl() . '/profile/' . $profile;
+                                       $dest = System::baseUrl() . '/profile/' . $profile;
                                        break;
                                default:
                                        $appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');