Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

update variables for .env instead of writing completely new file

Browse Source
This commit is contained in:
Benjamin Beganović 2020-11-24 11:45:27 +01:00
parent 3b765d32c1
commit 242d48cd1a
3 changed files with 90 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
app/Http/Controllers/SetupController.php
View File

@ -61,8 +61,6 @@ class SetupController extends Controller
return response('Oops, something went wrong. Check your logs.'); /* We should never reach this block, but just in case. */ return response('Oops, something went wrong. Check your logs.'); /* We should never reach this block, but just in case. */
} }
return $request->all();
$mail_driver = $request->input('mail_driver'); $mail_driver = $request->input('mail_driver');
if (! $this->failsafeMailCheck($request)) { if (! $this->failsafeMailCheck($request)) {
@ -71,48 +69,38 @@ class SetupController extends Controller
$url = $request->input('url'); $url = $request->input('url');
if (substr($url, -1) != '/') if (substr($url, -1) != '/') {
$url = $url . '/'; $url = $url . '/';
}
$env_values = [
'APP_URL' => $url,
'REQUIRE_HTTPS' => $request->input('https') ? 'true' : 'false',
'APP_DEBUG' => $request->input('debug') ? 'true' : 'false',
$_ENV['APP_KEY'] = config('app.key'); 'DB_HOST1' => $request->input('host'),
$_ENV['APP_URL'] = $url; 'DB_DATABASE1' => $request->input('database'),
$_ENV['APP_DEBUG'] = $request->input('debug') ? 'true' : 'false'; 'DB_USERNAME1' => $request->input('db_username'),
$_ENV['REQUIRE_HTTPS'] = $request->input('https') ? 'true' : 'false'; 'DB_PASSWORD1' => $request->input('db_password'),
$_ENV['DB_TYPE'] = 'mysql';
$_ENV['DB_HOST1'] = $request->input('host');
$_ENV['DB_DATABASE1'] = $request->input('database');
$_ENV['DB_USERNAME1'] = $request->input('db_username');
$_ENV['DB_PASSWORD1'] = $request->input('db_password');
$_ENV['MAIL_MAILER'] = $mail_driver;
$_ENV['MAIL_PORT'] = $request->input('mail_port');
$_ENV['MAIL_ENCRYPTION'] = $request->input('encryption');
$_ENV['MAIL_HOST'] = $request->input('mail_host');
$_ENV['MAIL_USERNAME'] = $request->input('mail_username');
$_ENV['MAIL_FROM_NAME'] = $request->input('mail_name');
$_ENV['MAIL_FROM_ADDRESS'] = $request->input('mail_address');
$_ENV['MAIL_PASSWORD'] = $request->input('mail_password');
$_ENV['NINJA_ENVIRONMENT'] = 'selfhost';
$_ENV['DB_CONNECTION'] = 'db-ninja-01';
$config = ''; 'MAIL_MAILER' => $mail_driver,
'MAIL_PORT' => $request->input('mail_port'),
'MAIL_ENCRYPTION' => $request->input('encryption'),
'MAIL_HOST' => $request->input('mail_host'),
'MAIL_USERNAME' => $request->input('mail_username'),
'MAIL_FROM_NAME' => $request->input('mail_name'),
'MAIL_FROM_ADDRESS' => $request->input('mail_address'),
'MAIL_PASSWORD' => $request->input('mail_password'),
'NINJA_ENVIRONMENT' => 'selfhost',
'DB_CONNECTION' => 'db-ninja-01',
];
try { try {
foreach ($_ENV as $key => $val) { foreach ($env_values as $property => $value) {
if (is_array($val)) { $this->updateEnvironmentProperty($property, $value);
continue;
}
if (preg_match('/\s/', $val)) {
$val = "'{$val}'";
}
$config .= "{$key}={$val}\n";
} }
/* Write the .env file */
$filePath = base_path() . '/.env';
$fp = fopen($filePath, 'w');
fwrite($fp, $config);
fclose($fp);
/* We need this in some environments that do not have STDIN defined */ /* We need this in some environments that do not have STDIN defined */
define('STDIN', fopen('php://stdin', 'r')); define('STDIN', fopen('php://stdin', 'r'));

98
app/Utils/Traits/AppSetup.php
View File

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Invoice Ninja (https://invoiceninja.com). * Invoice Ninja (https://invoiceninja.com).
* *
@ -16,6 +17,7 @@ use App\Utils\Ninja;
use App\Utils\SystemHealth; use App\Utils\SystemHealth;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Str;
trait AppSetup trait AppSetup
{ {
@ -35,10 +37,10 @@ trait AppSetup
$cached_tables = config('ninja.cached_tables'); $cached_tables = config('ninja.cached_tables');
foreach ($cached_tables as $name => $class) { foreach ($cached_tables as $name => $class) {
if (request()->has('clear_cache') || ! Cache::has($name) || $force) { if (request()->has('clear_cache') || !Cache::has($name) || $force) {
// check that the table exists in case the migration is pending // check that the table exists in case the migration is pending
if (! Schema::hasTable((new $class())->getTable())) { if (!Schema::hasTable((new $class())->getTable())) {
continue; continue;
} }
if ($name == 'payment_terms') { if ($name == 'payment_terms') {
@ -58,7 +60,7 @@ trait AppSetup
} }
/*Build template cache*/ /*Build template cache*/
if (request()->has('clear_cache') || ! Cache::has('templates')) if (request()->has('clear_cache') || !Cache::has('templates'))
$this->buildTemplates(); $this->buildTemplates();
} }
@ -67,49 +69,77 @@ trait AppSetup
{ {
$data = [ $data = [
'invoice' => [ 'invoice' => [
'subject' => EmailTemplateDefaults::emailInvoiceSubject(), 'subject' => EmailTemplateDefaults::emailInvoiceSubject(),
'body' => EmailTemplateDefaults::emailInvoiceTemplate(), 'body' => EmailTemplateDefaults::emailInvoiceTemplate(),
], ],
'quote' => [ 'quote' => [
'subject' => EmailTemplateDefaults::emailQuoteSubject(), 'subject' => EmailTemplateDefaults::emailQuoteSubject(),
'body' => EmailTemplateDefaults::emailQuoteTemplate(), 'body' => EmailTemplateDefaults::emailQuoteTemplate(),
], ],
'payment' => [ 'payment' => [
'subject' => EmailTemplateDefaults::emailPaymentSubject(), 'subject' => EmailTemplateDefaults::emailPaymentSubject(),
'body' => EmailTemplateDefaults::emailPaymentTemplate(), 'body' => EmailTemplateDefaults::emailPaymentTemplate(),
], ],
'payment_partial' => [ 'payment_partial' => [
'subject' => EmailTemplateDefaults::emailPaymentPartialSubject(), 'subject' => EmailTemplateDefaults::emailPaymentPartialSubject(),
'body' => EmailTemplateDefaults::emailPaymentPartialTemplate(), 'body' => EmailTemplateDefaults::emailPaymentPartialTemplate(),
], ],
'reminder1' => [ 'reminder1' => [
'subject' => EmailTemplateDefaults::emailReminder1Subject(), 'subject' => EmailTemplateDefaults::emailReminder1Subject(),
'body' => EmailTemplateDefaults::emailReminder1Template(), 'body' => EmailTemplateDefaults::emailReminder1Template(),
], ],
'reminder2' => [ 'reminder2' => [
'subject' => EmailTemplateDefaults::emailReminder2Subject(), 'subject' => EmailTemplateDefaults::emailReminder2Subject(),
'body' => EmailTemplateDefaults::emailReminder2Template(), 'body' => EmailTemplateDefaults::emailReminder2Template(),
], ],
'reminder3' => [ 'reminder3' => [
'subject' => EmailTemplateDefaults::emailReminder3Subject(), 'subject' => EmailTemplateDefaults::emailReminder3Subject(),
'body' => EmailTemplateDefaults::emailReminder3Template(), 'body' => EmailTemplateDefaults::emailReminder3Template(),
], ],
'reminder_endless' => [ 'reminder_endless' => [
'subject' => EmailTemplateDefaults::emailReminderEndlessSubject(), 'subject' => EmailTemplateDefaults::emailReminderEndlessSubject(),
'body' => EmailTemplateDefaults::emailReminderEndlessTemplate(), 'body' => EmailTemplateDefaults::emailReminderEndlessTemplate(),
], ],
'statement' => [ 'statement' => [
'subject' => EmailTemplateDefaults::emailStatementSubject(), 'subject' => EmailTemplateDefaults::emailStatementSubject(),
'body' => EmailTemplateDefaults::emailStatementTemplate(), 'body' => EmailTemplateDefaults::emailStatementTemplate(),
], ],
'credit' => [ 'credit' => [
'subject' => EmailTemplateDefaults::emailCreditSubject(), 'subject' => EmailTemplateDefaults::emailCreditSubject(),
'body' => EmailTemplateDefaults::emailCreditTemplate(), 'body' => EmailTemplateDefaults::emailCreditTemplate(),
], ],
]; ];
Cache::forever($name, $data); Cache::forever($name, $data);
} }
private function updateEnvironmentProperty(string $property, $value): void
{
$env = file(base_path('.env'));
$position = null;
foreach ((array) $env as $key => $variable) {
if (Str::startsWith($variable, $property)) {
$position = $key;
}
}
// This should never happen, but this is login just in case.
// Variables that will be replaced (updated with different content) should already be in .env file.
if (is_null($position)) {
$env[] = "{$property}=" . $value . "\n";
} else {
$env[$position] = "{$property}=" . $value . "\n";
}
try {
file_put_contents(base_path('.env'), $env);
} catch (\Exception $e) {
info($e->getMessage());
}
}
} }

2
resources/lang/en/texts.php
View File

@ -3227,7 +3227,7 @@ return [
'bank_account_not_linked' => 'To pay with bank account, first you have to add it as payment method.', 'bank_account_not_linked' => 'To pay with bank account, first you have to add it as payment method.',
'application_settings_label' => 'Let\'s store basic information about your Invoice Ninja!', 'application_settings_label' => 'Let\'s store basic information about your Invoice Ninja!',
'recommended_in_production' => 'Recommended in production', 'recommended_in_production' => 'Highly recommended in production',
'enable_only_for_development' => 'Enable only for development', 'enable_only_for_development' => 'Enable only for development',
'test_pdf' => 'Test PDF', 'test_pdf' => 'Test PDF',