shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a CLI configurer and extracted configuration function from Install controllers

Browse Source
This commit is contained in:
Carvallegro
2017-12-31 05:21:10 +11:00
parent 183f83e1d2
commit ec5070e45f
6 changed files with 656 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
app/Http/Controllers/Install/Database.php
View File

@ -3,123 +3,56 @@
namespace App\Http\Controllers\Install;
use Artisan;
use Config;
use DB;
use DotenvEditor;
use App\Http\Requests\Install\Database as Request;
use App\Utilities\AppConfigurer;
use Illuminate\Routing\Controller;
class Database extends Controller
{
/**
* Show the form for creating a new resource.
*
* @return Response
*/
public function create()
{
return view('install.database.create');
}
class Database extends Controller {
/**
* Show the form for creating a new resource.
*
* @return Response
*/
public function create() {
return view( 'install.database.create' );
}
/**
* Store a newly created resource in storage.
*
* @param Request $request
*
* @return Response
*/
public function store(Request $request)
{
// Check database connection
if (!$this->canConnect($request)) {
$message = trans('install.error.connection');
/**
* Store a newly created resource in storage.
*
* @param Request $request
*
* @return Response
*/
public function store( Request $request ) {
$host = $request['hostname'];
$port = env( 'DB_PORT', '3306' );
$database = $request['database'];
$username = $request['username'];
$password = $request['password'];
flash($message)->error()->important();
// Check database connection
if ( ! AppConfigurer::isDbValid($host,$port,$database,$username,$password) ) {
$message = trans( 'install.error.connection' );
return redirect('install/database')->withInput();
}
flash( $message )->error()->important();
// Set database details
$this->saveVariables($request);
return redirect( 'install/database' )->withInput();
}
// Try to increase the maximum execution time
set_time_limit(300); // 5 minutes
// Set database details
AppConfigurer::saveDbVariables($host, $port, $database, $username, $password);
// Create tables
Artisan::call('migrate', ['--force' => true]);
// Try to increase the maximum execution time
set_time_limit( 300 ); // 5 minutes
// Create Roles
Artisan::call('db:seed', ['--class' => 'Database\Seeds\Roles', '--force' => true]);
// Create tables
Artisan::call( 'migrate', [ '--force' => true ] );
return redirect('install/settings');
}
// Create Roles
Artisan::call( 'db:seed', [ '--class' => 'Database\Seeds\Roles', '--force' => true ] );
private function canConnect($request)
{
Config::set('database.connections.install_test', [
'host' => $request['hostname'],
'database' => $request['database'],
'username' => $request['username'],
'password' => $request['password'],
'driver' => env('DB_CONNECTION', 'mysql'),
'port' => env('DB_PORT', '3306'),
'charset' => env('DB_CHARSET', 'utf8mb4'),
]);
return redirect( 'install/settings' );
}
try {
DB::connection('install_test')->getPdo();
} catch (\Exception $e) {
return false;
}
// Purge test connection
DB::purge('install_test');
return true;
}
private function saveVariables($request)
{
$prefix = strtolower(str_random(3) . '_');
// Save to file
DotenvEditor::setKeys([
[
'key' => 'DB_HOST',
'value' => $request['hostname'],
],
[
'key' => 'DB_DATABASE',
'value' => $request['database'],
],
[
'key' => 'DB_USERNAME',
'value' => $request['username'],
],
[
'key' => 'DB_PASSWORD',
'value' => $request['password'],
],
[
'key' => 'DB_PREFIX',
'value' => $prefix,
],
])->save();
$con = env('DB_CONNECTION', 'mysql');
// Change current connection
$db = Config::get('database.connections.' . $con);
$db['host'] = $request['hostname'];
$db['database'] = $request['database'];
$db['username'] = $request['username'];
$db['password'] = $request['password'];
$db['prefix'] = $prefix;
Config::set('database.connections.' . $con, $db);
DB::purge($con);
DB::reconnect($con);
}
}

206
app/Http/Controllers/Install/Requirements.php
View File

@ -2,8 +2,8 @@
namespace App\Http\Controllers\Install;
use DotenvEditor;
use File;
use App\Utilities\AppConfigurer;
use Illuminate\Routing\Controller;
class Requirements extends Controller
@ -16,12 +16,12 @@ class Requirements extends Controller
public function show()
{
// Check requirements
$requirements = $this->check();
$requirements = AppConfigurer::checkServerRequirements();
if (empty($requirements)) {
// Create the .env file
if (!File::exists(base_path('.env'))) {
$this->createEnvFile();
AppConfigurer::createDefaultEnvFile();
}
redirect('install/language')->send();
@ -33,204 +33,4 @@ class Requirements extends Controller
return view('install.requirements.show');
}
}
/**
* Check the requirements.
*
* @return array
*/
private function check()
{
$requirements = array();
if (ini_get('safe_mode')) {
$requirements[] = trans('install.requirements.disabled', ['feature' => 'Safe Mode']);
}
if (ini_get('register_globals')) {
$requirements[] = trans('install.requirements.disabled', ['feature' => 'Register Globals']);
}
if (ini_get('magic_quotes_gpc')) {
$requirements[] = trans('install.requirements.disabled', ['feature' => 'Magic Quotes']);
}
if (!ini_get('file_uploads')) {
$requirements[] = trans('install.requirements.enabled', ['feature' => 'File Uploads']);
}
if (!class_exists('PDO')) {
$requirements[] = trans('install.requirements.extension', ['extension' => 'MySQL PDO']);
}
if (!extension_loaded('openssl')) {
$requirements[] = trans('install.requirements.extension', ['extension' => 'OpenSSL']);
}
if (!extension_loaded('tokenizer')) {
$requirements[] = trans('install.requirements.extension', ['extension' => 'Tokenizer']);
}
if (!extension_loaded('mbstring')) {
$requirements[] = trans('install.requirements.extension', ['extension' => 'mbstring']);
}
if (!extension_loaded('curl')) {
$requirements[] = trans('install.requirements.extension', ['extension' => 'cURL']);
}
if (!extension_loaded('xml')) {
$requirements[] = trans('install.requirements.extension', ['extension' => 'XML']);
}
if (!extension_loaded('zip')) {
$requirements[] = trans('install.requirements.extension', ['extension' => 'ZIP']);
}
if (!is_writable(base_path('storage/app'))) {
$requirements[] = trans('install.requirements.directory', ['directory' => 'storage/app']);
}
if (!is_writable(base_path('storage/app/uploads'))) {
$requirements[] = trans('install.requirements.directory', ['directory' => 'storage/app/uploads']);
}
if (!is_writable(base_path('storage/framework'))) {
$requirements[] = trans('install.requirements.directory', ['directory' => 'storage/framework']);
}
if (!is_writable(base_path('storage/logs'))) {
$requirements[] = trans('install.requirements.directory', ['directory' => 'storage/logs']);
}
return $requirements;
}
/**
* Create the .env file.
*
* @return void
*/
private function createEnvFile()
{
// App
DotenvEditor::setKeys([
[
'key' => 'APP_NAME',
'value' => 'Akaunting',
],
[
'key' => 'APP_ENV',
'value' => 'production',
],
[
'key' => 'APP_INSTALLED',
'value' => 'false',
],
[
'key' => 'APP_KEY',
'value' => 'base64:'.base64_encode(random_bytes(32)),
],
[
'key' => 'APP_DEBUG',
'value' => 'true',
],
[
'key' => 'APP_LOG_LEVEL',
'value' => 'debug',
],
[
'key' => 'APP_URL',
'value' => url('/'),
],
]);
DotenvEditor::addEmpty();
// Database
DotenvEditor::setKeys([
[
'key' => 'DB_CONNECTION',
'value' => 'mysql',
],
[
'key' => 'DB_HOST',
'value' => 'localhost',
],
[
'key' => 'DB_PORT',
'value' => '3306',
],
[
'key' => 'DB_DATABASE',
'value' => '',
],
[
'key' => 'DB_USERNAME',
'value' => '',
],
[
'key' => 'DB_PASSWORD',
'value' => '',
],
[
'key' => 'DB_PREFIX',
'value' => '',
],
]);
DotenvEditor::addEmpty();
// Drivers
DotenvEditor::setKeys([
[
'key' => 'BROADCAST_DRIVER',
'value' => 'log',
],
[
'key' => 'CACHE_DRIVER',
'value' => 'file',
],
[
'key' => 'SESSION_DRIVER',
'value' => 'file',
],
[
'key' => 'QUEUE_DRIVER',
'value' => 'database',
],
]);
DotenvEditor::addEmpty();
// Mail
DotenvEditor::setKeys([
[
'key' => 'MAIL_DRIVER',
'value' => 'mail',
],
[
'key' => 'MAIL_HOST',
'value' => 'localhost',
],
[
'key' => 'MAIL_PORT',
'value' => '2525',
],
[
'key' => 'MAIL_USERNAME',
'value' => 'null',
],
[
'key' => 'MAIL_PASSWORD',
'value' => 'null',
],
[
'key' => 'MAIL_ENCRYPTION',
'value' => 'null',
],
]);
DotenvEditor::save();
}
}

