From e0bdf9e753d4df0ea7597def2dbc8c949789f970 Mon Sep 17 00:00:00 2001
From: DariusIII <thunderstorm1977>
Date: Tue, 19 Jul 2016 23:15:54 +0200
Subject: [PATCH] Update queries in NameFixer for by poster categorization

---
 Changelog                 |  1 +
 nntmux/NameFixer.php      | 16 ++++++++--------
 nntmux/RequestIDLocal.php |  2 +-
 nntmux/RequestIDWeb.php   |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Changelog b/Changelog
index 29ffe79f5..53cbc4329 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2016-07-19 DariusIII
+	* Chg: Update queries in NameFixer for by poster categorization
 	* Chg: Move UHD releases checks before HD ondes
 	* Chg: Add UHD subcategories to Movies, TV and XXX categories
 	* Chg: Add categorization by poster to Categorize.php (used in XXX SD clips for now)
diff --git a/nntmux/NameFixer.php b/nntmux/NameFixer.php
index c2399eaa0..bc0941af9 100755
--- a/nntmux/NameFixer.php
+++ b/nntmux/NameFixer.php
@@ -267,7 +267,7 @@ class NameFixer
 		$preId = false;
 		if ($cats === 3) {
 			$query = sprintf('
-					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groups_id,
+					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id,
 						rf.releases_id AS fileid, rel.id AS releases_id
 					FROM releases rel
 					INNER JOIN release_files rf ON (rf.releases_id = rel.id)
@@ -279,7 +279,7 @@ class NameFixer
 			$preId = true;
 		} else {
 			$query = sprintf('
-					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groups_id,
+					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.fromname, rel.groups_id,
 						rf.releases_id AS fileid, rel.id AS releases_id
 					FROM releases rel
 					INNER JOIN release_files rf ON (rf.releases_id = rel.id)
@@ -330,7 +330,7 @@ class NameFixer
 
 		if ($cats === 3) {
 			$query = sprintf('
-					SELECT rel.id AS releases_id, rel.guid, rel.groups_id
+					SELECT rel.id AS releases_id, rel.guid, rel.groups_id, rel.fromname
 					FROM releases rel
 					WHERE rel.nzbstatus = %d
 					AND rel.predb_id = 0',
@@ -339,7 +339,7 @@ class NameFixer
 			$cats = 2;
 		} else {
 			$query = sprintf('
-					SELECT rel.id AS releases_id, rel.guid, rel.groups_id
+					SELECT rel.id AS releases_id, rel.guid, rel.groups_id, rel.fromname
 					FROM releases rel
 					WHERE rel.isrenamed = %d
 					AND rel.proc_par2 = %d',
@@ -402,7 +402,7 @@ class NameFixer
 		if ($cats === 3) {
 			$query = sprintf('
 				SELECT
-					rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.categories_id,
+					rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.fromname, rel.categories_id,
 					rel.name, rel.name AS textstring, rel.predb_id, rel.searchname,
 					HEX(ru.uniqueid) AS uid
 				FROM releases rel
@@ -417,7 +417,7 @@ class NameFixer
 		} else {
 			$query = sprintf('
 				SELECT
-					rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.categories_id,
+					rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.fromname, rel.categories_id,
 					rel.name, rel.name AS textstring, rel.predb_id, rel.searchname,
 					HEX(ru.uniqueid) AS uid
 				FROM releases rel
@@ -747,7 +747,7 @@ class NameFixer
 		//Find release matches with fulltext and then identify exact matches with cleaned LIKE string
 		$res = $this->pdo->queryDirect(
 			sprintf("
-				SELECT r.id AS releases_id, r.name, r.searchname,
+				SELECT r.id AS releases_id, r.name, r.fromname, r.searchname,
 				r.fromname, r.groups_id, r.categories_id
 				FROM releases r
 				%1\$s
@@ -833,7 +833,7 @@ class NameFixer
 		$query = $this->pdo->queryDirect(
 			sprintf('
 							SELECT r.id AS releases_id, r.name, r.searchname,
-								r.groups_id, r.categories_id,
+								r.groups_id, r.fromname, r.categories_id,
 								rf.name AS filename
 							FROM releases r
 							INNER JOIN release_files rf ON r.id = rf.releases_id
diff --git a/nntmux/RequestIDLocal.php b/nntmux/RequestIDLocal.php
index fe587d333..563df68f9 100644
--- a/nntmux/RequestIDLocal.php
+++ b/nntmux/RequestIDLocal.php
@@ -23,7 +23,7 @@ class RequestIDLocal extends RequestID
 	protected function _getReleases()
 	{
 		$query = (
-			'SELECT r.id, r.name, r.categories_id, r.reqidstatus, g.name AS groupname, g.id as gid
+			'SELECT r.id, r.name, r.fromname, r.categories_id, r.reqidstatus, g.name AS groupname, g.id as gid
 			FROM releases r
 			LEFT JOIN groups g ON r.groups_id = g.id
 			WHERE r.nzbstatus = 1
diff --git a/nntmux/RequestIDWeb.php b/nntmux/RequestIDWeb.php
index f43c88cef..2791f4a32 100644
--- a/nntmux/RequestIDWeb.php
+++ b/nntmux/RequestIDWeb.php
@@ -42,7 +42,7 @@ class RequestIDWeb extends RequestID
 	{
 		$this->_releases = $this->pdo->queryDirect(
 			sprintf ('
-				SELECT r.id, r.name, r.searchname, g.name AS groupname, r.groups_id, r.categories_id
+				SELECT r.id, r.name, r.searchname, r.fromname, g.name AS groupname, r.groups_id, r.categories_id
 				FROM releases r
 				LEFT JOIN groups g ON r.groups_id = g.id
 				WHERE r.nzbstatus = 1