Update value fetching and autoloading

This commit is contained in:
DariusIII
2017-09-01 12:48:07 +02:00
parent f062b5ec48
commit 3fb73e18b3
4 changed files with 5 additions and 7 deletions
+1
View File
@@ -1,4 +1,5 @@
2017-09-01 DariusIII
* Chg: Update value fetching and autoloading
* Chg: Update database connection settings
* Chg: Update Movie class
* Chg: Remove now unused nntmux/db/Settings class
+2 -2
View File
@@ -215,8 +215,8 @@ class Settings extends Model
{
$setting = self::settingToArray($setting);
$result = self::query()->where([
'section' => $setting['section'],
'subsection' => $setting['subsection'],
'section' => $setting['section'] ?? '',
'subsection' => $setting['subsection'] ?? '',
'name' => $setting['name'],
])->value('value');
+1 -2
View File
@@ -3,6 +3,7 @@
require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'nntmux'.DIRECTORY_SEPARATOR.'constants.php';
require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'nntmux'.DIRECTORY_SEPARATOR.'bootstrap.php';
require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'nntmux.php';
require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
require_once __DIR__.DIRECTORY_SEPARATOR.'yenc.php';
require __DIR__.DIRECTORY_SEPARATOR.'app.php';
@@ -20,6 +21,4 @@ if (! defined('NN_ROOT')) {
define('NN_ROOT', dirname(NN_APP_PATH, 2));
}
require_once NN_ROOT.DS.'vendor'.DS.'autoload.php';
$app->make(Kernel::class)->bootstrap();
+1 -3
View File
@@ -117,7 +117,7 @@ class DB extends \PDO
'dbname' => env('DB_NAME', 'nntmux'),
'dbpass' => env('DB_PASSWORD', 'nntmux'),
'dbport' => env('DB_PORT', '3306'),
'dbsock' => env('DB_SOCKET'),
'dbsock' => env('DB_SOCKET', ''),
'dbtype' => env('DB_SYSTEM', 'mysql'),
'dbuser' => env('DB_USER', 'nntmux'),
'log' => new ColorCLI(),
@@ -172,8 +172,6 @@ class DB extends \PDO
if (defined('NN_SQL_DELETE_QUICK') && NN_SQL_DELETE_QUICK) {
$this->DELETE_QUICK = ' QUICK ';
}
return $this->pdo;
}
public function __destruct()