x-systems / epesi-core

src/Middleware/NoCacheHeaders.php

Indentation +19 added lines, -19 removed lines

@@ -6,25 +6,25 @@
 
 class NoCacheHeaders
 {
-    /**
-     * Add cache related HTTP headers.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string|array  $options
-     * @return \Symfony\Component\HttpFoundation\Response
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function handle($request, Closure $next, $options = [])
-    {
-        $response = $next($request);
+	/**
+	 * Add cache related HTTP headers.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @param  string|array  $options
+	 * @return \Symfony\Component\HttpFoundation\Response
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function handle($request, Closure $next, $options = [])
+	{
+		$response = $next($request);
 
-        $response->headers->addCacheControlDirective('no-cache', true);
-        $response->headers->addCacheControlDirective('max-age', 0);
-        $response->headers->addCacheControlDirective('must-revalidate', true);
-        $response->headers->addCacheControlDirective('no-store', true);
+		$response->headers->addCacheControlDirective('no-cache', true);
+		$response->headers->addCacheControlDirective('max-age', 0);
+		$response->headers->addCacheControlDirective('must-revalidate', true);
+		$response->headers->addCacheControlDirective('no-store', true);
         
-        return $response;
-    }
+		return $response;
+	}
 }

src/HomePage/HomePageSettings.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
 			return [['Template', $availablePages[$row[$column]]?? '[' . __('missing: :path', ['path' => $row[$column]]) . ']']];
 		}]);
 		
-		$this->grid->addDragHandler()->onReorder(function ($order) {
+		$this->grid->addDragHandler()->onReorder(function($order) {
 			$result = true;
 			foreach ($this->getHomepages() as $homepage) {
 				$homepage->priority = array_search($homepage->id, $order);
@@ -53,10 +53,10 @@ 
 				$result &= $homepage->save();
 			}
 			
-			return $result? $this->notify(__('Homepages reordered!')): $this->notifyError(__('Error saving order!'));
+			return $result ? $this->notify(__('Homepages reordered!')) : $this->notifyError(__('Error saving order!'));
 		});
 		
-		$this->grid->addAction(['icon' => 'red trash'], function ($jschain, $id) {
+		$this->grid->addAction(['icon' => 'red trash'], function($jschain, $id) {
 			HomePage::find($id)->delete();
 				
 			return $jschain->closest('tr')->transition('fade left');
@@ -92,7 +92,7 @@ 
 	
 	public function getHomepageForm()
 	{
-		if (! $this->form) {		
+		if (!$this->form) {		
 			$this->form = new Form(['buttonSave' => ['Button', __('Save'), 'primary']]);
 	
 			$this->form->addHook('submit', function($form) {

src/App.php

Spacing +11 added lines, -11 removed lines

@@ -33,7 +33,7 @@ 
 		//TODO: set the skin from admin / user selection
 		$this->skin = config('epesi.app.skin', $this->skin);
 
-		$this->template_dir = array_merge(ModuleManager::collect('templates', $this->skin), $this->template_dir?: []);
+		$this->template_dir = array_merge(ModuleManager::collect('templates', $this->skin), $this->template_dir ?: []);
 	}
 	
 	final public static function module()
@@ -81,35 +81,35 @@ 
 		//TODO: include below in app.js and app.css
 		// jQuery
 		$urlJs = $this->cdn['jquery']?? 'storage/system/js';
-		$this->requireJS($urlJs.'/jquery.min.js');
+		$this->requireJS($urlJs . '/jquery.min.js');
 		
 		// Semantic UI
 		$urlJs = $this->cdn['semantic-ui']?? 'storage/system/js';
 		$urlCss = $this->cdn['semantic-ui']?? 'storage/system/css';
-		$this->requireJS($urlJs.'/semantic.min.js');
-		$this->requireCSS($urlCss.'/semantic.min.css');
+		$this->requireJS($urlJs . '/semantic.min.js');
+		$this->requireCSS($urlCss . '/semantic.min.css');
 		
 		// Serialize Object
 		$urlJs = $this->cdn['serialize-object']?? 'storage/system/js';
-		$this->requireJS($urlJs.'/jquery.serialize-object.min.js');
+		$this->requireJS($urlJs . '/jquery.serialize-object.min.js');
 		
 		// Agile UI
 		$urlJs = $this->cdn['atk']?? 'storage/system/js';
 		$urlCss = $this->cdn['atk']?? 'storage/system/css';
-		$this->requireJS($urlJs.'/atkjs-ui.min.js');
-		$this->requireCSS($urlCss.'/agileui.css');
+		$this->requireJS($urlJs . '/atkjs-ui.min.js');
+		$this->requireCSS($urlCss . '/agileui.css');
 		
 		// Draggable
 		$urlJs = $this->cdn['draggable']?? 'storage/system/js';
-		$this->requireJS($urlJs.'/draggable.bundle.js');
+		$this->requireJS($urlJs . '/draggable.bundle.js');
 		
 		// jQuery UI	
 		$urlJs = $this->cdn['jquery-ui']?? 'storage/system/js';
-		$this->requireJS($urlJs.'/jquery-ui.js');
+		$this->requireJS($urlJs . '/jquery-ui.js');
 		
 		// jQuery niceScroll	
 		$urlJs = $this->cdn['jquery-nicescroll']?? 'storage/system/js';
-		$this->requireJS($urlJs.'/jquery.nicescroll.js');
+		$this->requireJS($urlJs . '/jquery.nicescroll.js');
 	}
 	
 	public function addCsrfToken()
@@ -181,7 +181,7 @@ 
 		
 		$key = md5(serialize(func_get_args()));
 		
-		if (! isset($cache[$key])) {
+		if (!isset($cache[$key])) {
 			$cache[$key] = true;
 			
 			parent::requireJS($url, $isAsync, $isDefer);

src/Layout/LayoutView.php

Indentation +69 added lines, -69 removed lines

@@ -30,64 +30,64 @@ 
  */
 class LayoutView extends ModuleView
 {
-    public $menuLeft;    // vertical menu
-    public $menu;        // horizontal menu
-    public $menuRight;   // vertical pull-down
-    public $actionBar;   
-    public $locationBar;
+	public $menuLeft;    // vertical menu
+	public $menu;        // horizontal menu
+	public $menuRight;   // vertical pull-down
+	public $actionBar;   
+	public $locationBar;
     
-    public $burger = true;      // burger menu item
+	public $burger = true;      // burger menu item
 
-    /*
+	/*
      * Whether or not left Menu is visible on Page load.
      */
-    public $isMenuLeftVisible = true;
+	public $isMenuLeftVisible = true;
 
-    public $defaultTemplate = 'layout/admin.html';
+	public $defaultTemplate = 'layout/admin.html';
     
-    protected $location;
+	protected $location;
 
-    public function init()
-    {
-        parent::init();
+	public function init()
+	{
+		parent::init();
 
-        $this->setMenu();
-        $this->setActionBar();
+		$this->setMenu();
+		$this->setActionBar();
         
 //         if (request()->pjax()) return;
         
-        $this->setMenuLeft();        
-        $this->setMenuRight();
+		$this->setMenuLeft();        
+		$this->setMenuRight();
         
-        $this->setVersion();
+		$this->setVersion();
         
-        $this->js(true, null, 'body')->niceScroll();
+		$this->js(true, null, 'body')->niceScroll();
         
 //         $this->js(true, null, new jsExpression('window'))->on('pageshow', new jsFunction(['event'], [
 //         			new jsExpression('
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
-    public function setMenu()
-    {
-        if ($this->menu) return;
+	public function setMenu()
+	{
+		if ($this->menu) return;
  
-        $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
+		$this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
-        // company logo
-        // see Epesi\Core\Controllers\SystemController::logo
-        $this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
+		// company logo
+		// see Epesi\Core\Controllers\SystemController::logo
+		$this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
         
-        if ($this->burger) {
-        	/** @scrutinizer ignore-call */
-        	$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
-        }
+		if ($this->burger) {
+			/** @scrutinizer ignore-call */
+			$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
+		}
        	
 		// home icon redirects to /home path 
 		// see Epesi\Core\Controllers\SystemController::home
-        $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
+		$this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
 
 		// location bar
 		$this->locationBar = $this->menu->add(['View',	['ui' => 'epesi-location']]);
@@ -126,50 +126,50 @@ 
 		]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    public function setMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	public function setMenuLeft()
+	{
+		if ($this->menuLeft) return;
         
-        $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
+		$this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
 
-        if (! $this->burger) return;
+		if (! $this->burger) return;
 
-        if (! session()->get('menu', 1)) {
-        	$this->isMenuLeftVisible = false;
-        }
+		if (! session()->get('menu', 1)) {
+			$this->isMenuLeftVisible = false;
+		}
         
-        $this->burger->add(['Icon',	'content'])->on('click', [
-        		(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
-        		(new jQuery('.epesi-logo'))->toggleClass('expanded'),
-        		(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
-        		$this->burger->add('jsCallback')->set(function($j, $visible) {
-        			session()->put('menu', $visible? 1: 0);
-        			session()->save();
-        		}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
-        ]);
-    }
+		$this->burger->add(['Icon',	'content'])->on('click', [
+				(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
+				(new jQuery('.epesi-logo'))->toggleClass('expanded'),
+				(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
+				$this->burger->add('jsCallback')->set(function($j, $visible) {
+					session()->put('menu', $visible? 1: 0);
+					session()->save();
+				}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
+		]);
+	}
     
-    public function setActionBar()
-    {
-    	if ($this->actionBar) return;
+	public function setActionBar()
+	{
+		if ($this->actionBar) return;
     	
-    	$this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar');
-    }
+		$this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar');
+	}
     
-    public function setVersion()
-    {
-    	$this->template->trySet('version', $this->app->version);
-    }
+	public function setVersion()
+	{
+		$this->template->trySet('version', $this->app->version);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
+	/**
+	 * {@inheritdoc}
+	 */
     
-    public function renderView()
-    {
-    	if ($this->menuLeft && $this->isMenuLeftVisible) {
-               $this->menuLeft->addClass('visible');
-        }
-        parent::renderView();
-    }
+	public function renderView()
+	{
+		if ($this->menuLeft && $this->isMenuLeftVisible) {
+			   $this->menuLeft->addClass('visible');
+		}
+		parent::renderView();
+	}
 }

src/Providers/EpesiServiceProvider.php

Indentation +46 added lines, -46 removed lines

@@ -10,63 +10,63 @@
 
 class EpesiServiceProvider extends ServiceProvider
 {
-    /**
-     * Booting the package.
-     */
-    public function boot()
-    {
-    	$this->ensureHttps();
+	/**
+	 * Booting the package.
+	 */
+	public function boot()
+	{
+		$this->ensureHttps();
     	
-    	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?}', 'ModuleController@view');
-    		});
-    	});
+				Route::any('view/{alias}/{method?}/{args?}', 'ModuleController@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);
+	}
     
-    /**
-     * 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);
+		}
+	}
     
-    protected function registerStorageDisk()
-    {
-    	$this->app['config']['filesystems.disks.epesi'] = config('epesi.disk');
-    }
+	protected function registerStorageDisk()
+	{
+		$this->app['config']['filesystems.disks.epesi'] = config('epesi.disk');
+	}
 }

src/System/Seeds/LaunchButton.php

Indentation +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 {
 	public $defaultTemplate = 'launch_button.html';
 	
-    public $ui = 'basic launch pjax button';
+	public $ui = 'basic launch pjax button';
     
-    public $container = 'View';
+	public $container = 'View';
   
 }

src/System/SystemInstallWizard.php

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
 		
 		$column = $columns->addColumn();
 
-		if (! function_exists('locale_get_display_language')) {
+		if (!function_exists('locale_get_display_language')) {
 			$column->addClass('middle aligned');
 			$column->add(['Label', __('Install php-intl extension to enable language selection!'), 'class' => ['red']]);
 			
@@ -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);

src/Controllers/SystemController.php

Indentation +24 added lines, -24 removed lines

@@ -11,38 +11,38 @@
 
 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)
-    {
-    	if (SystemCore::isInstalled()) return redirect('home');
+	public function install(Epesi $epesi)
+	{
+		if (SystemCore::isInstalled()) return redirect('home');
     	
-    	$epesi->title = config('epesi.app.title') . ' > ' . __('Installation');
+		$epesi->title = config('epesi.app.title') . ' > ' . __('Installation');
     	
-    	$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 SystemInstallWizard());
+		$epesi->add(new SystemInstallWizard());
     	
-    	return $epesi->response();
-    }
+		return $epesi->response();
+	}
     
-    public function home()
-    {
-    	return redirect(HomePageCommon::getUserHomePagePath());
-    }
+	public function home()
+	{
+		return redirect(HomePageCommon::getUserHomePagePath());
+	}
     
-    public function logo()
-    {
-    	$path = storage_path(implode(DIRECTORY_SEPARATOR, ['app', 'public', 'system', 'logo.png']));
+	public function logo()
+	{
+		$path = storage_path(implode(DIRECTORY_SEPARATOR, ['app', 'public', 'system', 'logo.png']));
 
-    	$file = new \Symfony\Component\HttpFoundation\File\File($path);
+		$file = new \Symfony\Component\HttpFoundation\File\File($path);
     	
-    	return response(File::get($path), 200, ['Content-type' => $file->getMimeType()])->setMaxAge(604800)->setPublic();
-    }
+		return response(File::get($path), 200, ['Content-type' => $file->getMimeType()])->setMaxAge(604800)->setPublic();
+	}
 }

Spacing +1 added lines, -1 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)

Braces +3 added lines, -1 removed lines

@@ -18,7 +18,9 @@
     
     public function install(Epesi $epesi)
     {
-    	if (SystemCore::isInstalled()) return redirect('home');
+    	if (SystemCore::isInstalled()) {
+    		return redirect('home');
+    	}
     	
     	$epesi->title = config('epesi.app.title') . ' > ' . __('Installation');
     	

src/Controllers/ModuleController.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 			}
 		}
 
-		if (! $view) abort(404);
+		if (!$view) abort(404);
 
 		$epesi->add($view)->displayModuleContent($method, $args);
 		

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 			}
 		}
 
-		if (! $view) abort(404);
+		if (! $view) {
+			abort(404);
+		}
 
 		$epesi->add($view)->displayModuleContent($method, $args);