From 10d9e87d8211d08b26c8dbbc2cd0d1e7952ac04e Mon Sep 17 00:00:00 2001
From: Darko <dkrisan@gmail.com>
Date: Mon, 1 Jun 2015 09:54:40 +0200
Subject: [PATCH] Change patches, fix the  Sites class.

---
 .../tmux/lib/DB/patches/0035_prehash.sql      |  4 +--
 .../tmux/lib/DB/patches/0041_predbhash.sql    | 27 +++----------------
 newznab/controllers/Sites.php                 |  8 +++---
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/misc/update_scripts/nix_scripts/tmux/lib/DB/patches/0035_prehash.sql b/misc/update_scripts/nix_scripts/tmux/lib/DB/patches/0035_prehash.sql
index 03e4361c0..8d82781fb 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/DB/patches/0035_prehash.sql
+++ b/misc/update_scripts/nix_scripts/tmux/lib/DB/patches/0035_prehash.sql
@@ -6,11 +6,9 @@ ALTER TABLE `releasefiles` ADD INDEX `ix_releasefiles_ishashed` (`ishashed`);
 DROP TRIGGER IF EXISTS check_rfinsert;
 DROP TRIGGER IF EXISTS check_rfupdate;
 
-
 CREATE TRIGGER check_rfinsert BEFORE INSERT ON releasefiles FOR EACH ROW BEGIN IF NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1; END IF; END;
 CREATE TRIGGER check_rfupdate BEFORE UPDATE ON releasefiles FOR EACH ROW BEGIN IF NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1; END IF; END;
 
-
 UPDATE `releasefiles` SET ishashed = 1 WHERE name REGEXP '[a-fA-F0-9]{32}';
 
-UPDATE `site` SET `value` = '35' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
+UPDATE `site` SET `value` = '35' WHERE `setting` = 'sqlpatch';
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/DB/patches/0041_predbhash.sql b/misc/update_scripts/nix_scripts/tmux/lib/DB/patches/0041_predbhash.sql
index 1992d12e6..feb41e8bf 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/DB/patches/0041_predbhash.sql
+++ b/misc/update_scripts/nix_scripts/tmux/lib/DB/patches/0041_predbhash.sql
@@ -9,37 +9,18 @@ CREATE TABLE predbhash (
   DEFAULT CHARSET =utf8mb4
   COLLATE =utf8mb4_unicode_ci;
 
-INSERT INTO predbhash (pre_id, hashes) (SELECT
-                                          id,
-                                          CONCAT_WS(',', MD5(title), MD5(MD5(title)), SHA1(title))
-                                        FROM prehash);
+INSERT INTO predbhash (pre_id, hashes) (SELECT id, CONCAT_WS(',', MD5(title), MD5(MD5(title)), SHA1(title)) FROM prehash);
 
 CREATE FULLTEXT INDEX ix_predbhash_hashes_ft ON predbhash (hashes);
 ALTER IGNORE TABLE predbhash ADD UNIQUE INDEX ix_predbhash_hashes (hashes(32));
 
 DROP TRIGGER IF EXISTS insert_hashes;
-
-
-CREATE TRIGGER insert_hashes AFTER INSERT ON prehash FOR EACH ROW BEGIN INSERT INTO predbhash (pre_id, hashes)
-VALUES (NEW.id, CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)));
-END;
-
-
+CREATE TRIGGER insert_hashes AFTER INSERT ON prehash FOR EACH ROW BEGIN INSERT INTO predbhash (pre_id, hashes) VALUES (NEW.id, CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title))); END;
 
 DROP TRIGGER IF EXISTS update_hashes;
-
-
-CREATE TRIGGER update_hashes AFTER UPDATE ON prehash FOR EACH ROW BEGIN IF NEW.title != OLD.title
-THEN UPDATE predbhash
-SET hashes = CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)); END IF;
-END;
+CREATE TRIGGER update_hashes AFTER UPDATE ON prehash FOR EACH ROW BEGIN IF NEW.title != OLD.title THEN UPDATE predbhash SET hashes = CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)); END IF;END;
 
 DROP TRIGGER IF EXISTS delete_hashes;
-
-
-CREATE TRIGGER delete_hashes AFTER DELETE ON prehash FOR EACH ROW BEGIN DELETE FROM predbhash
-WHERE pre_id = OLD.id;
-END;
-
+CREATE TRIGGER delete_hashes AFTER DELETE ON prehash FOR EACH ROW BEGIN DELETE FROM predbhash WHERE pre_id = OLD.id;END;
 
 UPDATE `site` SET `value` = '41' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/newznab/controllers/Sites.php b/newznab/controllers/Sites.php
index 35a356f6b..4e60516c4 100644
--- a/newznab/controllers/Sites.php
+++ b/newznab/controllers/Sites.php
@@ -1,6 +1,6 @@
 <?php
 
-use newznab\db\Settings;
+use newznab\db\DB;
 use newznab\libraries\Cache;
 
 class Sites
@@ -26,7 +26,7 @@ class Sites
 
 	public function update($form)
 	{
-		$db = new Settings();
+		$db = new DB();
 		$site = $this->row2Object($form);
 
 		if (substr($site->nzbpath, strlen($site->nzbpath) - 1) != '/')
@@ -79,7 +79,7 @@ class Sites
 			$cache->delete($sql);
 		}
 
-		$db = new Settings();
+		$db = new DB();
 		$rows = $db->query($sql, true, NN_CACHE_EXPIRY_MEDIUM);
 
 		if ($rows === false)
@@ -131,7 +131,7 @@ class Sites
 
 	public function updateItem($setting, $value)
 	{
-		$db = new Settings();
+		$db = new DB();
 		$sql = sprintf("update site set value = %s where setting = %s", $db->escapeString($value), $db->escapeString($setting));
 
 		return $db->exec($sql);