80
app/Http/Controllers/Install/Settings.php
View File

@ -2,14 +2,9 @@
namespace App\Http\Controllers\Install;
use Artisan;
use App\Http\Requests\Install\Setting as Request;
use App\Models\Auth\User;
use App\Models\Company\Company;
use DotenvEditor;
use File;
use App\Utilities\AppConfigurer;
use Illuminate\Routing\Controller;
use Setting;
class Settings extends Controller
{
@ -33,76 +28,21 @@ class Settings extends Controller
public function store(Request $request)
{
// Create company
$this->createCompany($request);
$companyName = $request['company_name'];
$companyEmail= $request['company_email'];
$locale= session('locale');
AppConfigurer::createCompany($companyName, $companyEmail, $locale);
// Create user
$this->createUser($request);
$adminEmail = $request['user_email'];
$adminPassword = $request['user_password'];
$locale= session('locale');
AppConfigurer::createUser($adminEmail, $adminPassword, $locale);
// Make the final touches
$this->finalTouches();
AppConfigurer::finalTouches();
// Redirect to dashboard
return redirect('auth/login');
}
private function createCompany($request)
{
// Create company
$company = Company::create([
'domain' => '',
]);
// Set settings
Setting::set([
'general.company_name' => $request['company_name'],
'general.company_email' => $request['company_email'],
'general.default_currency' => 'USD',
'general.default_locale' => session('locale'),
]);
Setting::setExtraColumns(['company_id' => $company->id]);
Setting::save();
}
private function createUser($request)
{
// Create the user
$user = User::create([
'name' => $request[''],
'email' => $request['user_email'],
'password' => $request['user_password'],
'locale' => session('locale'),
]);
// Attach admin role
$user->roles()->attach('1');
// Attach company
$user->companies()->attach('1');
}
private function finalTouches()
{
// Caching the config and route
//Artisan::call('config:cache');
//Artisan::call('route:cache');
// Update .env file
DotenvEditor::setKeys([
[
'key' => 'APP_INSTALLED',
'value' => 'true',
],
[
'key' => 'APP_DEBUG',
'value' => 'false',
],
])->save();
// Rename the robots.txt file
try {
File::move(base_path('robots.txt.dist'), base_path('robots.txt'));
} catch (\Exception $e) {
// nothing to do
}
}
}