From f7f5504fa41338070127a2b4a393c59d224611e1 Mon Sep 17 00:00:00 2001
From: Darko <dkrisan@gmail.com>
Date: Fri, 29 May 2015 11:18:05 +0200
Subject: [PATCH] Fourth batch.

---
 .../nix_scripts/tmux/bin/groupfixrelnames.php |  2 --
 .../nix_scripts/tmux/bin/postprocess.php      |  2 --
 .../nix_scripts/tmux/bin/update_releases.php  |  6 +----
 .../nix_scripts/tmux/lib/fixReleaseNames.php  |  2 --
 .../tmux/lib/testing/DB/convert_to_tpg.php    |  4 +--
 .../tmux/lib/testing/DB/reset_truncate.php    |  4 +--
 .../tmux/lib/testing/DB/resetdb.php           |  4 +--
 .../tmux/lib/testing/Dev/clean_nzbs.php       |  4 +--
 .../tmux/lib/testing/_run_once/tpg_fixes.php  |  4 +--
 misc/update_scripts/nix_scripts/tmux/run.php  | 27 ++++++-------------
 .../update_database_version.php               |  2 +-
 11 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/misc/update_scripts/nix_scripts/tmux/bin/groupfixrelnames.php b/misc/update_scripts/nix_scripts/tmux/bin/groupfixrelnames.php
index d9e844269..e35e28329 100644
--- a/misc/update_scripts/nix_scripts/tmux/bin/groupfixrelnames.php
+++ b/misc/update_scripts/nix_scripts/tmux/bin/groupfixrelnames.php
@@ -5,8 +5,6 @@ use newznab\db\Settings;
 use newznab\processing\PProcess;
 
 $pdo = new Settings();
