x-systems / epesi-core

src/System/Modules/Concerns/HasLinks.php

Indentation +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
 		$alias = class_exists($module)? $module::alias(): $module;
 		
 		if (is_array($method) && !$args) {
-		    $args = $method;
-		    $method = 'body';
+			$args = $method;
+			$method = 'body';
 		}
 		
 		return url(implode('/', ['view', $alias, $method, self::encodeArgs($args)]));

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	{
 		$defaultView = self::module()::view();
 		
-		$viewClass = is_a(static::class, ModuleView::class, true)? static::class: $defaultView;
+		$viewClass = is_a(static::class, ModuleView::class, true) ? static::class : $defaultView;
 		
 		$viewAlias = null;
 		if ($viewClass !== $defaultView) {
@@ -45,7 +45,7 @@ 
 	 */
 	final public static function moduleLink($module, $method = 'body', $args = [])
 	{
-		$alias = class_exists($module)? $module::alias(): $module;
+		$alias = class_exists($module) ? $module::alias() : $module;
 		
 		if (is_array($method) && !$args) {
 		    $args = $method;
@@ -64,7 +64,7 @@ 
 	 * @throws \Illuminate\Http\Exceptions\HttpResponseException
 	 */
 	final public static function decodeArgs($hash) {
-		if (! $hash) return [];
+		if (!$hash) return [];
 		
 		$args = session($hash);
 
@@ -82,7 +82,7 @@ 
 	final public static function encodeArgs($args) {
 		$args = (array) $args;
 		
-		if (! $args) return;
+		if (!$args) return;
 		
 		$hash = md5(serialize($args));
 		

Braces +9 added lines, -3 removed lines

@@ -64,11 +64,15 @@ 
 	 * @throws \Illuminate\Http\Exceptions\HttpResponseException
 	 */
 	final public static function decodeArgs($hash) {
-		if (! $hash) return [];
+		if (! $hash) {
+			return [];
+		}
 		
 		$args = session($hash);
 
-		if (is_null($args)) abort(419);
+		if (is_null($args)) {
+			abort(419);
+		}
 		
 		return (array) $args;
 	}
@@ -82,7 +86,9 @@ 
 	final public static function encodeArgs($args) {
 		$args = (array) $args;
 		
-		if (! $args) return;
+		if (! $args) {
+			return;
+		}
 		
 		$hash = md5(serialize($args));
 		

src/System/Modules/ModuleManager.php

Indentation +15 added lines, -16 removed lines

@@ -64,7 +64,7 @@ 
 	{
 		return self::$installed = self::$installed?? self::getCached('epesi-modules-installed', function() {
 			try {
-			    $installedModules = Module::pluck('class', 'alias');
+				$installedModules = Module::pluck('class', 'alias');
 			} catch (\Exception $e) {
 				$installedModules = collect();
 			}
@@ -104,27 +104,27 @@ 
 	 */
 	protected static function discoverModuleClasses($namespace, $basePath)
 	{
-	    $ret = collect();
+		$ret = collect();
 	    
-	    $moduleNamespace = trim($namespace, '\\');
+		$moduleNamespace = trim($namespace, '\\');
 	    
-	    $names = array_slice(explode('\\', $moduleNamespace), - 1);
+		$names = array_slice(explode('\\', $moduleNamespace), - 1);
 	    
-	    if ($name = $names? reset($names): '') {
-	        $moduleClass = $moduleNamespace . '\\' . $name . 'Core';
+		if ($name = $names? reset($names): '') {
+			$moduleClass = $moduleNamespace . '\\' . $name . 'Core';
 	        
-	        if (is_subclass_of($moduleClass, ModuleCore::class)) {
-	            $ret->add($moduleClass);
-	        }
-	    }
+			if (is_subclass_of($moduleClass, ModuleCore::class)) {
+				$ret->add($moduleClass);
+			}
+		}
 	    
-	    foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
-	        $subModuleNamespace = $moduleNamespace . '\\' . basename($path);
+		foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
+			$subModuleNamespace = $moduleNamespace . '\\' . basename($path);
 	        
-	        $ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path));
-	    }
+			$ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path));
+		}
 	    
-	    return $ret;
+		return $ret;
 	}
 	
 	/**
@@ -356,7 +356,6 @@ 
 	 * 
 	 * @param string $classOrAlias
 	 * @throws \Exception
-
 	 * @return boolean
 	 */
 	public static function uninstall($classOrAlias)

Spacing +17 added lines, -17 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	public static function isInstalled($classOrAlias)
 	{
-		return self::getClass($classOrAlias, true)? 1: 0;
+		return self::getClass($classOrAlias, true) ? 1 : 0;
 	}
 	
 	/**
@@ -48,7 +48,7 @@ 
 	 * @return string;
 	 */
 	public static function getClass($classOrAlias, $installedOnly = false) {
-		$modules = $installedOnly? self::getInstalled(): self::getAll();
+		$modules = $installedOnly ? self::getInstalled() : self::getAll();
 
 		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
 		
@@ -80,9 +80,9 @@ 
 	 */
 	public static function getAll()
 	{
-		return self::getCached('epesi-modules-available', function () {
+		return self::getCached('epesi-modules-available', function() {
 			$modules = collect();
-			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules()?: []) as $namespace => $path) {
+			foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules() ?: []) as $namespace => $path) {
 				foreach (self::discoverModuleClasses($namespace, $path) as $moduleClass) {
 					$modules->add(['alias' => $moduleClass::alias(), 'class' => $moduleClass]);
 				}
@@ -110,7 +110,7 @@ 
 	    
 	    $names = array_slice(explode('\\', $moduleNamespace), - 1);
 	    
-	    if ($name = $names? reset($names): '') {
+	    if ($name = $names ? reset($names) : '') {
 	        $moduleClass = $moduleNamespace . '\\' . $name . 'Core';
 	        
 	        if (is_subclass_of($moduleClass, ModuleCore::class)) {
@@ -118,7 +118,7 @@ 
 	        }
 	    }
 	    
-	    foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) {
+	    foreach (glob($basePath . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $path) {
 	        $subModuleNamespace = $moduleNamespace . '\\' . basename($path);
 	        
 	        $ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path));
@@ -136,7 +136,7 @@ 
 	 */
 	protected static function getCached($key, \Closure $default)
 	{
-		if (! Cache::has($key)) {
+		if (!Cache::has($key)) {
 			Cache::forever($key, $default());
 		}
 
@@ -174,12 +174,12 @@ 
 	 */
 	public static function collect($method, $args = [])
 	{
-		$args = is_array($args)? $args: [$args];
+		$args = is_array($args) ? $args : [$args];
 		
 		$installedModules = self::getInstalled();
 		
 		// if epesi is not installed fake having the system module to enable its functionality
-		if (! $installedModules->contains(\Epesi\Core\System\SystemCore::class)) {
+		if (!$installedModules->contains(\Epesi\Core\System\SystemCore::class)) {
 			$installedModules = collect([
 				'system' => \Epesi\Core\System\SystemCore::class
 			]);
@@ -187,9 +187,9 @@ 
 		
 		$ret = [];
 		foreach ($installedModules as $module) {
-			if (! $list = $module::$method(...$args)) continue;
+			if (!$list = $module::$method(...$args)) continue;
 			
-			$ret = array_merge($ret, is_array($list)? $list: [$list]);
+			$ret = array_merge($ret, is_array($list) ? $list : [$list]);
 		}
 		
 		return $ret;
@@ -208,7 +208,7 @@ 
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {			
+		if (!$moduleClass = self::getClass($classOrAlias)) {			
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		
@@ -238,7 +238,7 @@ 
 		]);
 		
 		if ($installRecommended) {
-			$installRecommended = is_array($installRecommended)? $installRecommended: $module->recommended();
+			$installRecommended = is_array($installRecommended) ? $installRecommended : $module->recommended();
 			
 			foreach ($installRecommended as $recommendedModule) {
 				try {
@@ -271,10 +271,10 @@ 
 			$parentModule = array_shift($unsatisfiedDependencies);
 				
 			if (self::$processing[$parentModule]?? false) {
-				throw new \Exception('Cross dependency: '. $parentModule);
+				throw new \Exception('Cross dependency: ' . $parentModule);
 			}
 				
-			if (! self::isAvailable($parentModule)) {
+			if (!self::isAvailable($parentModule)) {
 				throw new \Exception('Module not found: "' . $parentModule . '"');
 			}
 	
@@ -361,13 +361,13 @@ 
 	 */
 	public static function uninstall($classOrAlias)
 	{
-		if (! self::isInstalled($classOrAlias)) {
+		if (!self::isInstalled($classOrAlias)) {
 			print ('Module "' . $classOrAlias . '" is not installed!');
 			
 			return true;
 		}
 		
-		if (! $moduleClass = self::getClass($classOrAlias)) {
+		if (!$moduleClass = self::getClass($classOrAlias)) {
 			throw new \Exception('Module "' . $classOrAlias . '" could not be identified');
 		}
 		

Braces +6 added lines, -2 removed lines

@@ -36,7 +36,9 @@ 
 	public static function getClass($classOrAlias, $installedOnly = false) {
 		$modules = $installedOnly? self::getInstalled(): self::getAll();
 		
-		if (collect($modules)->contains($classOrAlias)) return $classOrAlias;
+		if (collect($modules)->contains($classOrAlias)) {
+			return $classOrAlias;
+		}
 		
 		return $modules[$classOrAlias]?? null;
 	}
@@ -138,7 +140,9 @@ 
 		
 		$ret = [];
 		foreach ($installedModules as $module) {
-			if (! $list = $module::$method(...$args)) continue;
+			if (! $list = $module::$method(...$args)) {
+				continue;
+			}
 			
 			$ret = array_merge($ret, is_array($list)? $list: [$list]);
 		}

src/System/Modules/ModuleView.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
 	 */
 	final public function displayModuleContent($method, $args) {
 		// if method not callbale abort to 'not found'
-		if (! is_callable([$this, $method])) abort(404);
+		if (!is_callable([$this, $method])) abort(404);
 		
 		// if user has no access abort 'no access'
-		if (! $this->access()) abort(401);
+		if (!$this->access()) abort(401);
 		
 		$args = $this->decodeArgs($args);
 		

Braces +6 added lines, -2 removed lines

@@ -34,10 +34,14 @@
 	 */
 	final public function displayModuleContent($method, $args) {
 		// if method not callbale abort to 'not found'
-		if (! is_callable([$this, $method])) abort(404);
+		if (! is_callable([$this, $method])) {
+			abort(404);
+		}
 		
 		// if user has no access abort 'no access'
-		if (! $this->access()) abort(401);
+		if (! $this->access()) {
+			abort(401);
+		}
 		
 		$args = $this->decodeArgs($args);
 		

config/epesi.php

Indentation +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@
 				 | This value is the name of Epesi powered by as displayed.
 				 |
 				 */
-		        'credit' => [
-		                'title' => 'EPESI',
-		                'link'  => 'https://epe.si'
-		        ],
+				'credit' => [
+						'title' => 'EPESI',
+						'link'  => 'https://epe.si'
+				],
 		        
 				/*
 				 |--------------------------------------------------------------------------

src/helpers.php

Indentation +15 added lines, -15 removed lines

@@ -2,35 +2,35 @@
 
 if (! function_exists('epesi')) {
 	function ui() : Epesi\Core\UI
-    {
-    	return resolve(Epesi\Core\UI::class);
-    }
+	{
+		return resolve(Epesi\Core\UI::class);
+	}
 }
 
 if (! function_exists('eval_css')) {
 	function eval_css($css)
-    {
-    	ui()->addStyle($css);
-    }
+	{
+		ui()->addStyle($css);
+	}
 }
 
 if (! function_exists('eval_js')) {
 	function eval_js($js, $args = [])
-    {
-    	ui()->addJS($js, $args);
-    }
+	{
+		ui()->addJS($js, $args);
+	}
 }
 
 if (! function_exists('load_css')) {
 	function load_css($url)
-    {
-    	return ui()->requireCSS($url);
-    }
+	{
+		return ui()->requireCSS($url);
+	}
 }
 
 if (! function_exists('load_js')) {
 	function load_js($url)
-    {
-    	return ui()->requireJS($url);
-    }
+	{
+		return ui()->requireJS($url);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,34 +1,34 @@
 <?php
 
-if (! function_exists('epesi')) {
+if (!function_exists('epesi')) {
 	function ui() : Epesi\Core\UI
     {
     	return resolve(Epesi\Core\UI::class);
     }
 }
 
-if (! function_exists('eval_css')) {
+if (!function_exists('eval_css')) {
 	function eval_css($css)
     {
     	ui()->addStyle($css);
     }
 }
 
-if (! function_exists('eval_js')) {
+if (!function_exists('eval_js')) {
 	function eval_js($js, $args = [])
     {
     	ui()->addJS($js, $args);
     }
 }
 
-if (! function_exists('load_css')) {
+if (!function_exists('load_css')) {
 	function load_css($url)
     {
     	return ui()->requireCSS($url);
     }
 }
 
-if (! function_exists('load_js')) {
+if (!function_exists('load_js')) {
 	function load_js($url)
     {
     	return ui()->requireJS($url);

src/Controller.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 {
     public function index()
     {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
+    	return SystemCore::isInstalled() ? redirect('home') : redirect('install');
     }
     
     public function install(UI $ui)
@@ -36,7 +36,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()
@@ -64,7 +64,7 @@ 
     		}
     	}
 
-    	if (! $view) abort(404);
+    	if (!$view) abort(404);
     	
     	$ui->add($view)->displayModuleContent($method, $args);
     	

Indentation +43 added lines, -43 removed lines

@@ -10,66 +10,66 @@
 
 class Controller extends BaseController
 {
-    public function index()
-    {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
-    }
+	public function index()
+	{
+		return SystemCore::isInstalled()? redirect('home'): redirect('install');
+	}
     
-    public function install(UI $ui)
-    {
-    	// make sure the installation information is fresh
-    	ModuleManager::clearCache();
+	public function install(UI $ui)
+	{
+		// make sure the installation information is fresh
+		ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+		if (SystemCore::isInstalled()) return redirect('home');
     	
-    	$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.ui.title')]);
+		$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.ui.title')]);
     	
-    	$ui->initLayout('Centered');
+		$ui->initLayout('Centered');
     	
-    	$ui->layout->set('logo', url('logo'));
-    	$ui->layout->template->setHTML('copyright', config('epesi.ui.copyright'));
+		$ui->layout->set('logo', url('logo'));
+		$ui->layout->template->setHTML('copyright', config('epesi.ui.copyright'));
     	
-    	$ui->add(new \Epesi\Core\System\SystemInstallWizard());
+		$ui->add(new \Epesi\Core\System\SystemInstallWizard());
     	
-    	return $ui->response();
-    }
+		return $ui->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(UI $ui, $module, $method = 'body', $args = [])
-    {
-    	$ui->initLayout(new LayoutView());
+	public function view(UI $ui, $module, $method = 'body', $args = [])
+	{
+		$ui->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);
     	
-    	$ui->add($view)->displayModuleContent($method, $args);
+		$ui->add($view)->displayModuleContent($method, $args);
     	
-    	$ui->setLocation($view->location());
+		$ui->setLocation($view->location());
     	
-    	return $ui->response();
-    }
+		return $ui->response();
+	}
 }

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');
+    	}
     	
     	$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.ui.title')]);
     	
@@ -64,7 +66,9 @@ 
     		}
     	}
 
-    	if (! $view) abort(404);
+    	if (! $view) {
+    		abort(404);
+    	}
     	
     	$ui->add($view)->displayModuleContent($method, $args);
     	

src/System/Modules/Concerns/HasAssetsAccess.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 	}
 	
 	final public static function requireJS($file = 'default.js', $isAsync = false, $isDefer = false) {
-		return ui()->requireJS(self::assetUrl('js/'. $file), $isAsync, $isDefer);
+		return ui()->requireJS(self::assetUrl('js/' . $file), $isAsync, $isDefer);
 	}
 	
 	final public static function requireCSS($file = 'default.css') {
-		return ui()->requireCSS(self::assetUrl('css/'. $file));
+		return ui()->requireCSS(self::assetUrl('css/' . $file));
 	}
 	
 	/**

src/Facades/UI.php

Indentation +9 added lines, -9 removed lines

@@ -7,13 +7,13 @@
 
 class UI extends Facade
 {
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return App::class;
-    }
+	/**
+	 * Get the registered name of the component.
+	 *
+	 * @return string
+	 */
+	protected static function getFacadeAccessor()
+	{
+		return App::class;
+	}
 }

src/UI.php

Spacing +11 added lines, -12 removed lines

@@ -33,8 +33,7 @@ 
 		        'template_dir' => array_merge(ModuleManager::collect('templates', $this->skin), (array) $this->template_dir),
 		        'catch_error_types' => config('app.debug') ? 
 		                  // debug mode
-		                  E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_USER_DEPRECATED : 
-		                  // production mode
+		                  E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_USER_DEPRECATED : // production mode
 		                  E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR
 		]);
 	}
@@ -149,35 +148,35 @@ 
 		
 		// jQuery
 		$urlJs = $this->cdn['jquery']?? $localJs;
-		$this->requireJS($urlJs.'/jquery.min.js');
+		$this->requireJS($urlJs . '/jquery.min.js');
 		
 		// Semantic UI
 		$urlJs = $this->cdn['semantic-ui']?? $localJs;
 		$urlCss = $this->cdn['semantic-ui']?? $localCss;
-		$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']?? $localJs;
-		$this->requireJS($urlJs.'/jquery.serialize-object.min.js');
+		$this->requireJS($urlJs . '/jquery.serialize-object.min.js');
 		
 		// Agile UI
 		$urlJs = $this->cdn['atk']?? $localJs;
 		$urlCss = $this->cdn['atk']?? $localCss;
-		$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']?? $localJs;
-		$this->requireJS($urlJs.'/draggable.bundle.js');
+		$this->requireJS($urlJs . '/draggable.bundle.js');
 		
 		// jQuery niceScroll	
 		$urlJs = $this->cdn['jquery-nicescroll']?? $localJs;
-		$this->requireJS($urlJs.'/jquery.nicescroll.js');
+		$this->requireJS($urlJs . '/jquery.nicescroll.js');
 		
 		// clipboard.js
 		$urlJs = $this->cdn['clipboardjs']?? $localJs;
-		$this->requireJS($urlJs.'/clipboard.js');
+		$this->requireJS($urlJs . '/clipboard.js');
 	}
 	
 	/**
@@ -260,7 +259,7 @@ 
 		
 		$key = md5(serialize(func_get_args()));
 		
-		if (! isset($cache[$key])) {
+		if (!isset($cache[$key])) {
 			$cache[$key] = true;
 			
 			parent::requireJS($url, $isAsync, $isDefer);

Indentation +35 added lines, -35 removed lines

@@ -26,21 +26,21 @@ 
 	{
 		parent::__construct([
 				'title' => config('epesi.ui.title', 'EPESI'),
-		        'cdn' => array_merge($this->cdn, (array) config('epesi.ui.cdn')),
+				'cdn' => array_merge($this->cdn, (array) config('epesi.ui.cdn')),
 				//TODO: set the skin from admin / user selection
-		        'skin' => config('epesi.ui.skin', $this->skin),
-		        'template_dir' => array_merge(ModuleManager::collect('templates', $this->skin), (array) $this->template_dir),
-		        'catch_error_types' => config('app.debug') ? 
-		                  // debug mode
-		                  E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_USER_DEPRECATED : 
-		                  // production mode
-		                  E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR
+				'skin' => config('epesi.ui.skin', $this->skin),
+				'template_dir' => array_merge(ModuleManager::collect('templates', $this->skin), (array) $this->template_dir),
+				'catch_error_types' => config('app.debug') ? 
+						  // debug mode
+						  E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_USER_DEPRECATED : 
+						  // production mode
+						  E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR
 		]);
 	}
 	
 	final public static function module()
 	{
-	    return System\SystemCore::class;
+		return System\SystemCore::class;
 	}
 	
 	public function response()
@@ -59,7 +59,7 @@ 
 	
 	public function render()
 	{			
-	    System\SystemCore::requireCSS('epesi.css');
+		System\SystemCore::requireCSS('epesi.css');
 	    
 		$this->addCsrfToken();
 		
@@ -82,18 +82,18 @@ 
 	 */
 	public function renderException($exception)
 	{
-	    ob_start();
-	    if ($exception instanceof TokenMismatchException) {
-	        $this->jsRedirectHomepage(__('Session expired! Redirecting to login screen ...'));
-	    }
-	    elseif ($exception instanceof NotFoundHttpException) {
-	        $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
-	    }	    
-	    else {
-	        $this->caughtException($exception);
-	    }
+		ob_start();
+		if ($exception instanceof TokenMismatchException) {
+			$this->jsRedirectHomepage(__('Session expired! Redirecting to login screen ...'));
+		}
+		elseif ($exception instanceof NotFoundHttpException) {
+			$this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
+		}	    
+		else {
+			$this->caughtException($exception);
+		}
 	    
-	    return ob_get_clean();
+		return ob_get_clean();
 	}
 	
 	/**
@@ -103,20 +103,20 @@ 
 	 */
 	public function jsRedirectHomepage($message)
 	{
-	    $homepageUrl = url(HomePage\Models\HomePage::pathOfUser());
+		$homepageUrl = url(HomePage\Models\HomePage::pathOfUser());
 	    
-	    $redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
+		$redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender();
 	    
-	    if ($this->isJsonRequest()) {
-	        $this->outputResponseJSON([
-	                'success'   => true,
-	                'message'   => $message,
-	                'atkjs'   => $redirectJs
-	        ]);
-	    }
-	    else {
-	        $this->outputResponseHTML($this->getTag('script', $redirectJs));
-	    }
+		if ($this->isJsonRequest()) {
+			$this->outputResponseJSON([
+					'success'   => true,
+					'message'   => $message,
+					'atkjs'   => $redirectJs
+			]);
+		}
+		else {
+			$this->outputResponseHTML($this->getTag('script', $redirectJs));
+		}
 	}
 	
 	/**
@@ -128,9 +128,9 @@ 
 	 */
 	public function jsRedirectConfirm($page, $message)
 	{
-	    $redirectJs = $this->jsRedirect($page)->jsRender();
+		$redirectJs = $this->jsRedirect($page)->jsRender();
 	    
-	    return new jsExpression("if (confirm([])) { $redirectJs }", [$message]);
+		return new jsExpression("if (confirm([])) { $redirectJs }", [$message]);
 	}
 	
 	/**

Braces +3 added lines, -6 removed lines

@@ -85,11 +85,9 @@ 
 	    ob_start();
 	    if ($exception instanceof TokenMismatchException) {
 	        $this->jsRedirectHomepage(__('Session expired! Redirecting to login screen ...'));
-	    }
-	    elseif ($exception instanceof NotFoundHttpException) {
+	    } elseif ($exception instanceof NotFoundHttpException) {
 	        $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...'));
-	    }	    
-	    else {
+	    } else {
 	        $this->caughtException($exception);
 	    }
 	    
@@ -113,8 +111,7 @@ 
 	                'message'   => $message,
 	                'atkjs'   => $redirectJs
 	        ]);
-	    }
-	    else {
+	    } else {
 	        $this->outputResponseHTML($this->getTag('script', $redirectJs));
 	    }
 	}