diff --git a/Blacklight/NZB.php b/Blacklight/NZB.php
index 2b44122e6..bd0adb4d1 100755
--- a/Blacklight/NZB.php
+++ b/Blacklight/NZB.php
@@ -116,7 +116,7 @@ class NZB
);
$this->_siteCommentString = sprintf(
'NZB downloaded from %s',
- Settings::settingValue('site.main.title')
+ config('app.name')
);
}
diff --git a/Blacklight/http/Capabilities.php b/Blacklight/http/Capabilities.php
index 58b26ed9d..5adaacd9f 100755
--- a/Blacklight/http/Capabilities.php
+++ b/Blacklight/http/Capabilities.php
@@ -122,9 +122,9 @@ abstract class Capabilities
return [
'server' => [
- 'title' => Settings::settingValue('site.main.title'),
+ 'title' => config('app.name'),
'strapline' => Settings::settingValue('site.main.strapline'),
- 'email' => Settings::settingValue('site.main.email'),
+ 'email' => config('mail.from.address'),
'meta' => Settings::settingValue('site.main.metakeywords'),
'url' => $serverroot,
'image' => $serverroot.'/assets/images/tmux_logo.png',
diff --git a/app/Http/Controllers/Api/ApiV2Controller.php b/app/Http/Controllers/Api/ApiV2Controller.php
index 67cc2fdc5..abf57fbb4 100644
--- a/app/Http/Controllers/Api/ApiV2Controller.php
+++ b/app/Http/Controllers/Api/ApiV2Controller.php
@@ -30,9 +30,9 @@ class ApiV2Controller extends BasePageController
$capabilities = [
'server' => [
- 'title' => Settings::settingValue('site.main.title'),
+ 'title' => config('app.name'),
'strapline' => Settings::settingValue('site.main.strapline'),
- 'email' => Settings::settingValue('site.main.email'),
+ 'email' => config('mail.from.address'),
'url' => url('/'),
],
'limits' => [
diff --git a/app/Http/Controllers/BtcPaymentController.php b/app/Http/Controllers/BtcPaymentController.php
index a157f2533..f4b3f0813 100644
--- a/app/Http/Controllers/BtcPaymentController.php
+++ b/app/Http/Controllers/BtcPaymentController.php
@@ -170,7 +170,7 @@ class BtcPaymentController extends BasePageController
User::updateUserRoleChangeDate($userId, null, $role->addyears);
PaypalPayment::query()->insert(['users_id' => $userId, 'transaction_id' => $request->input('paymentId'), 'created_at' => now(), 'updated_at' => now()]);
$title = 'Cheers!';
- $meta_title = Settings::settingValue('site.main.title').' - Payment Complete';
+ $meta_title = config('app.name').' - Payment Complete';
$meta_description = 'Payment Complete';
$content = $this->smarty->fetch('thankyou.tpl');
$this->smarty->assign(compact('content', 'meta_title', 'title', 'meta_description'));
diff --git a/app/Http/Controllers/ContactUsController.php b/app/Http/Controllers/ContactUsController.php
index b2adf5c4a..3549a8f9d 100644
--- a/app/Http/Controllers/ContactUsController.php
+++ b/app/Http/Controllers/ContactUsController.php
@@ -32,7 +32,7 @@ class ContactUsController extends BasePageController
if ($request->has('useremail')) {
$email = $request->input('useremail');
- $mailTo = Settings::settingValue('site.main.email');
+ $mailTo = config('mail.from.address');
$mailBody = 'Values submitted from contact form: ';
foreach ($request->all() as $key => $value) {
@@ -44,7 +44,7 @@ class ContactUsController extends BasePageController
if (! preg_match("/\n/i", $request->input('useremail'))) {
SendContactUsEmail::dispatch($email, $mailTo, $mailBody)->onQueue('contactemail');
}
- $msg = "
Thank you for getting in touch with ".Settings::settingValue('site.main.title').'.
';
+ $msg = "Thank you for getting in touch with ".config('app.name').'.
';
}
return $this->showContactForm($msg);
@@ -58,10 +58,10 @@ class ContactUsController extends BasePageController
public function showContactForm($msg = '')
{
$this->setPrefs();
- $title = 'Contact '.Settings::settingValue('site.main.title');
- $meta_title = 'Contact '.Settings::settingValue('site.main.title');
+ $title = 'Contact '.config('app.name');
+ $meta_title = 'Contact '.config('app.name');
$meta_keywords = 'contact us,contact,get in touch,email';
- $meta_description = 'Contact us at '.Settings::settingValue('site.main.title').' and submit your feedback';
+ $meta_description = 'Contact us at '.config('app.name').' and submit your feedback';
$content = $this->smarty->fetch('contact.tpl');
$this->smarty->assign(compact('title', 'content', 'meta_title', 'meta_keywords', 'meta_description', 'msg'));
diff --git a/app/Http/Controllers/TermsController.php b/app/Http/Controllers/TermsController.php
index 4fe107353..147cbfd86 100644
--- a/app/Http/Controllers/TermsController.php
+++ b/app/Http/Controllers/TermsController.php
@@ -13,9 +13,9 @@ class TermsController extends BasePageController
{
$this->setPrefs();
$title = 'Terms and Conditions';
- $meta_title = Settings::settingValue('site.main.title').' - Terms and conditions';
+ $meta_title = config('app.name').' - Terms and conditions';
$meta_keywords = 'terms,conditions';
- $meta_description = 'Terms and Conditions for '.Settings::settingValue('site.main.title');
+ $meta_description = 'Terms and Conditions for '.config('app.name');
$content = $this->smarty->fetch($this->theme.'/terms.tpl');
diff --git a/app/Jobs/SendAccountDeletedEmail.php b/app/Jobs/SendAccountDeletedEmail.php
index cd59a7ae0..6eb7c0ab1 100644
--- a/app/Jobs/SendAccountDeletedEmail.php
+++ b/app/Jobs/SendAccountDeletedEmail.php
@@ -37,6 +37,6 @@ class SendAccountDeletedEmail implements ShouldQueue
*/
public function handle()
{
- Mail::to(Settings::settingValue('site.main.email'))->send(new AccountDeleted($this->user));
+ Mail::to(config('mail.from.address'))->send(new AccountDeleted($this->user));
}
}
diff --git a/app/Jobs/SendNewRegisteredAccountMail.php b/app/Jobs/SendNewRegisteredAccountMail.php
index 848fc1ee6..2b3d8f8c8 100644
--- a/app/Jobs/SendNewRegisteredAccountMail.php
+++ b/app/Jobs/SendNewRegisteredAccountMail.php
@@ -37,6 +37,6 @@ class SendNewRegisteredAccountMail implements ShouldQueue
*/
public function handle()
{
- Mail::to(Settings::settingValue('site.main.email'))->send(new NewAccountCreatedEmail($this->user));
+ Mail::to(config('mail.from.address'))->send(new NewAccountCreatedEmail($this->user));
}
}
diff --git a/app/Mail/AccountChange.php b/app/Mail/AccountChange.php
index 6febb5d67..a01073e9e 100644
--- a/app/Mail/AccountChange.php
+++ b/app/Mail/AccountChange.php
@@ -34,8 +34,8 @@ class AccountChange extends Mailable
public function __construct($user)
{
$this->user = $user;
- $this->siteEmail = Settings::settingValue('site.main.email');
- $this->siteTitle = Settings::settingValue('site.main.title');
+ $this->siteEmail = config('mail.from.address');
+ $this->siteTitle = config('app.name');
}
/**
diff --git a/app/Mail/AccountDeleted.php b/app/Mail/AccountDeleted.php
index 87cde36b0..6d12d0a81 100644
--- a/app/Mail/AccountDeleted.php
+++ b/app/Mail/AccountDeleted.php
@@ -35,8 +35,8 @@ class AccountDeleted extends Mailable
public function __construct($user)
{
$this->user = $user;
- $this->siteEmail = Settings::settingValue('site.main.email');
- $this->siteTitle = Settings::settingValue('site.main.title');
+ $this->siteEmail = config('mail.from.address');
+ $this->siteTitle = config('app.name');
}
/**
diff --git a/app/Mail/AccountExpired.php b/app/Mail/AccountExpired.php
index 343f146d2..5d612f312 100644
--- a/app/Mail/AccountExpired.php
+++ b/app/Mail/AccountExpired.php
@@ -23,8 +23,8 @@ class AccountExpired extends Mailable
public function __construct($user)
{
$this->user = $user;
- $this->siteEmail = Settings::settingValue('site.main.email');
- $this->siteTitle = Settings::settingValue('site.main.title');
+ $this->siteEmail = config('mail.from.address');
+ $this->siteTitle = config('app.name');
}
/**
diff --git a/app/Mail/AccountWillExpire.php b/app/Mail/AccountWillExpire.php
index b1e1189c0..8a424e7b0 100644
--- a/app/Mail/AccountWillExpire.php
+++ b/app/Mail/AccountWillExpire.php
@@ -34,8 +34,8 @@ class AccountWillExpire extends Mailable
{
$this->user = $user;
$this->days = $days;
- $this->siteEmail = Settings::settingValue('site.main.email');
- $this->siteTitle = Settings::settingValue('site.main.title');
+ $this->siteEmail = config('mail.from.address');
+ $this->siteTitle = config('app.name');
}
/**
diff --git a/app/Mail/ForgottenPassword.php b/app/Mail/ForgottenPassword.php
index 668418223..464f77bd0 100644
--- a/app/Mail/ForgottenPassword.php
+++ b/app/Mail/ForgottenPassword.php
@@ -33,8 +33,8 @@ class ForgottenPassword extends Mailable
public function __construct($resetLink)
{
$this->resetLink = $resetLink;
- $this->siteEmail = Settings::settingValue('site.main.email');
- $this->siteTitle = Settings::settingValue('site.main.title');
+ $this->siteEmail = config('mail.from.address');
+ $this->siteTitle = config('app.name');
}
/**
diff --git a/app/Mail/NewAccountCreatedEmail.php b/app/Mail/NewAccountCreatedEmail.php
index 32a8147ab..844120878 100644
--- a/app/Mail/NewAccountCreatedEmail.php
+++ b/app/Mail/NewAccountCreatedEmail.php
@@ -34,8 +34,8 @@ class NewAccountCreatedEmail extends Mailable
public function __construct($user)
{
$this->user = $user;
- $this->siteEmail = Settings::settingValue('site.main.email');
- $this->siteTitle = Settings::settingValue('site.main.title');
+ $this->siteEmail = config('mail.from.address');
+ $this->siteTitle = config('app.name');
}
/**
diff --git a/app/Mail/PasswordReset.php b/app/Mail/PasswordReset.php
index ccf5f158d..5f1590330 100644
--- a/app/Mail/PasswordReset.php
+++ b/app/Mail/PasswordReset.php
@@ -41,8 +41,8 @@ class PasswordReset extends Mailable
{
$this->user = $user;
$this->newPass = $newPass;
- $this->siteEmail = Settings::settingValue('site.main.email');
- $this->siteTitle = Settings::settingValue('site.main.title');
+ $this->siteEmail = config('mail.from.address');
+ $this->siteTitle = config('app.name');
}
/**
diff --git a/app/Mail/SendInvite.php b/app/Mail/SendInvite.php
index baf0e814a..9d59bdf21 100644
--- a/app/Mail/SendInvite.php
+++ b/app/Mail/SendInvite.php
@@ -41,8 +41,8 @@ class SendInvite extends Mailable
{
$this->user = $user;
$this->invite = $invite;
- $this->siteEmail = Settings::settingValue('site.main.email');
- $this->siteTitle = Settings::settingValue('site.main.title');
+ $this->siteEmail = config('mail.from.address');
+ $this->siteTitle = config('app.name');
}
/**
diff --git a/app/Mail/WelcomeEmail.php b/app/Mail/WelcomeEmail.php
index 39164ea43..d9ab2115b 100644
--- a/app/Mail/WelcomeEmail.php
+++ b/app/Mail/WelcomeEmail.php
@@ -34,8 +34,8 @@ class WelcomeEmail extends Mailable
public function __construct($user)
{
$this->user = $user;
- $this->siteEmail = Settings::settingValue('site.main.email');
- $this->siteTitle = Settings::settingValue('site.main.title');
+ $this->siteEmail = config('mail.from.address');
+ $this->siteTitle = config('app.name');
}
/**
diff --git a/app/Observers/UserServiceObserver.php b/app/Observers/UserServiceObserver.php
index e25785f2b..9956b8b50 100644
--- a/app/Observers/UserServiceObserver.php
+++ b/app/Observers/UserServiceObserver.php
@@ -35,12 +35,12 @@ class UserServiceObserver
'rate_limit' => $rateLimit,
]
);
- if (! empty(Settings::settingValue('site.main.email') && File::isFile(base_path().'/_install/install.lock'))) {
+ if (! empty(config('mail.from.address') && File::isFile(base_path().'/_install/install.lock'))) {
SendNewRegisteredAccountMail::dispatch($user)->onQueue('newreg');
SendWelcomeEmail::dispatch($user)->onQueue('welcomeemails');
UserVerification::generate($user);
- UserVerification::send($user, 'User email verification required', Settings::settingValue('site.main.email'));
+ UserVerification::send($user, 'User email verification required', config('mail.from.address'));
}
}
}
diff --git a/database/fixtures/settings.php b/database/fixtures/settings.php
index a31557514..6c277bbcd 100644
--- a/database/fixtures/settings.php
+++ b/database/fixtures/settings.php
@@ -993,22 +993,6 @@ return [
'hint' => 'Whether to send WEB-DL to the WEB-DL section or not. If set to true they will go in WEB-DL category, false will send them in HD TV.
This will also make them inaccessible to Sickbeard and possibly Couchpotato.',
'setting' => 'catwebdl',
],
- 129 => [
- 'section' => 'indexer',
- 'subsection' => 'categorise',
- 'name' => 'imdblanguage',
- 'value' => 'en',
- 'hint' => 'Which language to lookup when sending requests to IMDB/Tmdb. (If akas.imdb.com is set, imdb still returns the original titles.)',
- 'setting' => 'imdblanguage',
- ],
- 130 => [
- 'section' => 'indexer',
- 'subsection' => 'categorise',
- 'name' => 'imdburl',
- 'value' => '0',
- 'hint' => 'akas.imdb.com returns titles in their original title, imdb.com returns titles based on your IP address (if you are in france, you will get french titles).',
- 'setting' => 'imdburl',
- ],
131 => [
'section' => 'indexer',
'subsection' => 'ppa',
@@ -1042,54 +1026,6 @@ return [
Default: %Y-%m-%d %T',
'setting' => 'shell.date.format',
],
- 135 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'adbrowse',
- 'value' => '',
- 'hint' => 'The banner slot in the header.',
- 'setting' => 'adbrowse',
- ],
- 136 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'addetail',
- 'value' => '',
- 'hint' => 'The banner slot in the release details view.',
- 'setting' => 'addetail',
- ],
- 137 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'adheader',
- 'value' => '',
- 'hint' => 'The banner slot in the header.',
- 'setting' => 'adheader',
- ],
- 138 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'google_adsense_acc',
- 'value' => '',
- 'hint' => 'AdSense account: e.g. pub-123123123123123',
- 'setting' => 'google_adsense_acc',
- ],
- 139 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'google_adsense_search',
- 'value' => '',
- 'hint' => 'The ID of the google search ad panel displayed at the bottom of the left menu.',
- 'setting' => 'google_adsense_search',
- ],
- 140 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'google_analytics_acc',
- 'value' => '',
- 'hint' => 'Analytic\'s account: e.g. UA-xxxxxx-x',
- 'setting' => 'google_analytics_acc',
- ],
141 => [
'section' => 'site',
'subsection' => 'main',
@@ -1114,14 +1050,6 @@ Default: %Y-%m-%d %T',
'hint' => 'Optional URL to prepend to external links',
'setting' => 'dereferrer_link',
],
- 144 => [
- 'section' => 'site',
- 'subsection' => 'main',
- 'name' => 'email',
- 'value' => '',
- 'hint' => 'Shown in the contact us page, and where the contact html form is sent to.',
- 'setting' => 'email',
- ],
145 => [
'section' => 'site',
'subsection' => 'main',
@@ -1210,14 +1138,6 @@ Default: %Y-%m-%d %T',
'hint' => 'Text displayed in the terms and conditions page.',
'setting' => 'tandc',
],
- 156 => [
- 'section' => 'site',
- 'subsection' => 'main',
- 'name' => 'title',
- 'value' => 'NNTmux',
- 'hint' => 'Displayed around the site and contact form as the name for the site.',
- 'setting' => 'title',
- ],
157 => [
'section' => 'site',
'subsection' => 'main',
diff --git a/database/seeds/SettingsTableSeeder.php b/database/seeds/SettingsTableSeeder.php
index 5028ecfe0..802ed699a 100644
--- a/database/seeds/SettingsTableSeeder.php
+++ b/database/seeds/SettingsTableSeeder.php
@@ -646,14 +646,6 @@ class SettingsTableSeeder extends Seeder
'hint' => 'The number of threads for update_releases.',
'setting' => 'releasethreads',
],
- 81 => [
- 'section' => '',
- 'subsection' => '',
- 'name' => 'replacenzbs',
- 'value' => '0',
- 'hint' => 'NZBs that are crossposted, instead of deleting, replace with the nzb grabbed.(This is not necessary, was added before I understood how crossposted nzbs work).',
- 'setting' => 'replacenzbs',
- ],
82 => [
'section' => '',
'subsection' => '',
@@ -846,14 +838,6 @@ class SettingsTableSeeder extends Seeder
'hint' => 'The api key used for access to rotten tomatoes.',
'setting' => 'rottentomatokey',
],
- 110 => [
- 'section' => 'APIs',
- 'subsection' => '',
- 'name' => 'tmdbkey',
- 'value' => '9a4e16adddcd1e86da19bcaf5ff3c2a3',
- 'hint' => 'The API key used for access to TMDb.',
- 'setting' => 'tmdbkey',
- ],
111 => [
'section' => 'APIs',
'subsection' => '',
@@ -942,14 +926,6 @@ class SettingsTableSeeder extends Seeder
'hint' => 'The path to an unrar binary, used in deep password detection and media info grabbing. Use forward slashes in windows c:/path/to/unrar.exe',
'setting' => 'unrarpath',
],
- 122 => [
- 'section' => 'apps',
- 'subsection' => '',
- 'name' => 'yydecoderpath',
- 'value' => '',
- 'hint' => 'Path to yydecode, this will decode yEnc articles. On ubuntu/debian you can get yydecode in the getdeb repository. Compiling yydecode from source is easy/fast also. Use forward slashes in windows c:/path/to/yydecode.exe',
- 'setting' => 'yydecoderpath',
- ],
123 => [
'section' => 'apps',
'subsection' => '',
@@ -998,22 +974,6 @@ class SettingsTableSeeder extends Seeder
'hint' => 'Whether to send WEB-DL to the WEB-DL section or not. If set to true they will go in WEB-DL category, false will send them in HD TV.
This will also make them inaccessible to Sickbeard and possibly Couchpotato.',
'setting' => 'catwebdl',
],
- 129 => [
- 'section' => 'indexer',
- 'subsection' => 'categorise',
- 'name' => 'imdblanguage',
- 'value' => 'en',
- 'hint' => 'Which language to lookup when sending requests to IMDB/Tmdb. (If akas.imdb.com is set, imdb still returns the original titles.)',
- 'setting' => 'imdblanguage',
- ],
- 130 => [
- 'section' => 'indexer',
- 'subsection' => 'categorise',
- 'name' => 'imdburl',
- 'value' => '0',
- 'hint' => 'akas.imdb.com returns titles in their original title, imdb.com returns titles based on your IP address (if you are in france, you will get french titles).',
- 'setting' => 'imdburl',
- ],
131 => [
'section' => 'indexer',
'subsection' => 'ppa',
@@ -1047,54 +1007,6 @@ class SettingsTableSeeder extends Seeder
Default: %Y-%m-%d %T',
'setting' => 'shell.date.format',
],
- 135 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'adbrowse',
- 'value' => '',
- 'hint' => 'The banner slot in the header.',
- 'setting' => 'adbrowse',
- ],
- 136 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'addetail',
- 'value' => '',
- 'hint' => 'The banner slot in the release details view.',
- 'setting' => 'addetail',
- ],
- 137 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'adheader',
- 'value' => '',
- 'hint' => 'The banner slot in the header.',
- 'setting' => 'adheader',
- ],
- 138 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'google_adsense_acc',
- 'value' => '',
- 'hint' => 'AdSense account: e.g. pub-123123123123123',
- 'setting' => 'google_adsense_acc',
- ],
- 139 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'google_adsense_search',
- 'value' => '',
- 'hint' => 'The ID of the google search ad panel displayed at the bottom of the left menu.',
- 'setting' => 'google_adsense_search',
- ],
- 140 => [
- 'section' => 'site',
- 'subsection' => 'google',
- 'name' => 'google_analytics_acc',
- 'value' => '',
- 'hint' => 'Analytic\'s account: e.g. UA-xxxxxx-x',
- 'setting' => 'google_analytics_acc',
- ],
141 => [
'section' => 'site',
'subsection' => 'main',
@@ -1119,14 +1031,6 @@ Default: %Y-%m-%d %T',
'hint' => 'Optional URL to prepend to external links',
'setting' => 'dereferrer_link',
],
- 144 => [
- 'section' => 'site',
- 'subsection' => 'main',
- 'name' => 'email',
- 'value' => '',
- 'hint' => 'Shown in the contact us page, and where the contact html form is sent to.',
- 'setting' => 'email',
- ],
145 => [
'section' => 'site',
'subsection' => 'main',
@@ -1215,14 +1119,6 @@ Default: %Y-%m-%d %T',
'hint' => 'Text displayed in the terms and conditions page.',
'setting' => 'tandc',
],
- 156 => [
- 'section' => 'site',
- 'subsection' => 'main',
- 'name' => 'title',
- 'value' => 'NNTmux',
- 'hint' => 'Displayed around the site and contact form as the name for the site.',
- 'setting' => 'title',
- ],
157 => [
'section' => 'site',
'subsection' => 'main',
diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php
index 9ec910721..4ff695cfc 100644
--- a/resources/views/errors/401.blade.php
+++ b/resources/views/errors/401.blade.php
@@ -5,6 +5,6 @@
@endsection
@section('content')
- {{ \App\Models\Settings::settingValue('site.main.title') }}
+ {{ \App\Models\config('app.name') }}
Acess denied! You're permissions and/or role do not allow you to access this page
@endsection
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
index 10da4f728..f49b0045e 100644
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -5,6 +5,6 @@
@endsection
@section('content')
- {{ \App\Models\Settings::settingValue('site.main.title') }}
+ {{ \App\Models\config('app.name') }}
You are not logged in!
Please login
@endsection
diff --git a/resources/views/themes/Gentele/basepage.tpl b/resources/views/themes/Gentele/basepage.tpl
index 9b610465d..f691f6560 100755
--- a/resources/views/themes/Gentele/basepage.tpl
+++ b/resources/views/themes/Gentele/basepage.tpl
@@ -17,7 +17,7 @@