x-systems / epesi-core

src/System/User/Database/Migrations/2014_10_12_000000_create_users_table.php

Indentation +26 added lines, -26 removed lines

@@ -6,31 +6,31 @@
 
 class CreateUsersTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('users', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name');
-            $table->string('email')->unique();
-            $table->timestamp('email_verified_at')->nullable();
-            $table->string('password');
-            $table->rememberToken();
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('users', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('name');
+			$table->string('email')->unique();
+			$table->timestamp('email_verified_at')->nullable();
+			$table->string('password');
+			$table->rememberToken();
+			$table->timestamps();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('users');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('users');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('users', function (Blueprint $table) {
+        Schema::create('users', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name');
             $table->string('email')->unique();

src/System/User/Access/Database/Migrations/2019_10_24_195050_create_permission_tables.php

Indentation +93 added lines, -93 removed lines

@@ -6,97 +6,97 @@
 
 class CreatePermissionTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $tableNames = config('permission.table_names');
-        $columnNames = config('permission.column_names');
-
-        Schema::create($tableNames['permissions'], function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name');
-            $table->string('guard_name');
-            $table->timestamps();
-        });
-
-        Schema::create($tableNames['roles'], function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name');
-            $table->string('guard_name');
-            $table->timestamps();
-        });
-
-        Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames) {
-            $table->unsignedBigInteger('permission_id');
-
-            $table->string('model_type');
-            $table->unsignedBigInteger($columnNames['model_morph_key']);
-            $table->index([$columnNames['model_morph_key'], 'model_type', ], 'model_has_permissions_model_id_model_type_index');
-
-            $table->foreign('permission_id')
-                ->references('id')
-                ->on($tableNames['permissions'])
-                ->onDelete('cascade');
-
-            $table->primary(['permission_id', $columnNames['model_morph_key'], 'model_type'],
-                    'model_has_permissions_permission_model_type_primary');
-        });
-
-        Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) {
-            $table->unsignedBigInteger('role_id');
-
-            $table->string('model_type');
-            $table->unsignedBigInteger($columnNames['model_morph_key']);
-            $table->index([$columnNames['model_morph_key'], 'model_type', ], 'model_has_roles_model_id_model_type_index');
-
-            $table->foreign('role_id')
-                ->references('id')
-                ->on($tableNames['roles'])
-                ->onDelete('cascade');
-
-            $table->primary(['role_id', $columnNames['model_morph_key'], 'model_type'],
-                    'model_has_roles_role_model_type_primary');
-        });
-
-        Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) {
-            $table->unsignedBigInteger('permission_id');
-            $table->unsignedBigInteger('role_id');
-
-            $table->foreign('permission_id')
-                ->references('id')
-                ->on($tableNames['permissions'])
-                ->onDelete('cascade');
-
-            $table->foreign('role_id')
-                ->references('id')
-                ->on($tableNames['roles'])
-                ->onDelete('cascade');
-
-            $table->primary(['permission_id', 'role_id'], 'role_has_permissions_permission_id_role_id_primary');
-        });
-
-        app('cache')
-            ->store(config('permission.cache.store') != 'default' ? config('permission.cache.store') : null)
-            ->forget(config('permission.cache.key'));
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        $tableNames = config('permission.table_names');
-
-        Schema::drop($tableNames['role_has_permissions']);
-        Schema::drop($tableNames['model_has_roles']);
-        Schema::drop($tableNames['model_has_permissions']);
-        Schema::drop($tableNames['roles']);
-        Schema::drop($tableNames['permissions']);
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		$tableNames = config('permission.table_names');
+		$columnNames = config('permission.column_names');
+
+		Schema::create($tableNames['permissions'], function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('name');
+			$table->string('guard_name');
+			$table->timestamps();
+		});
+
+		Schema::create($tableNames['roles'], function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('name');
+			$table->string('guard_name');
+			$table->timestamps();
+		});
+
+		Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames) {
+			$table->unsignedBigInteger('permission_id');
+
+			$table->string('model_type');
+			$table->unsignedBigInteger($columnNames['model_morph_key']);
+			$table->index([$columnNames['model_morph_key'], 'model_type', ], 'model_has_permissions_model_id_model_type_index');
+
+			$table->foreign('permission_id')
+				->references('id')
+				->on($tableNames['permissions'])
+				->onDelete('cascade');
+
+			$table->primary(['permission_id', $columnNames['model_morph_key'], 'model_type'],
+					'model_has_permissions_permission_model_type_primary');
+		});
+
+		Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) {
+			$table->unsignedBigInteger('role_id');
+
+			$table->string('model_type');
+			$table->unsignedBigInteger($columnNames['model_morph_key']);
+			$table->index([$columnNames['model_morph_key'], 'model_type', ], 'model_has_roles_model_id_model_type_index');
+
+			$table->foreign('role_id')
+				->references('id')
+				->on($tableNames['roles'])
+				->onDelete('cascade');
+
+			$table->primary(['role_id', $columnNames['model_morph_key'], 'model_type'],
+					'model_has_roles_role_model_type_primary');
+		});
+
+		Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) {
+			$table->unsignedBigInteger('permission_id');
+			$table->unsignedBigInteger('role_id');
+
+			$table->foreign('permission_id')
+				->references('id')
+				->on($tableNames['permissions'])
+				->onDelete('cascade');
+
+			$table->foreign('role_id')
+				->references('id')
+				->on($tableNames['roles'])
+				->onDelete('cascade');
+
+			$table->primary(['permission_id', 'role_id'], 'role_has_permissions_permission_id_role_id_primary');
+		});
+
+		app('cache')
+			->store(config('permission.cache.store') != 'default' ? config('permission.cache.store') : null)
+			->forget(config('permission.cache.key'));
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		$tableNames = config('permission.table_names');
+
+		Schema::drop($tableNames['role_has_permissions']);
+		Schema::drop($tableNames['model_has_roles']);
+		Schema::drop($tableNames['model_has_permissions']);
+		Schema::drop($tableNames['roles']);
+		Schema::drop($tableNames['permissions']);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -16,21 +16,21 @@ 
         $tableNames = config('permission.table_names');
         $columnNames = config('permission.column_names');
 
