From f3fa24ef33f653188a63434f1f2d3219b4e0a4a7 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Tue, 4 Oct 2016 12:16:34 +0200
Subject: [PATCH] Fix xxx and srr renaming queries

---
 Changelog            |  1 +
 nntmux/NameFixer.php | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 16c188937..e48421150 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2016-10-04 DariusIII
+	* Fix: Fix xxx and srr renaming queries
 	* Chg: Remove unused Max Messages Per Run setting from admin->edit site
 	* Chg: Add renaming based on included srr file in release
 2016-10-03 DariusIII
diff --git a/nntmux/NameFixer.php b/nntmux/NameFixer.php
index 04195ec8b..6d949fcb2 100755
--- a/nntmux/NameFixer.php
+++ b/nntmux/NameFixer.php
@@ -1831,7 +1831,7 @@ class NameFixer
 	public function xxxNameCheck($release, $echo, $type, $namestatus, $show)
 	{
 		if ($this->done === false && $this->relid !== $release["releases_id"]) {
-			$result = $this->pdo->queryDirect("
+			$query = sprintf("
 				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
@@ -1844,6 +1844,8 @@ class NameFixer
 				$this->pdo->likeString('SDPORN', true, true)
 			);
 
+			$result = $this->pdo->queryDirect($query);
+
 			if ($result instanceof \Traversable) {
 				foreach ($result AS $res) {
 					if (preg_match('/^.+?SDPORN/i', $res["textstring"], $match)) {
@@ -1879,7 +1881,7 @@ class NameFixer
 	public function srrNameCheck($release, $echo, $type, $namestatus, $show)
 	{
 		if ($this->done === false && $this->relid !== $release["releases_id"]) {
-			$result = $this->pdo->queryDirect("
+			$query = sprintf("
 				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
@@ -1892,12 +1894,14 @@ class NameFixer
 				$this->pdo->likeString('.srr', true, false)
 			);
 
+			$result = $this->pdo->queryDirect($query);
+
 			if ($result instanceof \Traversable) {
 				foreach ($result AS $res) {
-					if (preg_match('/^(.*)/i', $res["textstring"], $match)) {
+					if (preg_match('/^(.*)\.srr/i', $res["textstring"], $match)) {
 						$this->updateRelease(
 							$release,
-							$match["0"],
+							$match["1"],
 							$method = "fileCheck: SRR extension",
 							$echo,
 							$type,