Fix SQL error for missing AND operator

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 0d703dfb3122523a2b3484665e91ead80cef7e2d..bcb3fb3d7c832e0f33104e44b420e42146f014a3 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -17,6 +17,7 @@ function dfrn_poll_init(&$a) {
        $sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
        $dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
        $perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
+       $quiet                   = ((x($_GET,'quiet'))                   ? true                                                  : false);
 
        $direction = (-1);
 
@@ -96,7 +97,8 @@ function dfrn_poll_init(&$a) {
                                        $_SESSION['visitor_home'] = $r[0]['url'];
                                        $_SESSION['visitor_handle'] = $r[0]['addr'];
                                        $_SESSION['visitor_visiting'] = $r[0]['uid'];
-                                       info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
+                                       if(!$quiet)
+                                               info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL);
                                        // Visitors get 1 day session.
                                        $session_id = session_id();
                                        $expire = time() + 86400;
@@ -385,6 +387,7 @@ function dfrn_poll_content(&$a) {
        $sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
        $dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
        $perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
+       $quiet                   = ((x($_GET,'quiet'))                   ? true                                                  : false);
 
        $direction = (-1);
        if(strpos($dfrn_id,':') == 1) {
@@ -493,7 +496,7 @@ function dfrn_poll_content(&$a) {
 
                        switch($destination_url) {
                                case 'profile':
-                                       $dest = $a->get_baseurl() . '/profile/' . $profile . '?tab=profile';
+                                       $dest = $a->get_baseurl() . '/profile/' . $profile . '?f=&tab=profile';
                                        break;
                                case 'photos':
                                        $dest = $a->get_baseurl() . '/photos/' . $profile;
@@ -503,7 +506,7 @@ function dfrn_poll_content(&$a) {
                                        $dest = $a->get_baseurl() . '/profile/' . $profile;
                                        break;          
                                default:
-                                       $dest = $destination_url;
+                                       $dest = $destination_url . '?f=&redir=1';
                                        break;
                        }
 
@@ -527,7 +530,8 @@ function dfrn_poll_content(&$a) {
                                        $_SESSION['visitor_id'] = $r[0]['id'];
                                        $_SESSION['visitor_home'] = $r[0]['url'];
                                        $_SESSION['visitor_visiting'] = $r[0]['uid'];
-                                       info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
+                                       if(!$quiet)
+                                               info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL);
                                        // Visitors get 1 day session.
                                        $session_id = session_id();
                                        $expire = time() + 86400;