x-systems / epesi-base

src/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/Dashboard/DashboardView.php

Spacing +16 added lines, -16 removed lines

@@ -24,7 +24,7 @@ 
 	
 	public function body()
 	{
-		if (! $this->isSingleDashboard()) {
+		if (!$this->isSingleDashboard()) {
 			$this->location($this->dashboard()->name);
 		}
 		
@@ -42,7 +42,7 @@ 
 		
 		$applets = $dashboard->applets()->orderBy('column')->orderBy('row')->get();
 
-		$columns = $this->add(['Columns', 'id' => 'dashboard', 'ui' => 'three stackable grid'  . ($this->isLocked()? ' locked': '')]);
+		$columns = $this->add(['Columns', 'id' => 'dashboard', 'ui' => 'three stackable grid' . ($this->isLocked() ? ' locked' : '')]);
 		
 		foreach ([1, 2, 3] as $columnId) {
 			/** @scrutinizer ignore-call */
@@ -55,7 +55,7 @@ 
 					]
 			]);
 			
-			foreach ($applets->where('column', $columnId) as $applet ) {
+			foreach ($applets->where('column', $columnId) as $applet) {
 				$col->add([
 						new Applet(),
 						'appletId' => $applet->id,
@@ -66,7 +66,7 @@ 
 			}
 		}
 		
-		if (! $this->isLocked()) {
+		if (!$this->isLocked()) {
 			$columns->js(true)->find('.sortable')->sortable([
 					'cursor' => 'move',
 					'handle' => '.panel-sortable-handle',
@@ -84,7 +84,7 @@ 
 					])
 			]));
 			
-			$columns->js(true)->find('.applet-close')->click(new jsFunction(['e'], [new jsExpression('if (confirm("' .  __('Delete this applet?') . '")) {$(e.target).closest(".applet").fadeOut(400, function(){var col = $(this).closest(".column.sortable");this.remove();col.trigger("sortupdate");})}')]));
+			$columns->js(true)->find('.applet-close')->click(new jsFunction(['e'], [new jsExpression('if (confirm("' . __('Delete this applet?') . '")) {$(e.target).closest(".applet").fadeOut(400, function(){var col = $(this).closest(".column.sortable");this.remove();col.trigger("sortupdate");})}')]));
 		}
 		
 		$this->columns = $columns;
@@ -131,7 +131,7 @@ 
 				]
 		]);
 
-		foreach ( AppletJoint::collect() as $applet ) {
+		foreach (AppletJoint::collect() as $applet) {
 			$col->add([
 					new Applet(),
 					'appletId' => 'new_' . str_ireplace('\\', '-', get_class($applet)),
@@ -260,10 +260,10 @@ 
 	{
 		$dashboard = Dashboard::find($dashboardId);
 
-		return $dashboard->delete()? [
+		return $dashboard->delete() ? [
 				$this->notify(__('Dashboard ":name" deleted, redirecting ...', ['name' => $dashboard->name])),
 				new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [self::selfLink()])
-		]: $this->notifyError(__('Error deleting dashboard'));
+		] : $this->notifyError(__('Error deleting dashboard'));
 	}
 	
 	public function reorderDashboards($view)
@@ -282,7 +282,7 @@ 
 		$grid = $view->add(['Grid', 'paginator' => false, 'menu' => false]);
 		$grid->setModel(new \atk4\data\Model(new \atk4\data\Persistence_Static($rows)));
 		
-		$grid->addDragHandler()->onReorder(function ($order) use ($dashboards) {
+		$grid->addDragHandler()->onReorder(function($order) use ($dashboards) {
 			$result = true;
 			foreach ($dashboards as $dashboard) {
 				$dashboard->position = array_search($dashboard->id, $order);
@@ -290,7 +290,7 @@ 
 				$result &= $dashboard->save();
 			}
 			
-			return $result? $this->notify(__('Dashboards reordered!')): $this->notifyError(__('Error saving order!'));
+			return $result ? $this->notify(__('Dashboards reordered!')) : $this->notifyError(__('Error saving order!'));
 		});
 			
 		$view->add(['View', 'ui' => 'buttons'])->add(['Button', __('Done'), 'primary'])->on('click', new jsExpression('location.reload()'));
@@ -367,7 +367,7 @@ 
 	
 	public function isLocked()
 	{
-		return $this->locked || ! Auth::user()->can('edit dashboard');
+		return $this->locked || !Auth::user()->can('edit dashboard');
 	}
 	
 	protected function isSingleDashboard()
@@ -383,18 +383,18 @@ 
 	 */
 	protected function dashboard()
 	{
-		if (! is_object($this->dashboard)) {
-			$this->dashboard = $this->dashboard? Dashboard::find($this->dashboard): $this->defaultUserDashboard();
+		if (!is_object($this->dashboard)) {
+			$this->dashboard = $this->dashboard ? Dashboard::find($this->dashboard) : $this->defaultUserDashboard();
 		}
 
-		return $this->dashboard?: abort(404);
+		return $this->dashboard ?: abort(404);
 	}
 	
 	protected function defaultUserDashboard()
 	{
 		$userDashboard = $this->userDashboards()->orderBy('position')->first();
 		
-		if (! $userDashboard) {
+		if (!$userDashboard) {
 			$this->lock();
 			
 			$userDashboard = $this->defaultSystemDashboard();
@@ -418,6 +418,6 @@ 
 	 */
 	protected function userId()
 	{
-		return $this->admin? 0: Auth::id();
+		return $this->admin ? 0 : Auth::id();
 	}
 }