x-systems / epesi-core

src/UI.php

Indentation +34 added lines, -34 removed lines

@@ -27,15 +27,15 @@ 
 	{
 		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
 		]);
 	}
 	
@@ -81,18 +81,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();
 	}
 	
 	/**
@@ -102,20 +102,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('<script>' . $redirectJs . '</script>');
-	    }
+		if ($this->isJsonRequest()) {
+			$this->outputResponseJSON([
+					'success'   => true,
+					'message'   => $message,
+					'atkjs'   => $redirectJs
+			]);
+		}
+		else {
+			$this->outputResponseHTML('<script>' . $redirectJs . '</script>');
+		}
 	}
 	
 	/**
@@ -127,9 +127,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]);
 	}
 	
 	/**
@@ -142,7 +142,7 @@ 
 				
 		//TODO: include below in app.js and app.css
 		
-	    $this->module()::requireCSS('epesi.css');
+		$this->module()::requireCSS('epesi.css');
 	    
 		$localJs = url('storage/system/js');
 		$localCss = url('storage/system/css');

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

Braces +3 added lines, -6 removed lines

@@ -84,11 +84,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);
 	    }
 	    
@@ -112,8 +110,7 @@ 
 	                'message'   => $message,
 	                'atkjs'   => $redirectJs
 	        ]);
-	    }
-	    else {
+	    } else {
 	        $this->outputResponseHTML('<script>' . $redirectJs . '</script>');
 	    }
 	}