From 70d4bdda62307757ce8a5bc7d5dd8ffecae3849b Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Wed, 19 Dec 2018 14:24:24 +0100
Subject: [PATCH] Update tmux related files and classes

---
 Blacklight/Tmux.php          | 16 ----------------
 Changelog                    |  4 +++-
 config/nntmux.php            |  2 ++
 misc/update/tmux/monitor.php |  4 ++--
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Blacklight/Tmux.php b/Blacklight/Tmux.php
index a7587495a..d43756074 100755
--- a/Blacklight/Tmux.php
+++ b/Blacklight/Tmux.php
@@ -142,7 +142,6 @@ class Tmux
 					(%1\$s 'sequential') AS sequential,
 					(%1\$s 'tmux_session') AS tmux_session,
 					(%1\$s 'run_ircscraper') AS run_ircscraper,
-					(%1\$s 'sqlpatch') AS sqlpatch,
 					(%1\$s 'alternate_nntp') AS alternate_nntp,
 					(%1\$s 'delaytime') AS delaytime",
             $settstr
@@ -224,21 +223,6 @@ class Tmux
         return $sql;
     }
 
-    /**
-     * @param $rows
-     *
-     * @return \stdClass
-     */
-    public function rows2Object($rows): \stdClass
-    {
-        $obj = new \stdClass;
-        foreach ($rows as $row) {
-            $obj->{$row['setting']} = $row['value'];
-        }
-
-        return $obj;
-    }
-
     /**
      * @param $setting
      * @param $value
diff --git a/Changelog b/Changelog
index 9facf6350..017f64dd0 100755
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
+2018-12-19 DariusIII
+	* Chg: Update tmux related files and classes
+        * Chg: Remove Versions classes and all related data
 2018-12-18 DariusIII
-	* Chg: Remove Versions classes and all related data
 	* Chg: Update configuration files
 	* Chg: Add back logoutOtherDevices Auth function
 	* Chg: Make login page prettier
diff --git a/config/nntmux.php b/config/nntmux.php
index 5f4ebe0ac..c1ea12ad4 100644
--- a/config/nntmux.php
+++ b/config/nntmux.php
@@ -1,6 +1,8 @@
 <?php
 
 return [
+    'db_name' => env('DB_NAME', 'nntmux'),
+    'db_system' => env('DB_SYSTEM', 'mysql'),
     'items_per_page' => env('ITEMS_PER_PAGE', 50),
     'items_per_cover_page' => env('ITEMS_PER_COVER_PAGE', 20),
     'max_pager_results' => env('MAX_PAGER_RESULTS', 125000),
diff --git a/misc/update/tmux/monitor.php b/misc/update/tmux/monitor.php
index dffe1c90a..ede278435 100644
--- a/misc/update/tmux/monitor.php
+++ b/misc/update/tmux/monitor.php
@@ -29,8 +29,8 @@ $runVar['paths']['misc'] = NN_MISC;
 $runVar['paths']['cli'] = NN_ROOT.'cli/';
 $runVar['paths']['scraper'] = NN_MISC.'IRCScraper'.DS.'scrape.php';
 
-$db_name = env('DB_NAME', 'nntmux');
-$dbtype = env('DB_SYSTEM', 'mysql');
+$db_name = config('nntmux.db_name');
+$dbtype = config('nntmux.db_system');
 
 $tmux_niceness = Settings::settingValue('site.tmux.niceness') ?? 2;