From e2168be5c80808a69a9d202e88ef12fc321ff013 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 8 May 2019 00:09:29 -0400
Subject: [PATCH 1/3] Fix quicksearches for guests

---
 featherbb/View/layout.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/featherbb/View/layout.html.twig b/featherbb/View/layout.html.twig
index 9ddf9d66..3f018de5 100644
--- a/featherbb/View/layout.html.twig
+++ b/featherbb/View/layout.html.twig
@@ -140,7 +140,7 @@
 {% if can('board.read') and can('search.topics') %}
             <ul class="conr">
                 <li>{{ trans('Topic searches') }}
-            {% if userGet('is_guest') %}
+            {% if not userGet('is_guest') %}
                 <a href="{{ pathFor('quickSearch', {'show': 'replies'}) }}" title="{{ trans('Show posted topics') }}">{{ trans('Posted topics') }}</a> |
                 <a href="{{ pathFor('quickSearch', {'show': 'new'}) }}" title="{{ trans('Show new posts') }}">{{ trans('New posts header') }}</a> |
             {% endif %}

From dce2cd691603a8c3cfd2d7fa41ccdbcef2224896 Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 8 May 2019 00:15:59 -0400
Subject: [PATCH 2/3] Do not escape mail label for guests

---
 featherbb/View/topic.html.twig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/featherbb/View/topic.html.twig b/featherbb/View/topic.html.twig
index 45473e2f..12ddad2b 100644
--- a/featherbb/View/topic.html.twig
+++ b/featherbb/View/topic.html.twig
@@ -134,7 +134,11 @@
                     <label class="conl required"><strong>{{ trans('Guest name') }} <span>{{ trans('Required') }}</span></strong><br />
                         <input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
                     <label class="conl{{ settings('p_force_guest_email') == '1' ? ' required' : '' }}">
-                        {{ settings('p_force_guest_email') == '1' ? "<strong>#{ trans('Email') } <span>#{ trans('Required') }</span></strong>" : trans('Email') }}
+                        {% if settings('p_force_guest_email') == '1' %}
+                            <strong>{{ trans('Email') }} <span>{{ trans('Required') }}</span></strong>
+                        {% else %}
+                            {{ trans('Email') }}
+                        {% endif %}
                         <br />
                         <input type="text" name="{{ settings('p_force_guest_email') == '1' ? 'req_email' : 'email' }}" size="50" maxlength="80" tabindex="2" />
                         <br />

From 6f14535b272841a0c1590461733a0e3b8442851b Mon Sep 17 00:00:00 2001
From: adaur <adaur.underground@gmail.com>
Date: Wed, 8 May 2019 00:34:35 -0400
Subject: [PATCH 3/3] Do not show information messages as errors

---
 featherbb/Controller/Post.php    |  9 ++++++++-
 featherbb/Controller/Profile.php |  9 ++++++++-
 featherbb/Model/Post.php         |  6 +++++-
 featherbb/Model/Profile.php      |  7 ++++++-
 featherbb/View/info.html.twig    | 26 ++++++++++++++++++++++++++
 5 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 featherbb/View/info.html.twig

diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
index 6b698ce1..68916185 100644
--- a/featherbb/Controller/Post.php
+++ b/featherbb/Controller/Post.php
@@ -357,6 +357,13 @@ public function gethost($req, $res, $args)
     {
         $args['pid'] = Hooks::fire('controller.post.gethost', $args['pid']);
 
-        $this->model->displayIpAddress($args['pid']);
+        $message = $this->model->displayIpAddress($args['pid']);
+
+        return View::setPageInfo([
+            'title' => [\FeatherBB\Core\Utils::escape(ForumSettings::get('o_board_title')), __('Info')],
+            'msg'    =>    $message['message'],
+            'backlink'    => $message['back'],
+            'html'    => $message['html'],
+        ])->addTemplate('@forum/info')->display();
     }
 }
diff --git a/featherbb/Controller/Profile.php b/featherbb/Controller/Profile.php
index d73cb6cb..28c06663 100644
--- a/featherbb/Controller/Profile.php
+++ b/featherbb/Controller/Profile.php
@@ -364,6 +364,13 @@ public function gethostip($req, $res, $args)
     {
         $args['ip'] = Hooks::fire('controller.profile.gethostip', $args['ip']);
 
-        $this->model->displayIpInfo($args['ip']);
+        $message = $this->model->displayIpInfo($args['ip']);
+
+        return View::setPageInfo([
+            'title' => [\FeatherBB\Core\Utils::escape(ForumSettings::get('o_board_title')), __('Info')],
+            'msg'    =>    $message['message'],
+            'backlink'    => $message['back'],
+            'html'    => $message['html'],
+        ])->addTemplate('@forum/info')->display();
     }
 }
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
index af21562d..70720fbc 100644
--- a/featherbb/Model/Post.php
+++ b/featherbb/Model/Post.php
@@ -1374,6 +1374,10 @@ public function displayIpAddress($pid)
 
         $ip = Hooks::fire('model.post.display_ip_address_post', $ip);
 
-        throw new Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Router::pathFor('usersIpShow', ['ip' => $ip]).'">'.__('Show more users').'</a>', 400, true, true);
+        return [
+            'message' => sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Router::pathFor('usersIpShow', ['ip' => $ip]).'">'.__('Show more users').'</a>',
+            'back' => true,
+            'html' => true,
+        ];
     }
 }
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
index e19cbe1c..823a6c75 100644
--- a/featherbb/Model/Profile.php
+++ b/featherbb/Model/Profile.php
@@ -1366,6 +1366,11 @@ public function sendEmail($mail)
     public function displayIpInfo($ip)
     {
         $ip = Hooks::fire('model.profile.display_ip_info', $ip);
-        throw new Error(sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Router::pathFor('usersIpShow', ['ip' => $ip]).'">'.__('Show more users').'</a>', 400, true, true);
+
+        return [
+            'message' => sprintf(__('Host info 1'), $ip).'<br />'.sprintf(__('Host info 2'), @gethostbyaddr($ip)).'<br /><br /><a href="'.Router::pathFor('usersIpShow', ['ip' => $ip]).'">'.__('Show more users').'</a>',
+            'back' => true,
+            'html' => true,
+        ];
     }
 }
diff --git a/featherbb/View/info.html.twig b/featherbb/View/info.html.twig
new file mode 100644
index 00000000..b16fe415
--- /dev/null
+++ b/featherbb/View/info.html.twig
@@ -0,0 +1,26 @@
+{% extends '@forum/layout.html.twig' %}
+
+{% block content %}
+    {{ fireHook('view.error.start') }}
+
+    <div id="msg" class="block info">
+        <h2><span>{{ trans('Info') }}</span></h2>
+        <div class="box">
+            <div class="inbox">
+                <p>
+                    {% if html %}
+                        {{ msg|raw }}
+                    {% else %}
+                        {{ msg }}
+                    {% endif %}
+                </p>
+
+                {% if backlink %}
+                    <p><a href="javascript: history.go(-1)">{{ trans('Go back') }}</a></p>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+    {{ fireHook('view.error.end') }}
+{% endblock content %}