Rewrite Proxy module

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 646047ea551d08578fbded0834ef030bc0e7c5ff..6b2016886db462274ad9da07712f11de6505c43b 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -17,8 +17,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function dfrn_poll_init(App $a)
 {
        Login::sessionAuth();
@@ -436,7 +434,7 @@ function dfrn_poll_content(App $a)
                switch ($direction) {
                        case -1:
                                if ($type === 'profile') {
-                                       $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", DBA::escape($dfrn_id), DBA::escape($dfrn_id));
+                                       $sql_extra = sprintf(" AND (`dfrn-id` = '%s' OR `issued-id` = '%s') ", DBA::escape($dfrn_id), DBA::escape($dfrn_id));
                                } else {
                                        $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
                                }
@@ -561,11 +559,7 @@ function dfrn_poll_content(App $a)
                                        break;
                                default:
                                        $appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
-                                       if (filter_var($url, FILTER_VALIDATE_URL)) {
-                                               System::externalRedirect($destination_url . $appendix);
-                                       } else {
-                                               $a->internalRedirect($destination_url . $appendix);
-                                       }
+                                       $a->redirect($destination_url . $appendix);
                                        break;
                        }
                        // NOTREACHED