starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use laravel helpers file and replace getenv with env function

Browse Source
This commit is contained in:
DariusIII
2017-06-07 22:57:00 +02:00
parent ab1594f5ad
commit 9af3abdc46
14 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changelog
+1
View File
@@ -1,4 +1,5 @@
2017-06-06 DariusIII
* Chg: Use laravel helpers file and replace getenv with env function
* Chg: Update composer.lock
2017-06-05 DariusIII
* Chg: Update minimum MariaDB version to 10.1
app/config/bootstrap/connections.php
+7 -7
View File
@@ -89,7 +89,7 @@ if (!defined('NN_INSTALLER')) {
);
}
switch (getenv('DB_SYSTEM')) {
switch (env('DB_SYSTEM')) {
case 'mysql':
$adapter = 'MySql';
break;
@@ -101,10 +101,10 @@ if (!defined('NN_INSTALLER')) {
}
if (isset($adapter)) {
if (empty(getenv('DB_SOCKET'))) {
$host = empty(getenv('DB_PORT')) ? getenv('DB_HOST') : getenv('DB_HOST') . ':' . getenv('DB_PORT');
if (empty(env('DB_SOCKET'))) {
$host = empty(env('DB_PORT')) ? env('DB_HOST') : env('DB_HOST') . ':' . env('DB_PORT');
} else {
$host = getenv('DB_SOCKET');
$host = env('DB_SOCKET');
}
Connections::add('default',
@@ -112,9 +112,9 @@ if (!defined('NN_INSTALLER')) {
'type' => 'database',
'adapter' => $adapter,
'host' => $host,
'login' => getenv('DB_USER'),
'password' => getenv('DB_PASSWORD'),
'database' => getenv('DB_NAME'),
'login' => env('DB_USER', 'nntmux'),
'password' => env('DB_PASSWORD', 'nntmux'),
'database' => env('DB_NAME', 'nntmux'),
'encoding' => 'UTF-8',
'persistent' => false,
]
cli/verify_permissions.php
+1 -1
View File
@@ -58,7 +58,7 @@ foreach (['anime', 'audio', 'audiosample', 'book', 'console', 'games', 'movies',
}
// Set up covers paths.
if (getenv('DB_PASSWORD') !== '') {
if (env('DB_PASSWORD') !== '') {
$ri = new ReleaseImage();
$folders[$ri->audSavePath] = [R, W];
composer.json
+3
View File
@@ -5,6 +5,9 @@
}
],
"autoload": {
"files": [
"app/libraries/laravel/framework/src/Illuminate/Support/helpers.php"
],
"psr-4": {
"nntmux\\": "nntmux/"
},
misc/testing/DB/check_unique_indexes.php
+4 -4
View File
@@ -53,7 +53,7 @@ if ($handle) {
if (trim($match['table']) === 'collections') {
$tables = $pdo->query("SHOW TABLES");
foreach ($tables as $row) {
$tbl = $row['tables_in_' . getenv('DB_NAME')];
$tbl = $row['tables_in_' . env('DB_NAME')];
if (preg_match('/collections_\d+/', $tbl)) {
$check = $pdo->checkColumnIndex($tbl, $column);
if (!isset($check_collections['key_name'])) {
@@ -67,7 +67,7 @@ if ($handle) {
} else if (trim($match['table']) === 'binaries') {
$tables = $pdo->query("SHOW TABLES");
foreach ($tables as $row) {
$tbl = $row['tables_in_' . getenv('DB_NAME')];
$tbl = $row['tables_in_' . env('DB_NAME')];
if (preg_match('/binaries_\d+/', $tbl)) {
$checkBinaries = $pdo->checkColumnIndex($tbl, $column);
if (!isset($checkBinaries['key_name'])) {
@@ -81,7 +81,7 @@ if ($handle) {
} else if (trim($match['table']) === 'parts') {
$tables = $pdo->query("SHOW TABLES");
foreach ($tables as $row) {
$tbl = $row['tables_in_' . getenv('DB_NAME')];
$tbl = $row['tables_in_' . env('DB_NAME')];
if (preg_match('/parts_\d+/', $tbl)) {
$checkParts = $pdo->checkColumnIndex($tbl, $column);
if (!isset($checkParts['key_name'])) {
@@ -95,7 +95,7 @@ if ($handle) {
} else if (trim($match['table']) === 'missed_parts') {
$tables = $pdo->query("SHOW TABLES");
foreach ($tables as $row) {
$tbl = $row['tables_in_' . getenv('DB_NAME')];
$tbl = $row['tables_in_' . env('DB_NAME')];
if (preg_match('/partrepair_\d+/', $tbl)) {
$checkPartRepair = $pdo->checkColumnIndex($tbl, $column);
if (!isset($checkPartRepair['key_name'])) {
misc/testing/DB/mysqldump_tables.php
+15 -15
View File
@@ -32,14 +32,14 @@ function builddefaultsfile()
//generate file contents
$filetext = "[mysqldump]"
."\n"
."user = " . getenv('DB_USER')
."user = " . env('DB_USER')
."\n"
."password = " . getenv('DB_PASSWORD')
."password = " . env('DB_PASSWORD')
."\n[mysql]"
."\n"
."user = " . getenv('DB_USER')
."user = " . env('DB_USER')
."\n"
."password = " . getenv('DB_PASSWORD');
."password = " . env('DB_PASSWORD');
$filehandle = fopen("mysql-defaults.txt", "w+");
if(!$filehandle) {
@@ -51,14 +51,14 @@ function builddefaultsfile()
}
}
$dbhost = getenv('DB_HOST');
$dbport = getenv('DB_PORT');
$dbsocket = getenv('DB_SOCKET');
$dbuser = getenv('DB_USER');
$dbpass = getenv('DB_PASSWORD');
$dbname = getenv(getenv('DB_NAME'));
$dbhost = env('DB_HOST');
$dbport = env('DB_PORT');
$dbsocket = env('DB_SOCKET');
$dbuser = env('DB_USER');
$dbpass = env('DB_PASSWORD');
$dbname = env(env('DB_NAME'));
if (getenv('DB_SOCKET') !== '') {
if (env('DB_SOCKET') !== '') {
$use = "-S $dbsocket";
} else {
$use = "-P$dbport";
@@ -88,7 +88,7 @@ if((isset($argv[1]) && $argv[1] == "db") && (isset($argv[2]) && $argv[2] == "dum
$sql = "SHOW tables";
$tables = $pdo->query($sql);
foreach($tables as $row) {
$tbl = $row['Tables_in_'. getenv('DB_NAME')];
$tbl = $row['Tables_in_'. env('DB_NAME')];
$filename = $argv[3]."/".$tbl.".gz";
echo $pdo->log->header("Dumping $tbl.");
if (file_exists($filename)) {
@@ -102,7 +102,7 @@ if((isset($argv[1]) && $argv[1] == "db") && (isset($argv[2]) && $argv[2] == "dum
$tables = $pdo->query($sql);
$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
foreach($tables as $row) {
$tbl = $row['Tables_in_'.getenv('DB_NAME')];
$tbl = $row['Tables_in_'.env('DB_NAME')];
$filename = $argv[3]."/".$tbl.".gz";
if (file_exists($filename)) {
echo $pdo->log->header("Restoring $tbl.");
@@ -138,7 +138,7 @@ if((isset($argv[1]) && $argv[1] == "db") && (isset($argv[2]) && $argv[2] == "dum
$sql = "SHOW tables";
$tables = $pdo->query($sql);
foreach($tables as $row) {
$tbl = $row['Tables_in_'.getenv('DB_NAME')];
$tbl = $row['Tables_in_'.env('DB_NAME')];
$filename = $argv[3].$tbl.".csv";
echo $pdo->log->header("Dumping $tbl.");
if (file_exists($filename)) {
@@ -151,7 +151,7 @@ if((isset($argv[1]) && $argv[1] == "db") && (isset($argv[2]) && $argv[2] == "dum
$tables = $pdo->query($sql);
$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
foreach($tables as $row) {
$tbl = $row['Tables_in_'.getenv('DB_NAME')];
$tbl = $row['Tables_in_'.env('DB_NAME')];
$filename = $argv[3].$tbl.".csv";
if (file_exists($filename)) {
echo $pdo->log->header("Restoring $tbl.");
misc/testing/DB/rename_to_lower.php
+1 -1
View File
@@ -27,7 +27,7 @@ if ($argc == 1 || $argv[1] != 'true') {
exit($pdo->log->error("\nThis script will rename every table column to lowercase that is not already lowercase.\nTo run:\nphp $argv[0] true\n"));
}
$database = getenv('DB_NAME');
$database = env('DB_NAME');
$count = 0;
$list = $pdo->query("SELECT TABLE_NAME, COLUMN_NAME, UPPER(COLUMN_TYPE), EXTRA FROM information_schema.columns WHERE table_schema = '" . $database . "'");
misc/testing/DB/show_table_sizes.php
+1 -1
View File
@@ -20,7 +20,7 @@ $table_data = "SELECT TABLE_NAME AS 'Table', TABLE_ROWS AS 'Rows', "
. "((INDEX_LENGTH) / POWER(1024,2)) AS 'index', "
. "((DATA_FREE) / POWER(1024,2)) AS 'free', "
. "((DATA_LENGTH + INDEX_LENGTH) / POWER(1024,2)) AS 'total' "
. "FROM information_schema.TABLES WHERE information_schema.TABLES.table_schema = '" . getenv('DB_NAME') . "' "
. "FROM information_schema.TABLES WHERE information_schema.TABLES.table_schema = '" . env('DB_NAME') . "' "
. "ORDER BY (DATA_LENGTH + INDEX_LENGTH) DESC";
$run = $pdo->queryDirect($table_data);
misc/update/nix/tmux/monitor.php
+2 -2
View File
@@ -18,8 +18,8 @@ $runVar['paths']['misc'] = NN_MISC;
$runVar['paths']['cli'] = NN_ROOT . 'cli/';
$runVar['paths']['scraper'] = NN_MISC . 'IRCScraper' . DS . 'scrape.php';
$db_name = getenv('DB_NAME');
$dbtype = getenv('DB_SYSTEM');
$db_name = env('DB_NAME');
$dbtype = env('DB_SYSTEM');
$tmux = $tRun->get('niceness');
$tmux_niceness = $tmux->niceness ?? 2;
nntmux/NNTP.php
+16 -16
View File
@@ -148,7 +148,7 @@ class NNTP extends \Net_NNTP_Client
public function doConnect($compression = true, $alternate = false)
{
if (// (Alternate is wanted, AND current server is alt, OR Alternate is not wanted AND current is main.) AND
(($alternate && $this->_currentServer === getenv('NNTP_SERVER_A')) || (!$alternate && $this->_currentServer === getenv('NNTP_SERVER'))) &&
(($alternate && $this->_currentServer === env('NNTP_SERVER_A')) || (!$alternate && $this->_currentServer === env('NNTP_SERVER'))) &&
// Don't reconnect to usenet if:
// We are already connected to usenet.
parent::_isConnected()
@@ -163,19 +163,19 @@ class NNTP extends \Net_NNTP_Client
// Set variables to connect based on if we are using the alternate provider or not.
if (!$alternate) {
$sslEnabled = getenv('NNTP_SSLENABLED') ? true : false;
$this->_currentServer = getenv('NNTP_SERVER');
$this->_currentPort = getenv('NNTP_PORT');
$userName = getenv('NNTP_USERNAME');
$password = getenv('NNTP_PASSWORD');
$socketTimeout = !empty(getenv('NNTP_SOCKET_TIMEOUT')) ? getenv('NNTP_SOCKET_TIMEOUT') : $this->_socketTimeout;
$sslEnabled = env('NNTP_SSLENABLED') ? true : false;
$this->_currentServer = env('NNTP_SERVER');
$this->_currentPort = env('NNTP_PORT');
$userName = env('NNTP_USERNAME');
$password = env('NNTP_PASSWORD');
$socketTimeout = !empty(env('NNTP_SOCKET_TIMEOUT')) ? env('NNTP_SOCKET_TIMEOUT') : $this->_socketTimeout;
} else {
$sslEnabled = getenv('NNTP_SSLENABLED_A') ? true : false;
$this->_currentServer = getenv('NNTP_SERVER_A');
$this->_currentPort = getenv('NNTP_PORT_A');
$userName = getenv('NNTP_USERNAME_A');
$password = getenv('NNTP_PASSWORD_A');
$socketTimeout = !empty(getenv('NNTP_SOCKET_TIMEOUT_A')) ? getenv('NNTP_SOCKET_TIMEOUT_A') : $this->_socketTimeout;
$sslEnabled = env('NNTP_SSLENABLED_A') ? true : false;
$this->_currentServer = env('NNTP_SERVER_A');
$this->_currentPort = env('NNTP_PORT_A');
$userName = env('NNTP_USERNAME_A');
$password = env('NNTP_PASSWORD_A');
$socketTimeout = !empty(env('NNTP_SOCKET_TIMEOUT_A')) ? env('NNTP_SOCKET_TIMEOUT_A') : $this->_socketTimeout;
}
$enc = ($sslEnabled ? ' (ssl)' : ' (non-ssl)');
@@ -581,7 +581,7 @@ class NNTP extends \Net_NNTP_Client
if ($alternate === true) {
if ($aConnected === false) {
// Check if the current connected server is the alternate or not.
if ($this->_currentServer === getenv('NNTP_SERVER')) {
if ($this->_currentServer === env('NNTP_SERVER')) {
// It's the main so connect to the alternate.
$aConnected = $nntp->doConnect(true, true);
} else {
@@ -1483,13 +1483,13 @@ class NNTP extends \Net_NNTP_Client
$retVal = true;
} else {
switch ($this->_currentServer) {
case getenv('NNTP_SERVER'):
case env('NNTP_SERVER'):
if (is_resource($this->_socket)) {
$this->doQuit(true);
}
$retVal = $this->doConnect();
break;
case getenv('NNTP_SERVER_A'):
case env('NNTP_SERVER_A'):
if (is_resource($this->_socket)) {
$this->doQuit(true);
}
nntmux/Tmux.php
+4 -4
View File
@@ -90,12 +90,12 @@ class Tmux
public function getConnectionsInfo($constants)
{
$runVar['connections']['port_a'] = $runVar['connections']['host_a'] = $runVar['connections']['ip_a'] = false;
$runVar['connections']['port'] = getenv('NNTP_PORT');
$runVar['connections']['host'] = getenv('NNTP_SERVER');
$runVar['connections']['port'] = env('NNTP_PORT');
$runVar['connections']['host'] = env('NNTP_SERVER');
$runVar['connections']['ip'] = gethostbyname($runVar['connections']['host']);
if ($constants['alternate_nntp'] === '1') {
$runVar['connections']['port_a'] = getenv('NNTP_PORT_A');
$runVar['connections']['host_a'] = getenv('NNTP_SERVER_A');
$runVar['connections']['port_a'] = env('NNTP_PORT_A');
$runVar['connections']['host_a'] = env('NNTP_SERVER_A');
$runVar['connections']['ip_a'] = gethostbyname($runVar['connections']['host_a']);
}
return $runVar['connections'];
nntmux/db/DB.php
+7 -7
View File
@@ -112,13 +112,13 @@ class DB extends \PDO
'checkVersion' => false,
'createDb' => false, // create dbname if it does not exist?
'ct' => new ConsoleTools(),
'dbhost' => getenv('DB_HOST'),
'dbname' => getenv('DB_NAME'),
'dbpass' => getenv('DB_PASSWORD'),
'dbport' => getenv('DB_PORT'),
'dbsock' => getenv('DB_SOCKET'),
'dbtype' => getenv('DB_SYSTEM'),
'dbuser' => getenv('DB_USER'),
'dbhost' => env('DB_HOST', '127.0.0.1'),
'dbname' => env('DB_NAME', 'nntmux'),
'dbpass' => env('DB_PASSWORD', 'nntmux'),
'dbport' => env('DB_PORT', '3306'),
'dbsock' => env('DB_SOCKET'),
'dbtype' => env('DB_SYSTEM','mysql'),
'dbuser' => env('DB_USER', 'nntmux'),
'log' => new ColorCLI(),
'persist' => false,
];
tests/Install/InstallTest.php
+22 -22
View File
@@ -53,8 +53,8 @@ class InstallTest extends \PHPUnit\Framework\TestCase
}
// Check if user selected right DB type.
if (getenv('DB_SYSTEM') !== 'mysql') {
ColorCLI::doEcho(ColorCLI::error('Invalid database system. Must be: mysql ; Not: ' . getenv('DB_SYSTEM')));
if (env('DB_SYSTEM') !== 'mysql') {
ColorCLI::doEcho(ColorCLI::error('Invalid database system. Must be: mysql ; Not: ' . env('DB_SYSTEM')));
$error = true;
} else {
// Connect to the SQL server.
@@ -64,13 +64,13 @@ class InstallTest extends \PHPUnit\Framework\TestCase
[
'checkVersion' => true,
'createDb' => true,
'dbhost' => getenv('DB_HOST'),
'dbname' => getenv('DB_NAME'),
'dbpass' => getenv('DB_PASSWORD'),
'dbport' => getenv('DB_PORT'),
'dbsock' => getenv('DB_SOCKET'),
'dbtype' => getenv('DB_SYSTEM'),
'dbuser' => getenv('DB_USER'),
'dbhost' => env('DB_HOST'),
'dbname' => env('DB_NAME'),
'dbpass' => env('DB_PASSWORD'),
'dbport' => env('DB_PORT'),
'dbsock' => env('DB_SOCKET'),
'dbtype' => env('DB_SYSTEM'),
'dbuser' => env('DB_USER'),
]
);
$dbConnCheck = true;
@@ -106,7 +106,7 @@ class InstallTest extends \PHPUnit\Framework\TestCase
$error = true;
ColorCLI::doEcho(ColorCLI::error(
'You are using an unsupported version of ' .
getenv('DB_SYSTEM') .
env('DB_SYSTEM') .
' the minimum allowed version is ' .
NN_MINIMUM_MYSQL_VERSION
)
@@ -179,13 +179,13 @@ class InstallTest extends \PHPUnit\Framework\TestCase
}
}
//Insert admin user into database
if (getenv('ADMIN_USER') === '' || getenv('ADMIN_PASS') === '' || getenv('ADMIN_EMAIL') === '') {
if (env('ADMIN_USER') === '' || env('ADMIN_PASS') === '' || env('ADMIN_EMAIL') === '') {
$error = true;
ColorCLI::doEcho(ColorCLI::error('Admin user data cannot be empty! Please edit .env file and fill in admin user details and run this script again!'));
exit();
}
switch (getenv('DB_SYSTEM')) {
switch (env('DB_SYSTEM')) {
case 'mysql':
$adapter = 'MySql';
break;
@@ -197,10 +197,10 @@ class InstallTest extends \PHPUnit\Framework\TestCase
}
if ($adapter !== null) {
if (empty(getenv('DB_SOCKET'))) {
$host = empty(getenv('DB_PORT')) ? getenv('DB_HOST') : getenv('DB_HOST') . ':' . getenv('DB_PORT');
if (empty(env('DB_SOCKET'))) {
$host = empty(env('DB_PORT')) ? env('DB_HOST') : env('DB_HOST') . ':' . env('DB_PORT');
} else {
$host = getenv('DB_SOCKET');
$host = env('DB_SOCKET');
}
\lithium\data\Connections::add('default',
@@ -208,9 +208,9 @@ class InstallTest extends \PHPUnit\Framework\TestCase
'type' => 'database',
'adapter' => $adapter,
'host' => $host,
'login' => getenv('DB_USER'),
'password' => getenv('DB_PASSWORD'),
'database' => getenv('DB_NAME'),
'login' => env('DB_USER'),
'password' => env('DB_PASSWORD'),
'database' => env('DB_NAME'),
'encoding' => 'UTF-8',
'persistent' => false,
]
@@ -218,20 +218,20 @@ class InstallTest extends \PHPUnit\Framework\TestCase
}
$user = new Users();
if (!$user->isValidUsername(getenv('ADMIN_USER'))) {
if (!$user->isValidUsername(env('ADMIN_USER'))) {
$error = true;
} else {
$usrCheck = $user->getByUsername(getenv('ADMIN_USER'));
$usrCheck = $user->getByUsername(env('ADMIN_USER'));
if ($usrCheck) {
$error = true;
}
}
if (!$user->isValidEmail(getenv('ADMIN_EMAIL'))) {
if (!$user->isValidEmail(env('ADMIN_EMAIL'))) {
$error = true;
}
if (!$error) {
$adminCheck = $user->add(getenv('ADMIN_USER'), getenv('ADMIN_PASS'), getenv('ADMIN_EMAIL'), 2, '', '');
$adminCheck = $user->add(env('ADMIN_USER'), env('ADMIN_PASS'), env('ADMIN_EMAIL'), 2, '', '');
if (!is_numeric($adminCheck)) {
$error = true;
}
www/admin/site-edit.php
+1 -1
View File
@@ -171,7 +171,7 @@ $page->smarty->assign('book_reqids_selected', $books_selected);
$page->smarty->assign('themelist', Utility::getThemesList());
if (strpos(getenv('NNTP_SERVER'), "astra") === false) {
if (strpos(env('NNTP_SERVER'), "astra") === false) {
$page->smarty->assign('compress_headers_warning', "compress_headers_warning");
}