x-systems / epesi-core

src/System/User/Access/AccessCore.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	public static function boot()
 	{
 		// allow Super Admin full access
-		Gate::after(function ($user, $ability) {
+		Gate::after(function($user, $ability) {
 			return $user->hasRole('Super Admin');
 		});
 	}

src/System/User/Settings/Database/Models/UserSetting.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	}
 	
 	private static function cacheUserVariables() {
-		if(isset(self::$userVariables)) return;
+		if (isset(self::$userVariables)) return;
 
 		$userId = Auth::id();
 		
@@ -33,7 +33,7 @@ 
 	}
 	
 	private static function cacheAdminVariables() {
-		if(isset(self::$adminVariables)) return;
+		if (isset(self::$adminVariables)) return;
 
 		foreach (self::where('user_id', 0) as $row) {
 			self::$adminVariables[$row['group']][$row['name']] = $row['value'];
@@ -41,7 +41,7 @@ 
 	}
 	
 	public static function get($group, $name, $user = null) {
-		$user = $user?: Auth::id();
+		$user = $user ?: Auth::id();
 		
 		if (!$user || !is_numeric($user)) return;
 		
@@ -51,7 +51,7 @@ 
 	}
 	
 	public static function getGroup($group, $user = null) {
-		$user = $user?: Auth::id();
+		$user = $user ?: Auth::id();
 		
 		if (!$user || !is_numeric($user)) return;
 		
@@ -73,7 +73,7 @@ 
 	}
 	
 	public static function put($group, $name, $value, $user = null) {
-		$user_id = $user?: Auth::id();
+		$user_id = $user ?: Auth::id();
 		
 		if (!$user_id || !is_numeric($user_id)) return;
 		
@@ -101,7 +101,7 @@ 
 	}
 	
 	public static function forget($group, $name, $user = null) {
-		$user_id = $user?: Auth::id();
+		$user_id = $user ?: Auth::id();
 		
 		if (!$user_id || !is_numeric($user_id)) return;
 		

Braces +18 added lines, -6 removed lines

@@ -23,7 +23,9 @@ 
 	}
 	
 	private static function cacheUserVariables() {
-		if(isset(self::$userVariables)) return;
+		if(isset(self::$userVariables)) {
+			return;
+		}
 
 		$userId = Auth::id();
 		
@@ -33,7 +35,9 @@ 
 	}
 	
 	private static function cacheAdminVariables() {
-		if(isset(self::$adminVariables)) return;
+		if(isset(self::$adminVariables)) {
+			return;
+		}
 
 		foreach (self::where('user_id', 0) as $row) {
 			self::$adminVariables[$row['group']][$row['name']] = $row['value'];
@@ -43,7 +47,9 @@ 
 	public static function get($group, $name, $user = null) {
 		$user = $user?: Auth::id();
 		
-		if (!$user || !is_numeric($user)) return;
+		if (!$user || !is_numeric($user)) {
+			return;
+		}
 		
 		self::cache();
 		
@@ -53,7 +59,9 @@ 
 	public static function getGroup($group, $user = null) {
 		$user = $user?: Auth::id();
 		
-		if (!$user || !is_numeric($user)) return;
+		if (!$user || !is_numeric($user)) {
+			return;
+		}
 		
 		self::cache();
 
@@ -75,7 +83,9 @@ 
 	public static function put($group, $name, $value, $user = null) {
 		$user_id = $user?: Auth::id();
 		
-		if (!$user_id || !is_numeric($user_id)) return;
+		if (!$user_id || !is_numeric($user_id)) {
+			return;
+		}
 		
 		self::cache();
 
@@ -103,7 +113,9 @@ 
 	public static function forget($group, $name, $user = null) {
 		$user_id = $user?: Auth::id();
 		
-		if (!$user_id || !is_numeric($user_id)) return;
+		if (!$user_id || !is_numeric($user_id)) {
+			return;
+		}
 		
 		self::cache();
 		

src/System/User/Settings/Database/Migrations/2019_09_18_173148_create_user_settings_table.php

Indentation +25 added lines, -25 removed lines

@@ -6,31 +6,31 @@
 
 class CreateUserSettingsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-    	$this->down();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		$this->down();
     	
-    	Schema::create('user_settings', function (Blueprint $table) {
-    		$table->increments('id');
-    		$table->unsignedInteger('user_id');
-            $table->string('group', 512);
-            $table->string('name', 128);
-            $table->text('value');
-        });
-    }
+		Schema::create('user_settings', function (Blueprint $table) {
+			$table->increments('id');
+			$table->unsignedInteger('user_id');
+			$table->string('group', 512);
+			$table->string('name', 128);
+			$table->text('value');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    	Schema::dropIfExists('user_settings');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('user_settings');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     {
     	$this->down();
     	
-    	Schema::create('user_settings', function (Blueprint $table) {
+    	Schema::create('user_settings', function(Blueprint $table) {
     		$table->increments('id');
     		$table->unsignedInteger('user_id');
             $table->string('group', 512);

src/System/User/Settings/Integration/Joints/UserSettingsJoint.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	 */
 	public function group()
 	{
-		return $this->group?: static::class;
+		return $this->group ?: static::class;
 	}
 	
 	/**

src/System/SystemInstallWizard.php

Braces +3 added lines, -1 removed lines

@@ -139,7 +139,9 @@
 		$form->addField('create', ['CheckBox', 'caption' => __('Create New Database')])->on('change', new jsExpression('if ($(event.target).is(":checked")) alert([])', [__('WARNING: Make sure you have CREATE access level to do this!')]));
 
 		foreach ($wizard->recall('connection', []) as $name => $value) {
-			if (! $field = $form->fields[$name]?? null) continue;
+			if (! $field = $form->fields[$name]?? null) {
+				continue;
+			}
 			
 			$field->set($value);
 		}

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
 		
 		$form->addField('language', ['DropDown', 'values' => $values, 'caption' => __('Select Language'), 'iconLeft' => 'globe'], ['required'=>true])->set($wizard->recall('language', 'en'));
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			$wizard->memorize('language', $form->model['language']);
 			
 			App::setLocale($form->model['language']);
@@ -111,7 +111,7 @@ 
 		$form->addField('support', ['CheckBox', 'caption' => __('I will not remove "Support -> About" credit page from the application menu.')], ['required'=>true]);
 		$form->addField('store', ['CheckBox', 'caption' => __('I will not remove or rename ":epesi Store" links from the application.', ['epesi' => config('epesi.app.title')])], ['required'=>true]);
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			return $wizard->jsNext();
 		});
 			
@@ -139,12 +139,12 @@ 
 		$form->addField('create', ['CheckBox', 'caption' => __('Create New Database')])->on('change', new jsExpression('if ($(event.target).is(":checked")) alert([])', [__('WARNING: Make sure you have CREATE access level to do this!')]));
 
 		foreach ($wizard->recall('connection', []) as $name => $value) {
-			if (! $field = $form->fields[$name]?? null) continue;
+			if (!$field = $form->fields[$name]?? null) continue;
 			
 			$field->set($value);
 		}
 
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			$connection = $form->model->get();
 
 			$wizard->memorize('connection', $connection);
@@ -192,7 +192,7 @@ 
 		
 		$form->model->set($wizard->recall('user'));
 		
-		$form->validate(function ($form) use ($wizard) {
+		$form->validate(function($form) use ($wizard) {
 			$wizard->memorize('user', $form->model->get());
 			
 			return $wizard->jsNext();

src/Providers/EpesiServiceProvider.php

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
     {
     	$this->ensureHttps();
     	
-    	if (env('APP_DEBUG', false)) ModuleManager::clearCache();
+    	if (env('APP_DEBUG', false)) {
+    		ModuleManager::clearCache();
+    	}
     	
     	Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() {
     		Route::any('/', 'SystemController@index');

Indentation +54 added lines, -54 removed lines

@@ -12,73 +12,73 @@
 
 class EpesiServiceProvider extends ServiceProvider
 {
-    /**
-     * Booting the package.
-     */
-    public function boot()
-    {
-    	$this->ensureHttps();
+	/**
+	 * Booting the package.
+	 */
+	public function boot()
+	{
+		$this->ensureHttps();
     	
-    	if (env('APP_DEBUG', false)) ModuleManager::clearCache();
+		if (env('APP_DEBUG', false)) ModuleManager::clearCache();
     	
-    	Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() {
-    		Route::any('/', 'SystemController@index');
-    		Route::get('logo', 'SystemController@logo');
-    		Route::any('install', 'SystemController@install');
+		Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() {
+			Route::any('/', 'SystemController@index');
+			Route::get('logo', 'SystemController@logo');
+			Route::any('install', 'SystemController@install');
     		
-    		Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
-    			Route::any('home', 'SystemController@home')->name('home');
+			Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
+				Route::any('home', 'SystemController@home')->name('home');
     			
-    			Route::any('view/{alias}/{method?}/{args?}', 'SystemController@view');
-    		});
-    	});
+				Route::any('view/{alias}/{method?}/{args?}', 'SystemController@view');
+			});
+		});
 
-    	// call boot methods on all modules
-    	ModuleManager::call('boot');
+		// call boot methods on all modules
+		ModuleManager::call('boot');
     		
 		foreach (ModuleManager::collect('translations') as $path) {
 			$this->loadJsonTranslationsFrom($path);
 		}
 		
-    	// Register admin service provider if in admin mode or in console
-    	// TODO: apply access restriction to admin mode
+		// Register admin service provider if in admin mode or in console
+		// TODO: apply access restriction to admin mode
 //     	if ($this->app->runningInConsole() || (request('admin', false) && Auth::user()->can('modify system'))) {
-    	if ($this->app->runningInConsole() || request('admin', false)) {
-    		$this->app->register(AdminServiceProvider::class);
-    	}
-    }
+		if ($this->app->runningInConsole() || request('admin', false)) {
+			$this->app->register(AdminServiceProvider::class);
+		}
+	}
 
-    /**
-     * Register the provider.
-     */
-    public function register()
-    {
-    	$this->app->singleton(App::class);
+	/**
+	 * Register the provider.
+	 */
+	public function register()
+	{
+		$this->app->singleton(App::class);
     	
-    	$this->app->singleton(
-    			SQL::class,
-    			function ($app) {
-    				/**
-    				 * Database Manager
-    				 *
-    				 * @var \Illuminate\Database\DatabaseManager $db
-    				 */
-    				$db = DB::getFacadeRoot();
+		$this->app->singleton(
+				SQL::class,
+				function ($app) {
+					/**
+					 * Database Manager
+					 *
+					 * @var \Illuminate\Database\DatabaseManager $db
+					 */
+					$db = DB::getFacadeRoot();
     				
-    				return new SQL($db);
-    			});
-    }
+					return new SQL($db);
+				});
+	}
     
-    /**
-     * Force to set https scheme if https enabled.
-     *
-     * @return void
-     */
-    protected function ensureHttps()
-    {
-    	if (config('epesi.https') || config('epesi.secure')) {
-    		url()->forceScheme('https');
-    		$this->app['request']->server->set('HTTPS', true);
-    	}
-    }
+	/**
+	 * Force to set https scheme if https enabled.
+	 *
+	 * @return void
+	 */
+	protected function ensureHttps()
+	{
+		if (config('epesi.https') || config('epesi.secure')) {
+			url()->forceScheme('https');
+			$this->app['request']->server->set('HTTPS', true);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     	
     	$this->app->singleton(
     			SQL::class,
-    			function ($app) {
+    			function($app) {
     				/**
     				 * Database Manager
     				 *

src/System/Logo/LogoSettings.php

Braces +3 added lines, -1 removed lines

@@ -42,7 +42,9 @@
 		});
 
 		$logo->onUpload(function ($files) use ($form, $logo) {
-			if ($files === 'error')	return $form->error('logo', __('Error uploading image'));
+			if ($files === 'error') {
+				return $form->error('logo', __('Error uploading image'));
+			}
 			
 			$tmpPath = self::alias() . '/tmp/' . $files['name'];
 			

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 			$logo->setThumbnailSrc(asset('storage/' . self::alias() . '/' . self::$defaultLogo));
 		});
 
-		$logo->onUpload(function ($files) use ($form, $logo) {
+		$logo->onUpload(function($files) use ($form, $logo) {
 			if ($files === 'error')	return $form->error('logo', __('Error uploading image'));
 			
 			$tmpPath = self::alias() . '/tmp/' . $files['name'];
@@ -59,7 +59,7 @@ 
 		});
 					
 		$form->onSubmit(function($form) {
-			if ($name = $form->model['custom_logo']? $form->model['logo']: null) {
+			if ($name = $form->model['custom_logo'] ? $form->model['logo'] : null) {
 				$storage = $this->storage();
 				$from = self::alias() . '/tmp/' . $name;
 				$to = self::alias() . '/' . $name;				

src/System/Seeds/ActionButton.php

Indentation +51 added lines, -51 removed lines

@@ -8,79 +8,79 @@
 
 class ActionButton extends View
 {
-    public $defaultTemplate = 'action_button.html';
+	public $defaultTemplate = 'action_button.html';
 
-    public $ui = 'basic inverted action button';
+	public $ui = 'basic inverted action button';
 
-    /**
-     * Icon that will appear on the button (top).
-     *
-     * @var string|array|Icon
-     */
-    public $icon;
+	/**
+	 * Icon that will appear on the button (top).
+	 *
+	 * @var string|array|Icon
+	 */
+	public $icon;
     
-    public $label;
+	public $label;
 
-    public $element = 'a';
+	public $element = 'a';
     
-    public $weight = 10;
+	public $weight = 10;
     
-    public $callback;
+	public $callback;
 
-    public function renderView()
-    {
-        $this->addIcon();
+	public function renderView()
+	{
+		$this->addIcon();
         
-        $this->addLabel();
+		$this->addLabel();
         
-        $this->addCallback();
+		$this->addCallback();
 
-        parent::renderView();
-    }
+		parent::renderView();
+	}
     
-    protected function addIcon()
-    {
-    	if (! $icon = $this->getIcon()) return;
+	protected function addIcon()
+	{
+		if (! $icon = $this->getIcon()) return;
     	
-    	$this->add($icon, 'Icon')->id = null;
+		$this->add($icon, 'Icon')->id = null;
     	
-    	$this->addClass('icon');
+		$this->addClass('icon');
     	
-    	return $this;
-    }
+		return $this;
+	}
     
-    protected function addLabel()
-    {
-    	$this->content = $this->label?: $this->content;
+	protected function addLabel()
+	{
+		$this->content = $this->label?: $this->content;
     	
-    	return $this;
-    }
+		return $this;
+	}
 
-    public function getIcon()
-    {
-    	return is_object($this->icon)? $this->icon: new Icon($this->icon);
-    }
+	public function getIcon()
+	{
+		return is_object($this->icon)? $this->icon: new Icon($this->icon);
+	}
     
-    public function callback($callable)
-    {
-    	$this->callback = $callable;
+	public function callback($callable)
+	{
+		$this->callback = $callable;
     	
-    	return $this;
-    }
+		return $this;
+	}
     
-    public function addCallback()
-    {
-    	if (!$callable = $this->callback) return;
+	public function addCallback()
+	{
+		if (!$callable = $this->callback) return;
     	
-    	if (is_callable($callable)) {
-    		$callable = $this->add('jsCallback')->set($callable);
-    	}
+		if (is_callable($callable)) {
+			$callable = $this->add('jsCallback')->set($callable);
+		}
     	
-    	if ($callable instanceof jsCallback) {
-    		$this->on('click', $callable);
-    	}
+		if ($callable instanceof jsCallback) {
+			$this->on('click', $callable);
+		}
     	
-    	return $this;
-    }
+		return $this;
+	}
 
 }

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     
     protected function addIcon()
     {
-    	if (! $icon = $this->getIcon()) return;
+    	if (!$icon = $this->getIcon()) return;
     	
     	$this->add($icon, 'Icon')->id = null;
     	
@@ -51,14 +51,14 @@ 
     
     protected function addLabel()
     {
-    	$this->content = $this->label?: $this->content;
+    	$this->content = $this->label ?: $this->content;
     	
     	return $this;
     }
 
     public function getIcon()
     {
-    	return is_object($this->icon)? $this->icon: new Icon($this->icon);
+    	return is_object($this->icon) ? $this->icon : new Icon($this->icon);
     }
     
     public function callback($callable)

Braces +6 added lines, -2 removed lines

@@ -40,7 +40,9 @@ 
     
     protected function addIcon()
     {
-    	if (! $icon = $this->getIcon()) return;
+    	if (! $icon = $this->getIcon()) {
+    		return;
+    	}
     	
     	$this->add($icon, 'Icon')->id = null;
     	
@@ -70,7 +72,9 @@ 
     
     public function addCallback()
     {
-    	if (!$callable = $this->callback) return;
+    	if (!$callable = $this->callback) {
+    		return;
+    	}
     	
     	if (is_callable($callable)) {
     		$callable = $this->add('jsCallback')->set($callable);

src/Controllers/SystemController.php

Braces +6 added lines, -2 removed lines

@@ -20,7 +20,9 @@ 
     	// make sure the installation information is fresh
     	ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+    	if (SystemCore::isInstalled()) {
+    		return redirect('home');
+    	}
     	
     	$epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
     	
@@ -64,7 +66,9 @@ 
     		}
     	}
 
-    	if (! $view) abort(404);
+    	if (! $view) {
+    		abort(404);
+    	}
     	
     	$epesi->add($view)->displayModuleContent($method, $args);
     	

Indentation +43 added lines, -43 removed lines

@@ -11,66 +11,66 @@
 
 class SystemController extends Controller
 {
-    public function index()
-    {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
-    }
+	public function index()
+	{
+		return SystemCore::isInstalled()? redirect('home'): redirect('install');
+	}
     
-    public function install(Epesi $epesi)
-    {
-    	// make sure the installation information is fresh
-    	ModuleManager::clearCache();
+	public function install(Epesi $epesi)
+	{
+		// make sure the installation information is fresh
+		ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+		if (SystemCore::isInstalled()) return redirect('home');
     	
-    	$epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
+		$epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
     	
-    	$epesi->initLayout('Centered');
+		$epesi->initLayout('Centered');
     	
-    	$epesi->layout->set('logo', url('logo'));
-    	$epesi->layout->template->setHTML('copyright', config('epesi.app.copyright'));
+		$epesi->layout->set('logo', url('logo'));
+		$epesi->layout->template->setHTML('copyright', config('epesi.app.copyright'));
     	
-    	$epesi->add(new \Epesi\Core\System\SystemInstallWizard());
+		$epesi->add(new \Epesi\Core\System\SystemInstallWizard());
     	
-    	return $epesi->response();
-    }
+		return $epesi->response();
+	}
     
-    public function home()
-    {
-    	return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
-    }
+	public function home()
+	{
+		return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
+	}
     
-    public function logo()
-    { 
-    	$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
+	public function logo()
+	{ 
+		$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
 
-    	return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
-    }
+		return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
+	}
     
-    public function view(Epesi $epesi, $module, $method = 'body', $args = [])
-    {
-    	$epesi->initLayout(new LayoutView());
+	public function view(Epesi $epesi, $module, $method = 'body', $args = [])
+	{
+		$epesi->initLayout(new LayoutView());
     	
-    	$alias = explode(':', $module);
+		$alias = explode(':', $module);
     	
-    	$moduleAlias = $alias[0];
-    	$viewAlias = $alias[1]?? null;
+		$moduleAlias = $alias[0];
+		$viewAlias = $alias[1]?? null;
     	
-    	$view = null;
-    	if ($module = ModuleManager::getClass($moduleAlias, true)) {
-    		$viewClass = $module::view($viewAlias);
+		$view = null;
+		if ($module = ModuleManager::getClass($moduleAlias, true)) {
+			$viewClass = $module::view($viewAlias);
 
-    		if (class_exists($viewClass)) {
-    			$view = new $viewClass();
-    		}
-    	}
+			if (class_exists($viewClass)) {
+				$view = new $viewClass();
+			}
+		}
 
-    	if (! $view) abort(404);
+		if (! $view) abort(404);
     	
-    	$epesi->add($view)->displayModuleContent($method, $args);
+		$epesi->add($view)->displayModuleContent($method, $args);
     	
-    	$epesi->setLocation($view->location());
+		$epesi->setLocation($view->location());
     	
-    	return $epesi->response();
-    }
+		return $epesi->response();
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 {
     public function index()
     {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
+    	return SystemCore::isInstalled() ? redirect('home') : redirect('install');
     }
     
     public function install(Epesi $epesi)
@@ -37,7 +37,7 @@ 
     
     public function home()
     {
-    	return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
+    	return redirect(SystemCore::isInstalled() ? \Epesi\Core\HomePage\Models\HomePage::pathOfUser() : 'install');
     }
     
     public function logo()
@@ -65,7 +65,7 @@ 
     		}
     	}
 
-    	if (! $view) abort(404);
+    	if (!$view) abort(404);
     	
     	$epesi->add($view)->displayModuleContent($method, $args);