From 0a5fdbbffae5866b718f3e820a652804eb0b3de4 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Mon, 26 Jul 2021 22:04:12 +0300
Subject: [PATCH] move DBConnection class to separate file

---
 src/includes/class.dbconnection.php | 51 +++++++++++++++++++++++++++++
 src/includes/common.php             | 47 --------------------------
 src/init.php                        |  1 +
 src/setup.php                       | 11 ++++---
 4 files changed, 58 insertions(+), 52 deletions(-)
 create mode 100644 src/includes/class.dbconnection.php

diff --git a/src/includes/class.dbconnection.php b/src/includes/class.dbconnection.php
new file mode 100644
index 0000000..b29bcc8
--- /dev/null
+++ b/src/includes/class.dbconnection.php
@@ -0,0 +1,51 @@
+<?php
+
+
+class DBConnection
+{
+	protected static $instance;
+
+	public static function init(Database_Abstract $instance) : Database_Abstract
+	{
+		self::$instance = $instance;
+		return $instance;
+	}
+
+	public static function instance() : Database_Abstract
+	{
+        if (!isset(self::$instance)) {
+			throw new Exception("DBConnection is not initialized");
+        }
+		return self::$instance;
+	}
+
+	public static function setPrefix($prefix)
+	{
+		$db = self::instance();
+		$db->prefix = $prefix;
+	}
+}
+
+abstract class Database_Abstract
+{
+	var $lastQuery = null;
+	var $prefix = '';
+	abstract function connect($params);
+	abstract function sq($query, $p = NULL);
+	abstract function sqa($query, $p = NULL);
+	abstract function dq($query, $p = NULL) : DatabaseResult_Abstract;
+	abstract function ex($query, $p = NULL);
+	abstract function affected();
+	abstract function quote($s);
+	abstract function quoteForLike($format, $s);
+	abstract function lastInsertId($name = null);
+	abstract function tableExists($table);
+}
+
+abstract class DatabaseResult_Abstract
+{
+	abstract function fetchRow();
+	abstract function fetchAssoc();
+}
+
+?>
\ No newline at end of file
diff --git a/src/includes/common.php b/src/includes/common.php
index b178d98..3e7fbe6 100644
--- a/src/includes/common.php
+++ b/src/includes/common.php
@@ -111,51 +111,4 @@ function generateUUID()
     );
 }
 
-class DBConnection
-{
-	protected static $instance;
-
-	public static function init(Database_Abstract $instance) : Database_Abstract
-	{
-		self::$instance = $instance;
-		return $instance;
-	}
-
-	public static function instance() : Database_Abstract
-	{
-        if (!isset(self::$instance)) {
-			throw new Exception("DBConnection is not initialized");
-        }
-		return self::$instance;
-	}
-
-	public static function setPrefix($prefix)
-	{
-		$db = self::instance();
-		$db->prefix = $prefix;
-	}
-}
-
-abstract class Database_Abstract
-{
-	var $lastQuery = null;
-	var $prefix = '';
-	abstract function connect($params);
-	abstract function sq($query, $p = NULL);
-	abstract function sqa($query, $p = NULL);
-	abstract function dq($query, $p = NULL) : DatabaseResult_Abstract;
-	abstract function ex($query, $p = NULL);
-	abstract function affected();
-	abstract function quote($s);
-	abstract function quoteForLike($format, $s);
-	abstract function lastInsertId($name = null);
-	abstract function tableExists($table);
-}
-
-abstract class DatabaseResult_Abstract
-{
-	abstract function fetchRow();
-	abstract function fetchAssoc();
-}
-
 ?>
\ No newline at end of file
diff --git a/src/init.php b/src/init.php
index 4ac744f..647edae 100644
--- a/src/init.php
+++ b/src/init.php
@@ -31,6 +31,7 @@ else {
 }
 
 require_once(MTTINC. 'common.php');
+require_once(MTTINC. 'class.dbconnection.php');
 require_once(MTTINC. 'class.config.php');
 require_once(MTTPATH. 'db/config.php');
 
diff --git a/src/setup.php b/src/setup.php
index c6d5179..aa56a3c 100644
--- a/src/setup.php
+++ b/src/setup.php
@@ -10,7 +10,7 @@ set_exception_handler('myExceptionHandler');
 
 # Check old config file (prior v1.3)
 require_once('./db/config.php');
-if(!isset($config['db']))
+if (!isset($config['db']))
 {
 	if(isset($config['mysql'])) {
 		$config['db'] = 'mysql';
@@ -24,7 +24,7 @@ if(!isset($config['db']))
 	if(isset($config['allow']) && $config['allow'] == 'read') $config['allowread'] = 1;
 }
 
-if($config['db'] != '')
+if ($config['db'] != '')
 {
 	require_once('./init.php');
 	if ( !is_logged() )
@@ -36,9 +36,10 @@ if($config['db'] != '')
 }
 else
 {
-	if(!defined('MTTPATH')) define('MTTPATH', dirname(__FILE__) .'/');
-	if(!defined('MTTINC'))  define('MTTINC', MTTPATH. 'includes/');
+	if (!defined('MTTPATH')) define('MTTPATH', dirname(__FILE__) .'/');
+	if (!defined('MTTINC'))  define('MTTINC', MTTPATH. 'includes/');
 	require_once(MTTINC. 'common.php');
+	require_once(MTTINC. 'class.dbconnection.php');
 	require_once(MTTINC. 'class.config.php');
 	Config::loadConfig($config);
 	unset($config);
@@ -54,7 +55,7 @@ echo "<big><b>myTinyTodo @VERSION Setup</b></big><br><br>";
 # determine current installed version
 $ver = get_ver($db, $dbtype);
 
-if(!$ver)
+if (!$ver)
 {
 	# Which DB to select
 	if(!isset($_POST['installdb']) && !isset($_POST['install']))