-$s = new Settings();
-$site = $s->get();
 
 if (!isset($argv[1])) {
 	exit($pdo->log->error("This script is not intended to be run manually, it is called from groupfixrelnames_threaded.py."));
diff --git a/misc/update_scripts/nix_scripts/tmux/bin/postprocess.php b/misc/update_scripts/nix_scripts/tmux/bin/postprocess.php
index 0980d03a0..5bc956b61 100644
--- a/misc/update_scripts/nix_scripts/tmux/bin/postprocess.php
+++ b/misc/update_scripts/nix_scripts/tmux/bin/postprocess.php
@@ -6,8 +6,6 @@ use newznab\db\Settings;
 use newznab\processing\PProcess;
 
 $pdo = new Settings();
-$s = new Settings();
-$site = $s->get();
 /**
 Array with possible arguments for run and
 whether or not those methods of operation require NNTP
diff --git a/misc/update_scripts/nix_scripts/tmux/bin/update_releases.php b/misc/update_scripts/nix_scripts/tmux/bin/update_releases.php
index fa635a543..82559ab2d 100644
--- a/misc/update_scripts/nix_scripts/tmux/bin/update_releases.php
+++ b/misc/update_scripts/nix_scripts/tmux/bin/update_releases.php
@@ -3,10 +3,6 @@ require_once("config.php");
 
 use newznab\db\Settings;
 
-
-
-$s = new \Sites();
-$site = $s->get();
 $pdo = new Settings();
 
 if (isset($argv[2]) && $argv[2] === 'true') {
@@ -16,7 +12,7 @@ if (isset($argv[2]) && $argv[2] === 'true') {
 		exit($pdo->log->error("Unable to connect to usenet."));
 	}
 }
-if ($site->tablepergroup === 1) {
+if ($pdo->getSetting('tablepergroup') === 1) {
 	exit($pdo->log->error("You are using 'tablepergroup', you must use .../misc/update_scripts/nix_scripts/multiprocessing/releases.php"));
 }
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/fixReleaseNames.php b/misc/update_scripts/nix_scripts/tmux/lib/fixReleaseNames.php
index 76884688c..c065a2599 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/fixReleaseNames.php
+++ b/misc/update_scripts/nix_scripts/tmux/lib/fixReleaseNames.php
@@ -16,8 +16,6 @@ $n = "\n";
 $pdo = new Settings();
 $namefixer = new \NameFixer(['Settings' => $pdo]);
 $predb = new \PreHash(['Echo' => true, 'Settings' => $pdo]);
-$s = new Settings();
-$site = $s->get();
 
 if (isset($argv[1]) && isset($argv[2]) && isset($argv[3]) && isset($argv[4])) {
 	$update = ($argv[2] == "true") ? 1 : 2;
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg.php b/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg.php
index 60340a1a0..3ed12c55c 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg.php
+++ b/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg.php
@@ -15,9 +15,7 @@ $debug = false;
 $pdo = new Settings();
 $groups = new \Groups(['Settings' => $pdo]);
 $consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-$s = new Settings();
-$site = $s->get();
-$DoPartRepair = ($site->partrepair == '0') ? false : true;
+$DoPartRepair = ($pdo->getSetting('partrepair') == '0') ? false : true;
 
 if ((!isset($argv[1])) || $argv[1] != 'true') {
 	exit($pdo->log->error("\nMandatory argument missing\n\n"
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_truncate.php b/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_truncate.php
index a03eab198..ed5d25227 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_truncate.php
+++ b/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_truncate.php
@@ -4,8 +4,6 @@ require_once(dirname(__FILE__) . "/../../../bin/config.php");
 use newznab\db\Settings;
 
 $pdo = new Settings();
-$s = new Settings();
-$site = $s->get();
 
 if (isset($argv[1]) && ($argv[1] == "true" || $argv[1] == "drop")) {
 	$pdo->queryExec("UPDATE groups SET first_record = 0, first_record_postdate = NULL, last_record = 0, last_record_postdate = NULL, last_updated = NULL");
@@ -20,7 +18,7 @@ if (isset($argv[1]) && ($argv[1] == "true" || $argv[1] == "drop")) {
 	}
 	unset($value);
 
-	$tpg = $site->tablepergroup;
+	$tpg = $pdo->getSetting('tablepergroup');
 	$tablepergroup = (!empty($tpg)) ? $tpg : 0;
 
 	if ($tablepergroup == 1) {
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/resetdb.php b/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/resetdb.php
index d86767963..5ac4c33df 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/resetdb.php
+++ b/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/resetdb.php
@@ -57,12 +57,10 @@ foreach ($tables as $row) {
 (new \SphinxSearch())->truncateRTIndex('releases_rt');
 
 $pdo->optimise(false, 'full');
-$s = new Settings();
-$site = $s->get();
 
 echo $pdo->log->header("Deleting nzbfiles subfolders.");
 try {
-	$files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($site->nzbpath, \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::CHILD_FIRST);
+	$files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($pdo->getSetting('nzbpath'), \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::CHILD_FIRST);
 	foreach ($files as $file) {
 		if (basename($file) != '.gitignore' && basename($file) != 'tmpunrar') {
 			$todo = ($file->isDir() ? 'rmdir' : 'unlink');
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/clean_nzbs.php b/misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/clean_nzbs.php
index df03c2727..c515ae724 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/clean_nzbs.php
+++ b/misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/clean_nzbs.php
@@ -5,8 +5,6 @@ use newznab\utility\Utility;
 
 
 $pdo = new Settings();
-$s = new Settings();
-$site = $s->get();
 
 if (isset($argv[1]) && ($argv[1] === "true" || $argv[1] === "delete")) {
 	$releases = new \Releases(['Settings' => $pdo]);
@@ -17,7 +15,7 @@ if (isset($argv[1]) && ($argv[1] === "true" || $argv[1] === "delete")) {
 	$checked = $deleted = 0;
 	$couldbe = $argv[1] === "true" ? $couldbe = "could be " : "were ";
 	echo $pdo->log->header('Getting List of nzbs to check against db.');
-	$dirItr = new \RecursiveDirectoryIterator($site->nzbpath);
+	$dirItr = new \RecursiveDirectoryIterator($pdo->getSetting('nzbpath'));
 	$itr = new \RecursiveIteratorIterator($dirItr, \RecursiveIteratorIterator::LEAVES_ONLY);
 	foreach ($itr as $filePath) {
 		if (is_file($filePath) && preg_match('/([a-f-0-9]+)\.nzb\.gz/', $filePath, $guid)) {
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_fixes.php b/misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_fixes.php
index 94422eeba..fde5f1172 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_fixes.php
+++ b/misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_fixes.php
@@ -31,10 +31,8 @@ require_once(dirname(__FILE__) . "/../../../bin/config.php");
 use newznab\db\Settings;
 
 $pdo = new Settings();
-$s = new Settings();
-$site = $s->get();
 
-if (!$site->tablepergroup) {
+if (!$pdo->getSetting('tablepergroup')) {
 	exit("Tables per groups is not enabled, quitting!");
 }
 
diff --git a/misc/update_scripts/nix_scripts/tmux/run.php b/misc/update_scripts/nix_scripts/tmux/run.php
index 6bb3799b7..484e0428b 100644
--- a/misc/update_scripts/nix_scripts/tmux/run.php
+++ b/misc/update_scripts/nix_scripts/tmux/run.php
@@ -4,11 +4,9 @@ require_once dirname(__FILE__) . '/../../../../www/config.php';
 use newznab\db\Settings;
 use newznab\utility\Utility;
 
-$db = new Settings();
+$pdo = new Settings();
 $DIR = NN_TMUX;
 $c = new ColorCLI();
-$s = new Settings();
-$site = $s->get();
 $t = new Tmux();
 $tmux = $t->get();
 $patch = (isset($tmux->sqlpatch)) ? $tmux->sqlpatch : 0;
@@ -17,8 +15,8 @@ $tmux_session = (isset($tmux->tmux_session)) ? $tmux->tmux_session : 0;
 $seq = (isset($tmux->sequential)) ? $tmux->sequential : 0;
 $powerline = (isset($tmux->powerline)) ? $tmux->powerline : 0;
 $colors = (isset($tmux->colors)) ? $tmux->colors : 0;
-$nntpproxy = $site->nntpproxy;
-$tablepergroup = $site->tablepergroup;
+$nntpproxy = $pdo->getSetting('nntpproxy');
+$tablepergroup = $pdo->getSetting('tablepergroup');
 $tablepergroup = ($tablepergroup != '') ? $tablepergroup : 0;
 
 Utility::clearScreen();
@@ -48,7 +46,7 @@ if (count($session) !== 0) {
 	exit($pdo->log->error("tmux session: '" . $tmux_session . "' is already running, aborting.\n"));
 }
 
-$nntpproxy = $site->nntpproxy;
+$nntpproxy = $pdo->getSetting('nntpproxy');
 if ($nntpproxy == '1') {
 	$modules = ["nntp", "socketpool"];
 	foreach ($modules as &$value) {
@@ -72,15 +70,6 @@ function writelog($pane)
 	}
 }
 
-//remove folders from tmpunrar
-if (isset($site->tmpunrarpath)) {
-	$tmpunrar = $site->tmpunrarpath;
-	if ((count(glob("$tmpunrar/*", GLOB_ONLYDIR))) > 0) {
-		echo $c->info("Removing dead folders from " . $tmpunrar);
-		exec("rm -r " . $tmpunrar . "/*");
-	}
-}
-
 function command_exist($cmd)
 {
 	$returnVal = exec("which $cmd 2>/dev/null");
@@ -102,12 +91,12 @@ function python_module_exist($module)
 	return ($returnCode == 0 ? true : false);
 }
 
-$nntpproxy = $site->nntpproxy;
+$nntpproxy = $pdo->getSetting('nntpproxy');
 if ($nntpproxy == '1') {
 	$modules = array("nntp", "socketpool");
 	foreach ($modules as &$value) {
 		if (!python_module_exist($value)) {
-			exit($db->log->error("\nNNTP Proxy requires " . $value . " python module but it's not installed. Aborting.\n"));
+			exit($pdo->log->error("\nNNTP Proxy requires " . $value . " python module but it's not installed. Aborting.\n"));
 		}
 	}
 }
@@ -164,8 +153,8 @@ function start_apps($tmux_session)
 
 function window_proxy($tmux_session, $window)
 {
-	global $site;
-	$nntpproxy = $site->nntpproxy;
+	global $pdo;
+	$nntpproxy = $pdo->getSetting('nntpproxy');
 	if ($nntpproxy === '1') {
 		$DIR = NN_MISC;
 		$nntpproxypy = $DIR . "update_scripts/nix_scripts/tmux/python/nntpproxy.py";
diff --git a/misc/update_scripts/update_database_version.php b/misc/update_scripts/update_database_version.php
index d1c47868e..fae9dfaf4 100644
--- a/misc/update_scripts/update_database_version.php
+++ b/misc/update_scripts/update_database_version.php
@@ -4,7 +4,7 @@ require_once("config.php");
 
 use newznab\db\Settings;
 
-$s = new Settings();
+$s = new Sites();
 $site = $s->get();
 $patches = $s->getUnappliedPatches($site);