install

include/core.php

@@ -2,8 +2,12 @@
 if(!defined('IN_TRACKER')) {
     die('Hacking attempt!');
 }
+if (!file_exists($rootpath . '.env')) {
+    header('Location: ' . getBaseUrl() . '/install/install.php');
+    exit(0);
+}
 error_reporting(E_ALL);
-ini_set('display_errors', 1);
+ini_set('display_errors', 0);
 if (!empty($_SERVER['HTTP_X_REQUEST_ID'])) {
     define('REQUEST_ID', $_SERVER['HTTP_X_REQUEST_ID']);
 } else {
@@ -12,13 +16,8 @@ if (!empty($_SERVER['HTTP_X_REQUEST_ID'])) {
 define('ROOT_PATH', $rootpath);
 define('VERSION_NUMBER', '1.6.0');
 define('IS_ANNOUNCE', (basename($_SERVER['SCRIPT_FILENAME']) == 'announce.php'));
-
-require $rootpath . 'include/database/interface_db.php';
-require $rootpath . 'include/database/class_db_mysqli.php';
-require $rootpath . 'include/database/class_db.php';
-require $rootpath . 'include/database/helpers.php';
-require $rootpath . 'include/database/class_exception.php';
-
+require $rootpath . 'vendor/autoload.php';
+require $rootpath . 'nexus/Database/helpers.php';
 require $rootpath . 'classes/class_advertisement.php';
 require $rootpath . 'classes/class_cache_redis.php';
 require $rootpath . 'include/config.php';
@@ -52,5 +51,3 @@ define ("UC_SYSOP",15);
 define ("UC_STAFFLEADER",16);
 ignore_user_abort(1);
 @set_time_limit(60);
-
-require dirname(__DIR__) . '/vendor/autoload.php';

include/database/class_db.php

@@ -1,134 +0,0 @@
-<?php
-
-class DB
-{
-    private $driver;
-
-    private static $instance;
-
-    private static $queries = [];
-
-    private $isConnected = false;
-
-    private function __construct()
-    {
-
-    }
-
-    private function __clone()
-    {
-
-    }
-
-    public function setDriver(DBInterface $driver)
-    {
-        $this->driver = $driver;
-
-        return $this;
-    }
-
-    public static function getInstance()
-    {
-        if (self::$instance) {
-            return self::$instance;
-        }
-        $instance = new self;
-        $driver = new DBMysqli();
-        $instance->setDriver($driver);
-        return self::$instance = $instance;
-    }
-
-
-    public function connect($host, $username, $password, $database, $port)
-    {
-        if (!$this->isConnected) {
-            $this->driver->connect($host, $username, $password, $database, $port);
-            $this->isConnected = true;
-        }
-        return true;
-    }
-
-    public function query(string $sql)
-    {
-        try {
-            return $this->driver->query($sql);
-        } catch (\Exception $e) {
-            do_log(sprintf("%s [%s] %s", $e->getMessage(), $sql, $e->getTraceAsString()));
-            throw new \DatabaseException($sql, $e->getMessage());
-        }
-
-    }
-
-    public function error()
-    {
-        return $this->driver->error();
-    }
-
-    public function errno()
-    {
-        return $this->driver->errno();
-    }
-
-    public function numRows($result)
-    {
-        return $this->driver->numRows($result);
-    }
-
-    public function select_db($database)
-    {
-        return $this->driver->selectDb($database);
-    }
-
-    public function fetchAssoc($result)
-    {
-        return $this->driver->fetchAssoc($result);
-    }
-
-    public function fetchRow($result)
-    {
-        return $this->driver->fetchRow($result);
-    }
-
-    public function fetchArray($result, $type = null)
-    {
-        return $this->driver->fetchArray($result, $type);
-    }
-
-    public function affectedRows()
-    {
-        return $this->driver->affectedRows();
-    }
-
-    public function escapeString(string $string)
-    {
-        return $this->driver->escapeString($string);
-    }
-
-    public function lastInsertId()
-    {
-        return $this->driver->lastInsertId();
-    }
-
-    public function freeResult($result)
-    {
-        return $this->driver->freeResult($result);
-    }
-
-    public function isConnected()
-    {
-        return $this->isConnected;
-    }
-
-    public static function insert($table, $data)
-    {
-        if (empty($table) || empty($data) || !is_array($data)) {
-            throw new DatabaseException("require table and data(array).");
-        }
-        $fields = array_map(function ($value) {return "`$value`";}, array_keys($data));
-        $values = array_map(function ($value) {return sqlesc($value);}, array_values($data));
-        $sql = sprintf("insert into `%s` (%s) values (%s)", $table, implode(', ', $fields), implode(', ', $values));
-        sql_query($sql);
-        return mysql_insert_id();
-    }
-
-}

include/database/class_db_mysqli.php

@@ -1,84 +0,0 @@
-<?php
-
-class DBMysqli implements DBInterface
-{
-    private $mysqli;
-
-    public function connect($host, $username, $password, $database, $port)
-    {
-        $mysqli = new mysqli($host, $username, $password, $database, $port);
-        /* check connection */
-        if (mysqli_connect_errno()) {
-            throw new \DatabaseException('', mysqli_connect_error());
-        }
-        /* activate reporting */
-        $driver = new mysqli_driver();
-        $driver->report_mode = MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX;
-
-        return $this->mysqli = $mysqli;
-    }
-
-    public function query(string $sql)
-    {
-        return $this->mysqli->query($sql);
-    }
-
-    public function error(): string
-    {
-        return $this->mysqli->error;
-    }
-
-    public function errno(): int
-    {
-        return $this->mysqli->errno;
-    }
-
-    public function numRows($mysqliResult): int
-    {
-        return $mysqliResult->num_rows;
-    }
-
-    public function selectDb($database)
-    {
-        return $this->mysqli->select_db($database);
-    }
-
-    public function fetchAssoc($mysqliResult)
-    {
-        return $mysqliResult->fetch_assoc();
-    }
-
-    public function fetchRow($mysqliResult)
-    {
-        return $mysqliResult->fetch_row();
-    }
-
-    public function fetchArray($mysqliResult, $type)
-    {
-        if (is_null($type)) {
-            $type = MYSQLI_BOTH;
-        }
-        return $mysqliResult->fetch_array($type);
-    }
-
-    public function affectedRows(): int
-    {
-        return $this->mysqli->affected_rows;
-    }
-
-    public function escapeString(string $string): string
-    {
-        return $this->mysqli->real_escape_string($string);
-    }
-
-    public function lastInsertId(): int
-    {
-        return $this->mysqli->insert_id;
-    }
-
-    public function freeResult($mysqliResult)
-    {
-        return $mysqliResult->free_result();
-    }
-
-}

include/database/class_exception.php

@@ -1,11 +0,0 @@
-<?php
-
-class DatabaseException extends \Exception
-{
-
-    public function __construct($query, $message)
-    {
-        parent::__construct("$message [$query]");
-    }
-
-}

include/database/helpers.php

@@ -1,66 +0,0 @@
-<?php
-
-function mysql_connect($host, $username, $password, $database, $port)
-{
-    return DB::getInstance()->connect($host, $username, $password, $database, $port);
-}
-
-function mysql_errno()
-{
-    return DB::getInstance()->errno();
-}
-
-function mysql_error()
-{
-    return DB::getInstance()->error();
-}
-
-function mysql_query(string $sql)
-{
-    return DB::getInstance()->query($sql);
-}
-
-function mysql_select_db($database)
-{
-    return DB::getInstance()->select_db($database);
-}
-
-function mysql_num_rows($result)
-{
-    return DB::getInstance()->numRows($result);
-}
-
-function mysql_fetch_array($result, $type = null)
-{
-    return DB::getInstance()->fetchArray($result, $type);
-}
-
-function mysql_fetch_assoc($result)
-{
-    return DB::getInstance()->fetchAssoc($result);
-}
-
-function mysql_fetch_row($result)
-{
-    return DB::getInstance()->fetchRow($result);
-}
-
-function mysql_affected_rows()
-{
-    return DB::getInstance()->affectedRows();
-}
-
-function mysql_real_escape_string($string)
-{
-    return DB::getInstance()->escapeString($string);
-}
-
-function mysql_insert_id()
-{
-    return DB::getInstance()->lastInsertId();
-}
-
-function mysql_free_result($result)
-{
-    return DB::getInstance()->freeResult($result);
-}

include/database/interface_db.php

@@ -1,31 +0,0 @@
-<?php
-
-interface DBInterface
-{
-    public function connect($host, $username, $password, $database, $port);
-
-    public function query(string $sql);
-
-    public function error(): string;
-
-    public function errno(): int;
-
-    public function numRows($result): int;
-
-    public function selectDb($database);
-
-    public function fetchAssoc($result);
-
-    public function fetchRow($result);
-
-    public function fetchArray($result, $type);
-
-    public function affectedRows(): int;
-
-    public function escapeString(string $string): string;
-
-    public function lastInsertId(): int;
-
-    public function freeResult($result);
-
-}

include/functions.php

@@ -1752,17 +1752,7 @@ function getExportedValue($input,$t = null) {
 
 function dbconn($autoclean = false, $doLogin = true)
 {
-    if (DB::getInstance()->isConnected()) {
-        return;
-    }
-	$config = config('database.mysql');
-	if (!mysql_connect($config['host'], $config['username'], $config['password'], $config['database'], $config['port']))
-	{
-        die("[" . mysql_errno() . "] dbconn: mysql_connect: " . mysql_error());
-	}
-	mysql_query("SET NAMES UTF8");
-	mysql_query("SET collation_connection = 'utf8_general_ci'");
-	mysql_query("SET sql_mode=''");
+    \Nexus\Database\DB::getInstance()->autoConnect();
 
 	if ($doLogin) {
         userlogin();