-        Schema::create($tableNames['permissions'], function (Blueprint $table) {
+        Schema::create($tableNames['permissions'], function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name');
             $table->string('guard_name');
             $table->timestamps();
         });
 
-        Schema::create($tableNames['roles'], function (Blueprint $table) {
+        Schema::create($tableNames['roles'], function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name');
             $table->string('guard_name');
             $table->timestamps();
         });
 
-        Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames) {
+        Schema::create($tableNames['model_has_permissions'], function(Blueprint $table) use ($tableNames, $columnNames) {
             $table->unsignedBigInteger('permission_id');
 
             $table->string('model_type');
@@ -46,7 +46,7 @@ 
                     'model_has_permissions_permission_model_type_primary');
         });
 
-        Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) {
+        Schema::create($tableNames['model_has_roles'], function(Blueprint $table) use ($tableNames, $columnNames) {
             $table->unsignedBigInteger('role_id');
 
             $table->string('model_type');
@@ -62,7 +62,7 @@ 
                     'model_has_roles_role_model_type_primary');
         });
 
-        Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) {
+        Schema::create($tableNames['role_has_permissions'], function(Blueprint $table) use ($tableNames) {
             $table->unsignedBigInteger('permission_id');
             $table->unsignedBigInteger('role_id');
 

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

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();
 		

Spacing +10 added lines, -10 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,39 +41,39 @@ 
 	}
 	
 	public static function get($group, $name, $user = null) {
-		$user = $user?: Auth::id();
+		$user = $user ?: Auth::id();
 		
 		if (!$user || !is_numeric($user)) return;
 		
 		self::cache();
 		
-		return self::$userVariables[$user][$group][$name]?? self::getAdmin($group, $name);
+		return self::$userVariables[$user][$group][$name] ?? self::getAdmin($group, $name);
 	}
 	
 	public static function getGroup($group, $user = null) {
-		$user = $user?: Auth::id();
+		$user = $user ?: Auth::id();
 		
 		if (!$user || !is_numeric($user)) return;
 		
 		self::cache();
 
-		return self::$userVariables[$user][$group]?? [];
+		return self::$userVariables[$user][$group] ?? [];
 	}
 	
 	public static function getAdmin($group, $name) {
 		self::cache();
 		
-		return self::$adminVariables[$group][$name]?? null;
+		return self::$adminVariables[$group][$name] ?? null;
 	}
 	
 	public static function getAdminGroup($group) {
 		self::cache();
 		
-		return self::$adminVariables[$group]?? [];
+		return self::$adminVariables[$group] ?? [];
 	}
 	
 	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;
 		

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/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 +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	public function body()
 	{
 		$layout = View::addTo($this)->addStyle('max-width:1200px;margin:auto;');
-		\atk4\ui\Header::addTo($layout, [ __($this->label)]);
+		\atk4\ui\Header::addTo($layout, [__($this->label)]);
 		$segment = View::addTo($layout, ['ui' => 'segment']);
 
 		$form = Form::addTo($segment);
@@ -53,7 +53,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'];
@@ -64,7 +64,7 @@ 
 		});
 					
 		$form->onSubmit(function($form) {
-			if ($logo = $form->model['custom_logo']? $form->model['logo']: null) {
+			if ($logo = $form->model['custom_logo'] ? $form->model['logo'] : null) {
 				$storage = $this->storage();
 				$from = self::alias() . '/tmp/' . $logo;
 				$to = self::alias() . '/' . $logo;				

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@ 
 		$form->addControl('custom_logo', [\atk4\ui\Form\Control\Checkbox::class, 'caption' => __('Use custom logo')]);
 		
 		$form->model->setMulti([
-		        'title' => Variable::recall('system.title'),
-		        'custom_logo' => (bool) Variable::recall('system.logo')
+				'title' => Variable::recall('system.title'),
+				'custom_logo' => (bool) Variable::recall('system.logo')
 		]);
 		
 		$logo = $form->addControl('logo', [
@@ -76,7 +76,7 @@ 
 				$storage->move($from, $to);
 			}
 
-	        Variable::memorize('system.logo', $logo);
+			Variable::memorize('system.logo', $logo);
 			
 			Variable::memorize('system.title', $form->model['title']);
 			

src/Helpers/Utils.php

Indentation +8 added lines, -8 removed lines

@@ -4,14 +4,14 @@
 
 class Utils
 {
-    public static function bytesToHuman($bytes)
-    {
-        $units = [__('B'), __('KiB'), __('MiB'), __('GiB'), __('TiB'), __('PiB')];
+	public static function bytesToHuman($bytes)
+	{
+		$units = [__('B'), __('KiB'), __('MiB'), __('GiB'), __('TiB'), __('PiB')];
 
-        for ($i = 0; $bytes > 1024; $i++) {
-            $bytes /= 1024;
-        }
+		for ($i = 0; $bytes > 1024; $i++) {
+			$bytes /= 1024;
+		}
 
-        return round($bytes, 2) . ' ' . $units[$i];
-    }
+		return round($bytes, 2) . ' ' . $units[$i];
+	}
 }
\ No newline at end of file

src/Providers/EpesiServiceProvider.php

Spacing +1 added lines, -1 removed lines

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

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', 'middleware' => 'web'], function() {
-    		Route::any('/', 'Controller@index');
-    		Route::get('logo', 'Controller@logo');
-    		Route::any('install', 'Controller@install');
+		Route::group(['namespace' => 'Epesi\Core', 'middleware' => 'web'], function() {
+			Route::any('/', 'Controller@index');
+			Route::get('logo', 'Controller@logo');
+			Route::any('install', 'Controller@install');
     		
-    		Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
-    			Route::any('home', 'Controller@home')->name('home');
+			Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
+				Route::any('home', 'Controller@home')->name('home');
     			
-    			Route::any('view/{alias}/{method?}/{args?}', 'Controller@view');
-    		});
-    	});
+				Route::any('view/{alias}/{method?}/{args?}', 'Controller@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(UI::class);
+	/**
+	 * Register the provider.
+	 */
+	public function register()
+	{
+		$this->app->singleton(UI::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);
+		}
+	}
 }

Braces +3 added lines, -1 removed lines

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