From a689280bb51ef37764b8c2adc7fb64f4204054d2 Mon Sep 17 00:00:00 2001
From: pupi1985 <pupi1985@bitbucket.org>
Date: Tue, 19 Jan 2021 01:10:10 -0300
Subject: [PATCH 01/12] Fix #880 - Warning in PHP 7.4

---
 qa-include/pages/confirm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa-include/pages/confirm.php b/qa-include/pages/confirm.php
index 7026b178a..82c214153 100644
--- a/qa-include/pages/confirm.php
+++ b/qa-include/pages/confirm.php
@@ -72,7 +72,7 @@
 	if (strlen($handle) > 0) { // If there is a handle present in the URL
 		$userInfo = qa_db_select_with_pending(qa_db_user_account_selectspec($handle, false));
 
-		if (strtolower(trim($userInfo['emailcode'])) == strtolower($code)) {
+		if ($userInfo !== null && strtolower(trim($userInfo['emailcode'])) == strtolower($code)) {
 			qa_complete_confirm($userInfo['userid'], $userInfo['email'], $userInfo['handle']);
 			$userConfirmed = true;
 		}

From e0533d2ef9d51d6c76a7ceb6e6c0b67e4a2fcc17 Mon Sep 17 00:00:00 2001
From: pupi1985 <pupi1985@bitbucket.org>
Date: Wed, 3 Feb 2021 01:36:53 -0300
Subject: [PATCH 02/12] Fix #882 - Error thrown on PHP 8 when attempting to
 count() null values

---
 qa-include/pages/hot.php        | 2 +-
 qa-include/pages/unanswered.php | 2 +-
 qa-include/qa-feed.php          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qa-include/pages/hot.php b/qa-include/pages/hot.php
index 366be8607..4aa33e846 100644
--- a/qa-include/pages/hot.php
+++ b/qa-include/pages/hot.php
@@ -31,7 +31,7 @@
 // Get list of hottest questions, allow per-category if QA_ALLOW_UNINDEXED_QUERIES set in qa-config.php
 
 $categoryslugs = QA_ALLOW_UNINDEXED_QUERIES ? qa_request_parts(1) : null;
-$countslugs = @count($categoryslugs);
+$countslugs = $categoryslugs === null ? null : count($categoryslugs);
 
 $start = qa_get_start();
 $userid = qa_get_logged_in_userid();
diff --git a/qa-include/pages/unanswered.php b/qa-include/pages/unanswered.php
index 5596c6825..820e2ac47 100644
--- a/qa-include/pages/unanswered.php
+++ b/qa-include/pages/unanswered.php
@@ -36,7 +36,7 @@
 else
 	$categoryslugs = null;
 
-$countslugs = @count($categoryslugs);
+$countslugs = $categoryslugs === null ? null : count($categoryslugs);
 $by = qa_get('by');
 $start = qa_get_start();
 $userid = qa_get_logged_in_userid();
diff --git a/qa-include/qa-feed.php b/qa-include/qa-feed.php
index 2703c3ad3..f2b7c7fcd 100644
--- a/qa-include/qa-feed.php
+++ b/qa-include/qa-feed.php
@@ -74,7 +74,7 @@ function qa_feed_not_found()
 function qa_feed_load_ifcategory($categoryslugs, $allkey, $catkey, &$title,
 	$questionselectspec1 = null, $questionselectspec2 = null, $questionselectspec3 = null, $questionselectspec4 = null)
 {
-	$countslugs = @count($categoryslugs);
+	$countslugs = $categoryslugs === null ? null : count($categoryslugs);
 
 	list($questions1, $questions2, $questions3, $questions4, $categories, $categoryid) = qa_db_select_with_pending(
 		$questionselectspec1,
@@ -165,7 +165,7 @@ function qa_feed_load_ifcategory($categoryslugs, $allkey, $catkey, &$title,
 		break;
 }
 
-$countslugs = @count($categoryslugs);
+$countslugs = $categoryslugs === null ? null : count($categoryslugs);
 
 if (!isset($feedoption))
 	qa_feed_not_found();

From 9fdfcd4563202491d6f07a68aa3b128e8a624cd0 Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Tue, 30 Mar 2021 12:55:44 +0100
Subject: [PATCH 03/12] Travis: add PHP 7.4

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 708cc2c33..2e3c44ac6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ php:
   - '7.0'
   - '7.2'
   - '7.3'
+  - '7.4'
 
 jobs:
   include:

From afb884b75b0db343cd32f5885132049e115dcc3d Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Tue, 30 Mar 2021 13:53:57 +0100
Subject: [PATCH 04/12] Fix PHP 8.0 error with CAPTCHA

Fixes #888
---
 qa-include/pages/register.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qa-include/pages/register.php b/qa-include/pages/register.php
index dacde6c39..341339b10 100644
--- a/qa-include/pages/register.php
+++ b/qa-include/pages/register.php
@@ -76,6 +76,8 @@
 
 // Process submitted form
 
+$errors = array();
+
 if (qa_clicked('doregister')) {
 	require_once QA_INCLUDE_DIR . 'app/limits.php';
 

From 7dd2d46dffe6d60b7757c08cb335ec36e81611e4 Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Mon, 19 Apr 2021 16:25:25 +0100
Subject: [PATCH 05/12] Prevent form elements in posts

---
 qa-include/qa-base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa-include/qa-base.php b/qa-include/qa-base.php
index 6efadd85f..0b4dfa64f 100644
--- a/qa-include/qa-base.php
+++ b/qa-include/qa-base.php
@@ -1024,7 +1024,7 @@ function qa_sanitize_html($html, $linksnewwindow = false, $storage = false)
 
 	$safe = htmLawed($html, array(
 		'safe' => 1,
-		'elements' => '*-form-style',
+		'elements' => '*-form-input-select-textarea-style',
 		'schemes' => 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, telnet; *:file, http, https; style: !; classid:clsid',
 		'keep_bad' => 0,
 		'anti_link_spam' => array('/.*/', ''),

From 21113a0bd4d8a0a1d50dc59fd9a1eb40166745f7 Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Mon, 19 Apr 2021 16:59:53 +0100
Subject: [PATCH 06/12] Fix PHP notice on user fields page

Fixes #850
---
 qa-include/app/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa-include/app/users.php b/qa-include/app/users.php
index 196990935..a0bfb40aa 100644
--- a/qa-include/app/users.php
+++ b/qa-include/app/users.php
@@ -1254,7 +1254,7 @@ function qa_user_userfield_label($userfield)
 			'website' => 'users/website',
 		);
 
-		if (isset($defaultlabels[$userfield['title']]))
+		if (isset($userfield['title']) && isset($defaultlabels[$userfield['title']]))
 			return qa_lang($defaultlabels[$userfield['title']]);
 	}
 

From 9d84476273ece0cde9313efad31544635441d1ab Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Tue, 20 Apr 2021 13:14:30 +0100
Subject: [PATCH 07/12] Fix warnings with Wordpress integration

---
 qa-include/app/users.php          | 2 +-
 qa-include/pages/user-profile.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa-include/app/users.php b/qa-include/app/users.php
index a0bfb40aa..c36f5de14 100644
--- a/qa-include/app/users.php
+++ b/qa-include/app/users.php
@@ -125,7 +125,7 @@ function qa_get_logged_in_points()
 			$qa_cached_logged_in_points = qa_db_select_with_pending(qa_db_user_points_selectspec(qa_get_logged_in_userid(), true));
 		}
 
-		return $qa_cached_logged_in_points['points'];
+		return isset($qa_cached_logged_in_points['points']) ? $qa_cached_logged_in_points['points'] : null;
 	}
 
 
diff --git a/qa-include/pages/user-profile.php b/qa-include/pages/user-profile.php
index d51af83e2..8842bf186 100644
--- a/qa-include/pages/user-profile.php
+++ b/qa-include/pages/user-profile.php
@@ -343,7 +343,7 @@
 $qa_content['title'] = qa_lang_html_sub('profile/user_x', $userhtml);
 $qa_content['error'] = @$errors['page'];
 
-if (isset($loginuserid) && $loginuserid != $useraccount['userid'] && !QA_FINAL_EXTERNAL_USERS) {
+if (!QA_FINAL_EXTERNAL_USERS && isset($loginuserid) && $loginuserid != $useraccount['userid']) {
 	$favoritemap = qa_get_favorite_non_qs_map();
 	$favorite = @$favoritemap['user'][$useraccount['userid']];
 
@@ -753,7 +753,7 @@
 		'bonus' => array(
 			'label' => qa_lang_html('profile/bonus_points'),
 			'tags' => 'name="bonus"',
-			'value' => qa_html(isset($inbonus) ? $inbonus : $userpoints['bonus']),
+			'value' => qa_html(isset($inbonus) ? $inbonus : @$userpoints['bonus']),
 			'type' => 'number',
 			'note' => qa_lang_html('users/only_shown_admins'),
 			'id' => 'bonus',

From 3f3c8c26fd35b87c70e3062b340a6f4909d5fa20 Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Tue, 20 Apr 2021 13:26:51 +0100
Subject: [PATCH 08/12] Fix missing avatar with Wordpress integration

---
 qa-include/util/external-users-wp.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qa-include/util/external-users-wp.php b/qa-include/util/external-users-wp.php
index f97570ba3..2c091f71b 100644
--- a/qa-include/util/external-users-wp.php
+++ b/qa-include/util/external-users-wp.php
@@ -58,6 +58,9 @@ function qa_get_logged_in_user()
 		else
 			$level = QA_USER_LEVEL_BASIC;
 
+		// flush WP email cache (for displaying avatars)
+		qa_get_public_from_userids([$wordpressuser->ID]);
+
 		return array(
 			'userid' => $wordpressuser->ID,
 			'publicusername' => $wordpressuser->user_nicename,

From 7a246c8d03c6a41ad5de1ef325af643398328a71 Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Tue, 20 Apr 2021 13:28:01 +0100
Subject: [PATCH 09/12] Replace external user fatal error with 404

---
 qa-include/pages/account.php             | 7 +++++--
 qa-include/pages/admin/admin-approve.php | 7 +++++--
 qa-include/pages/message.php             | 7 +++++--
 qa-include/pages/messages.php            | 7 +++++--
 qa-include/pages/user-wall.php           | 7 +++++--
 qa-include/pages/users-blocked.php       | 4 +++-
 qa-include/pages/users-newest.php        | 4 +++-
 qa-include/pages/users-special.php       | 4 +++-
 8 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/qa-include/pages/account.php b/qa-include/pages/account.php
index e29aedb7a..d0aaed7a0 100644
--- a/qa-include/pages/account.php
+++ b/qa-include/pages/account.php
@@ -33,8 +33,11 @@
 
 // Check we're not using single-sign on integration, that we're logged in
 
-if (QA_FINAL_EXTERNAL_USERS)
-	qa_fatal_error('User accounts are handled by external code');
+if (QA_FINAL_EXTERNAL_USERS) {
+	header('HTTP/1.1 404 Not Found');
+	echo qa_lang_html('main/page_not_found');
+	qa_exit();
+}
 
 $userid = qa_get_logged_in_userid();
 
diff --git a/qa-include/pages/admin/admin-approve.php b/qa-include/pages/admin/admin-approve.php
index fb3dbb4de..355893184 100644
--- a/qa-include/pages/admin/admin-approve.php
+++ b/qa-include/pages/admin/admin-approve.php
@@ -30,8 +30,11 @@
 
 // Check we're not using single-sign on integration
 
-if (QA_FINAL_EXTERNAL_USERS)
-	qa_fatal_error('User accounts are handled by external code');
+if (QA_FINAL_EXTERNAL_USERS) {
+	header('HTTP/1.1 404 Not Found');
+	echo qa_lang_html('main/page_not_found');
+	qa_exit();
+}
 
 
 // Find most flagged questions, answers, comments
diff --git a/qa-include/pages/message.php b/qa-include/pages/message.php
index ce734becd..2210138db 100644
--- a/qa-include/pages/message.php
+++ b/qa-include/pages/message.php
@@ -38,8 +38,11 @@
 
 // Check we have a handle, we're not using Q2A's single-sign on integration and that we're logged in
 
-if (QA_FINAL_EXTERNAL_USERS)
-	qa_fatal_error('User accounts are handled by external code');
+if (QA_FINAL_EXTERNAL_USERS) {
+	header('HTTP/1.1 404 Not Found');
+	echo qa_lang_html('main/page_not_found');
+	qa_exit();
+}
 
 if (!strlen($handle))
 	qa_redirect('users');
diff --git a/qa-include/pages/messages.php b/qa-include/pages/messages.php
index c08846018..d820c7dca 100644
--- a/qa-include/pages/messages.php
+++ b/qa-include/pages/messages.php
@@ -43,8 +43,11 @@
 else
 	return include QA_INCLUDE_DIR . 'qa-page-not-found.php';
 
-if (QA_FINAL_EXTERNAL_USERS)
-	qa_fatal_error('User accounts are handled by external code');
+if (QA_FINAL_EXTERNAL_USERS) {
+	header('HTTP/1.1 404 Not Found');
+	echo qa_lang_html('main/page_not_found');
+	qa_exit();
+}
 
 if (!isset($loginUserId)) {
 	$qa_content = qa_content_prepare();
diff --git a/qa-include/pages/user-wall.php b/qa-include/pages/user-wall.php
index 7de8ef3db..579a895eb 100644
--- a/qa-include/pages/user-wall.php
+++ b/qa-include/pages/user-wall.php
@@ -30,8 +30,11 @@
 
 // Check we're not using single-sign on integration, which doesn't allow walls
 
-if (QA_FINAL_EXTERNAL_USERS)
-	qa_fatal_error('User accounts are handled by external code');
+if (QA_FINAL_EXTERNAL_USERS) {
+	header('HTTP/1.1 404 Not Found');
+	echo qa_lang_html('main/page_not_found');
+	qa_exit();
+}
 
 
 // $handle, $userhtml are already set by /qa-include/page/user.php
diff --git a/qa-include/pages/users-blocked.php b/qa-include/pages/users-blocked.php
index d1a047de2..d0197a7bd 100644
--- a/qa-include/pages/users-blocked.php
+++ b/qa-include/pages/users-blocked.php
@@ -32,7 +32,9 @@
 // Check we're not using single-sign on integration
 
 if (QA_FINAL_EXTERNAL_USERS) {
-	qa_fatal_error('User accounts are handled by external code');
+	header('HTTP/1.1 404 Not Found');
+	echo qa_lang_html('main/page_not_found');
+	qa_exit();
 }
 
 
diff --git a/qa-include/pages/users-newest.php b/qa-include/pages/users-newest.php
index 5ea5deb1a..4fd03de80 100644
--- a/qa-include/pages/users-newest.php
+++ b/qa-include/pages/users-newest.php
@@ -31,7 +31,9 @@
 // Check we're not using single-sign on integration
 
 if (QA_FINAL_EXTERNAL_USERS) {
-	qa_fatal_error('User accounts are handled by external code');
+	header('HTTP/1.1 404 Not Found');
+	echo qa_lang_html('main/page_not_found');
+	qa_exit();
 }
 
 
diff --git a/qa-include/pages/users-special.php b/qa-include/pages/users-special.php
index 7cdfbb717..4e12bf27d 100644
--- a/qa-include/pages/users-special.php
+++ b/qa-include/pages/users-special.php
@@ -32,7 +32,9 @@
 // Check we're not using single-sign on integration
 
 if (QA_FINAL_EXTERNAL_USERS) {
-	qa_fatal_error('User accounts are handled by external code');
+	header('HTTP/1.1 404 Not Found');
+	echo qa_lang_html('main/page_not_found');
+	qa_exit();
 }
 
 

From 430f2325195662aefb8c2fbf06a8c42ac130527e Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Tue, 20 Apr 2021 17:12:23 +0100
Subject: [PATCH 10/12] Update old file references

---
 qa-config-example.php                        | 4 ++--
 qa-external-example/qa-external-users.php    | 2 +-
 qa-plugin/wysiwyg-editor/qa-wysiwyg-ajax.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qa-config-example.php b/qa-config-example.php
index 707963069..7f555c658 100644
--- a/qa-config-example.php
+++ b/qa-config-example.php
@@ -197,6 +197,6 @@
 	define('QA_DEBUG_PERFORMANCE', false);
 
 /*
-	And lastly... if you want to, you can predefine any constant from qa-db-maxima.php in this
-	file to override the default setting. Just make sure you know what you're doing!
+	And lastly... if you want to, you can predefine any constant from qa-include/db/maxima.php in
+	this file to override the default setting. Just make sure you know what you're doing!
 */
diff --git a/qa-external-example/qa-external-users.php b/qa-external-example/qa-external-users.php
index 5f12bfabc..d0cf41bc6 100644
--- a/qa-external-example/qa-external-users.php
+++ b/qa-external-example/qa-external-users.php
@@ -581,7 +581,7 @@ function qa_get_users_html($userids, $should_include_link, $relative_url_prefix)
  *
  * If $padding is true, the HTML you return should render to a square of $size x $size pixels,
  * even if the avatar is not square. This can be achieved using CSS padding - see function
- * qa_get_avatar_blob_html(...) in qa-app-format.php for an example. If $padding is false,
+ * qa_get_avatar_blob_html(...) in app/format.php for an example. If $padding is false,
  * the HTML can render to anything which would fit inside a square of $size x $size pixels.
  *
  * Note that this function may be called many times to render an individual page, so it is not
diff --git a/qa-plugin/wysiwyg-editor/qa-wysiwyg-ajax.php b/qa-plugin/wysiwyg-editor/qa-wysiwyg-ajax.php
index da16ffb25..6575e2222 100644
--- a/qa-plugin/wysiwyg-editor/qa-wysiwyg-ajax.php
+++ b/qa-plugin/wysiwyg-editor/qa-wysiwyg-ajax.php
@@ -31,7 +31,7 @@ public function match_request($request)
 	// Fix path to WYSIWYG editor smileys
 	public function process_request($request)
 	{
-		require_once QA_INCLUDE_DIR.'qa-app-posts.php';
+		require_once QA_INCLUDE_DIR . 'app/posts.php';
 
 		// smiley replacement regexes
 		$rxSearch = '<(img|a)([^>]+)(src|href)="([^"]+)/wysiwyg-editor/plugins/smiley/images/([^"]+)"';

From 947a970beb76168a3ab1f4cbd0af468a168121c6 Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Tue, 20 Apr 2021 17:22:47 +0100
Subject: [PATCH 11/12] 1.8.6

---
 VERSION.txt            | 2 +-
 qa-include/qa-base.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index ff2fd4fbe..9eadd6baa 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.8.5
\ No newline at end of file
+1.8.6
\ No newline at end of file
diff --git a/qa-include/qa-base.php b/qa-include/qa-base.php
index 0b4dfa64f..01ba4040f 100644
--- a/qa-include/qa-base.php
+++ b/qa-include/qa-base.php
@@ -20,8 +20,8 @@
 */
 
 
-define('QA_VERSION', '1.8.5'); // also used as suffix for .js and .css requests
-define('QA_BUILD_DATE', '2020-07-15');
+define('QA_VERSION', '1.8.6'); // also used as suffix for .js and .css requests
+define('QA_BUILD_DATE', '2021-04-20');
 
 
 /**

From 26181f7f4988b1b5aaf380f65ecb3c86125066c8 Mon Sep 17 00:00:00 2001
From: Emran <emran.batmanghelich@divar.ir>
Date: Sun, 29 Jan 2023 11:25:51 +0330
Subject: [PATCH 12/12] Feat: Make post content direction auto

Q2A already supports RTL direction in its settings. But, when switching
to a direction (e.g. RTL) the contents of the other direction (LTR) are
messed up.
Hence, in order to support mixed directions, `dir=auto` got added to the
post content `div`s.
---
 qa-include/qa-theme-base.php   | 8 ++++----
 qa-theme/SnowFlat/qa-theme.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qa-include/qa-theme-base.php b/qa-include/qa-theme-base.php
index 9069b7406..8e1723149 100644
--- a/qa-include/qa-theme-base.php
+++ b/qa-include/qa-theme-base.php
@@ -743,7 +743,7 @@ public function page_title_error()
 			if (isset($favorite))
 				$this->output('<form ' . $favorite['form_tags'] . '>');
 
-			$this->output('<div class="qa-main-heading">');
+			$this->output('<div class="qa-main-heading" dir="auto">');
 			$this->favorite();
 			$this->output('<h1>');
 			$this->title();
@@ -1713,7 +1713,7 @@ public function q_item_clear()
 	public function q_item_title($q_item)
 	{
 		$this->output(
-			'<div class="qa-q-item-title">',
+			'<div class="qa-q-item-title" dir="auto">',
 			'<a href="' . $q_item['url'] . '">' . $q_item['title'] . '</a>',
 			// add closed note in title
 			empty($q_item['closed']['state']) ? '' : ' [' . $q_item['closed']['state'] . ']',
@@ -2198,7 +2198,7 @@ public function q_view_content($q_view)
 	{
 		$content = isset($q_view['content']) ? $q_view['content'] : '';
 
-		$this->output('<div class="qa-q-view-content qa-post-content">');
+		$this->output('<div class="qa-q-view-content qa-post-content" dir="auto">');
 		$this->output_raw($content);
 		$this->output('</div>');
 	}
@@ -2361,7 +2361,7 @@ public function a_item_content($a_item)
 			$a_item['content'] = '';
 		}
 
-		$this->output('<div class="qa-a-item-content qa-post-content">');
+		$this->output('<div class="qa-a-item-content qa-post-content" dir="auto">');
 		$this->output_raw($a_item['content']);
 		$this->output('</div>');
 	}
diff --git a/qa-theme/SnowFlat/qa-theme.php b/qa-theme/SnowFlat/qa-theme.php
index 921768b79..0a13eba96 100644
--- a/qa-theme/SnowFlat/qa-theme.php
+++ b/qa-theme/SnowFlat/qa-theme.php
@@ -364,7 +364,7 @@ public function q_item_title($q_item)
 			: '<img src="' . $this->rooturl . $this->icon_url . '/closed-q-list.png" class="qam-q-list-close-icon" alt="' . $closedText . '" title="' . $closedText . '"/>';
 
 		$this->output(
-			'<div class="qa-q-item-title">',
+			'<div class="qa-q-item-title" dir="auto">',
 			// add closed note in title
 			$imgHtml,
 			'<a href="' . $q_item['url'] . '">' . $q_item['title'] . '</a>',