prehistoric-systems/mytinytodo
1
0
Fork 0
mirror of https://github.com/maxpozdeev/mytinytodo.git synced 2026-03-11 08:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move DBConnection class to separate file

Browse source
This commit is contained in:
Max Pozdeev 2021-07-26 22:04:12 +03:00
parent 145b58f7cf
commit 0a5fdbbffa
4 changed files with 58 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/includes/class.dbconnection.php Normal file
View file

@ -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();
}
?>

47
src/includes/common.php
View file

@ -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();
}
?>

1
src/init.php
View file

@ -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');

11
src/setup.php
View file

@ -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']))