x-systems / epesi-base

src/Dashboard/DashboardView.php

Braces +9 added lines, -3 removed lines

@@ -142,7 +142,9 @@ 
 		
 	public function addMenu()
 	{
-		if ($this->isLocked()) return;
+		if ($this->isLocked()) {
+			return;
+		}
 		
 		$dashboardId = $this->dashboard()->id;
 		
@@ -165,14 +167,18 @@ 
 		$dashboardMenu->addItem([__('Rename dashboard'), 'icon' => 'i cursor'])->on('click', $modal->show());
 		
 		// there is only one admin default dashboard
-		if ($this->admin) return;
+		if ($this->admin) {
+			return;
+		}
 		
 		// ***** add ***** //		
 		$modal = $this->add(['Modal', 'title' => __('Add Dashboard')])->set(\Closure::fromCallable([$this, 'addDashboard']));
 		
 		$dashboardMenu->addItem([__('Add dashboard'), 'icon' => 'add'])->on('click', $modal->show());
 		
-		if ($this->isSingleDashboard()) return;
+		if ($this->isSingleDashboard()) {
+			return;
+		}
 		
 		// ***** reorder ***** //
 		$modal = $this->add(['Modal', 'title' => __('Reorder Dashboards')])->set(\Closure::fromCallable([$this, 'reorderDashboards']));

Indentation +19 added lines, -19 removed lines

@@ -48,7 +48,7 @@ 
 		$columns = $this->add(['Columns', 'id' => 'dashboard', 'ui' => 'three stackable grid'  . ($this->isLocked()? ' locked': '')]);
 		
 		foreach ([1, 2, 3] as $columnId) {
-		    $columnApplets = clone $applets;
+			$columnApplets = clone $applets;
 		    
 			/** @scrutinizer ignore-call */
 			$col = $columns->addColumn([
@@ -205,9 +205,9 @@ 
 		$existingList = collect($existing->export())->pluck('name', 'id');
 		
 		$form->addFields([
-		        ['name', __('Name')],
-		        ['base', ['DropDown', 'caption' => __('Copy applets from'), 'values' => $existingList]]
-        ]);
+				['name', __('Name')],
+				['base', ['DropDown', 'caption' => __('Copy applets from'), 'values' => $existingList]]
+		]);
 		
 		$form->layout->addButton(['Button', __('Cancel')])->on('click', $view->owner->hide());
 		
@@ -219,19 +219,19 @@ 
 			$dashboardId = (int) $dashboard->insert([
 					'name' => $values['name'],
 					'user_id' => $this->userId(),
-			        'position' => count($existingList)
+					'position' => count($existingList)
 			]);
 			
 			if ($values['base']) {
-			    foreach ($dashboard->withID($values['base'])->ref('applets') as $baseApplet) {
-			        // only save on below does not work for some reason. fails when reloading
-			        $baseApplet->duplicate()->saveAndUnload(['dashboard_id' => $dashboardId]);
+				foreach ($dashboard->withID($values['base'])->ref('applets') as $baseApplet) {
+					// only save on below does not work for some reason. fails when reloading
+					$baseApplet->duplicate()->saveAndUnload(['dashboard_id' => $dashboardId]);
 				}
 			}
 
 			return [
 					$form->notify(__('Dashboard created, redirecting ...')),
-			        new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [$this->selfLink('body', ['dashboard' => $dashboardId])])
+					new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [$this->selfLink('body', ['dashboard' => $dashboardId])])
 			];
 		});
 	}
@@ -249,7 +249,7 @@ 
 			
 			return [
 					$form->notifySuccess(__('Dashboard renamed, reloading ...')),
-			        new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [$this->selfLink('body', ['dashboard' => $this->dashboard()->id])])
+					new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [$this->selfLink('body', ['dashboard' => $this->dashboard()->id])])
 			];
 		});
 	}
@@ -261,8 +261,8 @@ 
 		$name = $dashboard['name'];
 
 		return $dashboard->delete()? [
-		        $this->notifySuccess(__('Dashboard ":name" deleted, redirecting ...', compact('name'))),
-		        new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [$this->selfLink()])
+				$this->notifySuccess(__('Dashboard ":name" deleted, redirecting ...', compact('name'))),
+				new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [$this->selfLink()])
 		]: $this->notifyError(__('Error deleting dashboard'));
 	}
 	
@@ -271,14 +271,14 @@ 
 		$grid = $view->add(['Grid', 'paginator' => false, 'menu' => false, 'model' => $this->userDashboards()->setOrder('position')]);
 	
 		$grid->addDragHandler()->onReorder(function ($order) use ($grid) {
-		    foreach ($this->userDashboards() as $dashboard) {
+			foreach ($this->userDashboards() as $dashboard) {
 				$dashboard->save(['position' => array_search($dashboard->id, $order)]);
 			}
 			
-		    return [
-		            new jsReload($grid),
-		            $this->notifySuccess(__('Dashboards reordered!'))
-		    ];
+			return [
+					new jsReload($grid),
+					$this->notifySuccess(__('Dashboards reordered!'))
+			];
 		});
 
 		$view->add(['View', 'ui' => 'buttons'])->add(['Button', __('Done'), 'primary'])->on('click', new jsExpression('location.reload()'));
@@ -333,7 +333,7 @@ 
 		$form->model->set($applet['options']);
 		
 		$form->validate(function(Form $form) use ($applet) {
-		    $applet->save(['options' => $form->model->get()]);
+			$applet->save(['options' => $form->model->get()]);
 
 			return $form->notifySuccess(__('Settings saved!'));
 		});
@@ -390,7 +390,7 @@ 
 	
 	protected function defaultSystemDashboard()
 	{
-	    return $this->userDashboards(0)->setOrder('position')->tryLoadAny();
+		return $this->userDashboards(0)->setOrder('position')->tryLoadAny();
 	}
 	
 	protected function userDashboards($userId = null)

src/Dashboard/Seeds/Applet.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
 		
 		if ($this->admin) {
 			$this->set($joint->info())->setAttr('searchkey', strtolower($joint->caption() . ';' . $joint->info()));
-		}
-		else {
+		} else {
 			if (! $this->locked) {
 				$this->addControl('close', 'applet-close')->setAttr('title', __('Close applet'));
 			}

src/CommonData/CommonDataSettings.php

Indentation +33 added lines, -33 removed lines

@@ -10,7 +10,7 @@ 
 
 class CommonDataSettings extends ModuleView
 {
-    use SessionTrait;
+	use SessionTrait;
     
 	protected $label = 'Common Data';
 	
@@ -36,23 +36,23 @@ 
 	
 	public function setAncestors()
 	{
-	    $parent = $this->stickyGet('parent');
+		$parent = $this->stickyGet('parent');
 	    
-	    if (isset($parent)) {
-	        $this->memorize('parent', $parent?: null);
-	    }
+		if (isset($parent)) {
+			$this->memorize('parent', $parent?: null);
+		}
 
-	    $this->ancestors = Models\CommonData::ancestorsAndSelf($this->recall('parent'));
+		$this->ancestors = Models\CommonData::ancestorsAndSelf($this->recall('parent'));
 	}
 	
 	public function setLocation()
 	{
-	    $location = [['label' => $this->label, 'link' => '?parent=0']];	    
+		$location = [['label' => $this->label, 'link' => '?parent=0']];	    
 		foreach (Models\CommonData::create()->withID($this->ancestors) as $node) {
-		    $location[] = [
-		            'label' => $node['value'] ?: $node['key'], 
-		            'link' => '?parent=' . $node['id']
-		    ];
+			$location[] = [
+					'label' => $node['value'] ?: $node['key'], 
+					'link' => '?parent=' . $node['id']
+			];
 		}
 
 		$this->label = null;
@@ -69,17 +69,17 @@ 
 				'editFields' => ['key', 'value'],
 				'addFields' => ['key', 'value'],
 				'displayFields' => ['key', 'value', 'readonly'],
-		        'notifyDefault' => ['jsToast', 'settings' => ['message' => __('Data is saved!'), 'class' => 'success']],
+				'notifyDefault' => ['jsToast', 'settings' => ['message' => __('Data is saved!'), 'class' => 'success']],
 				'paginator' => false,
-		        'menu' => ActionBar::instance(),
-		        'quickSearch' => ['key', 'value']
+				'menu' => ActionBar::instance(),
+				'quickSearch' => ['key', 'value']
 		]);
 
 		$this->grid->setModel($this->nodes()->setOrder('position'));
 		
 		$this->grid->addActionButton(['icon' => 'level down', 'attr' => ['title' => __('Drilldown')]], new jsExpression(
-		        'document.location=\'?parent=\'+[]',
-		        [$this->grid->jsRow()->data('id')]
+				'document.location=\'?parent=\'+[]',
+				[$this->grid->jsRow()->data('id')]
 		));
 
 		$this->grid->addDragHandler()->onReorder(function ($order) {
@@ -94,7 +94,7 @@ 
 		});
 
 		if ($this->ancestors && $this->grid->menu) {
-		    $this->grid->menu->addItem([__('Level Up'), 'icon' => 'level up'], '?parent=' . $this->parent(1));
+			$this->grid->menu->addItem([__('Level Up'), 'icon' => 'level up'], '?parent=' . $this->parent(1));
 		}
 		
 		return $this;
@@ -102,29 +102,29 @@ 
 	
 	public function parent($level = 0)
 	{
-	    return $this->ancestors[$level] ?? 0;
+		return $this->ancestors[$level] ?? 0;
 	}
 	
 	public function nodes()
 	{
-	    $nodes = Models\CommonData::create();
+		$nodes = Models\CommonData::create();
 	    
-	    //@TODO: remove below when adding null condition fixed
-	    if ($parent = $this->parent()) {
-	        $nodes->addCondition('parent', $parent);
-	    }
-	    else {
-	        $nodes->addCondition($nodes->expr('parent is NULL'));
-	    }
+		//@TODO: remove below when adding null condition fixed
+		if ($parent = $this->parent()) {
+			$nodes->addCondition('parent', $parent);
+		}
+		else {
+			$nodes->addCondition($nodes->expr('parent is NULL'));
+		}
 
-	    $nodes->addHook('beforeInsert', function($node, & $data) {
-	        $data['parent'] = $this->recall('parent');
-	    });
+		$nodes->addHook('beforeInsert', function($node, & $data) {
+			$data['parent'] = $this->recall('parent');
+		});
 	        
-	    $nodes->getAction('edit')->enabled = function($row = null) {
-	        return $row ? !$row['readonly'] : true;
-	    };
+		$nodes->getAction('edit')->enabled = function($row = null) {
+			return $row ? !$row['readonly'] : true;
+		};
 	    
-	    return $nodes;
+		return $nodes;
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 	    //@TODO: remove below when adding null condition fixed
 	    if ($parent = $this->parent()) {
 	        $nodes->addCondition('parent', $parent);
-	    }
-	    else {
+	    } else {
 	        $nodes->addCondition($nodes->expr('parent is NULL'));
 	    }
 

src/CommonData/CommonDataCore.php

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	
 	public function install()
 	{
-	    Models\CommonData::migrate();
+		Models\CommonData::migrate();
 	}
 	
 	public function uninstall()

src/CommonData/Models/CommonData.php

Indentation +192 added lines, -192 removed lines

@@ -9,259 +9,259 @@
 class CommonDataNotFound extends \Exception {}
 
 class CommonData extends Model {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
-    public $table = 'commondata';
+	public $table = 'commondata';
     
-    public $caption = 'Common Data';
+	public $caption = 'Common Data';
     
-    public $title_field = 'value';
+	public $title_field = 'value';
     
-    protected static $cache = [
-    		'id' => [],
-    		'value' => [],
-    		'array' => []
-    ];
+	protected static $cache = [
+			'id' => [],
+			'value' => [],
+			'array' => []
+	];
     
-    function init() {
-        parent::init();
+	function init() {
+		parent::init();
         
-        $this->addFields([
-                'key' => ['caption' => __('Key')],
-                'value' => ['caption' => __('Value')],
-                'position' => ['type' => 'integer', 'caption' => __('Position')],
-                'readonly' => ['type' => 'boolean']
-        ]);
+		$this->addFields([
+				'key' => ['caption' => __('Key')],
+				'value' => ['caption' => __('Value')],
+				'position' => ['type' => 'integer', 'caption' => __('Position')],
+				'readonly' => ['type' => 'boolean']
+		]);
         
-        $this->hasOne('parent', [self::class, 'our_field' => 'parent']);
+		$this->hasOne('parent', [self::class, 'our_field' => 'parent']);
         
-        $this->getAction('edit')->ui['execButton'] = ['Button', __('Save'), 'class' => ['primary']];
+		$this->getAction('edit')->ui['execButton'] = ['Button', __('Save'), 'class' => ['primary']];
         
-        $this->addHook('beforeInsert', function($node, & $data) {
-            $data['position'] = $node->action('fx', ['max', 'position'])->getOne() + 1;
+		$this->addHook('beforeInsert', function($node, & $data) {
+			$data['position'] = $node->action('fx', ['max', 'position'])->getOne() + 1;
             
-            $data['readonly'] = $data['readonly'] ?? 0;
-        });
-    }
+			$data['readonly'] = $data['readonly'] ?? 0;
+		});
+	}
     
-    public static function getId($path, $clearCache = false)
-    {
-    	$id = null;
-    	foreach(explode('/', trim($path,'/')) as $nodeKey) {
-    	    $parentId = $id;
+	public static function getId($path, $clearCache = false)
+	{
+		$id = null;
+		foreach(explode('/', trim($path,'/')) as $nodeKey) {
+			$parentId = $id;
     	    
-    		if ($nodeKey === '') continue; //ignore empty paths
+			if ($nodeKey === '') continue; //ignore empty paths
     		
-    		if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
-    		    $node = self::siblings($parentId)->addCondition('key', $nodeKey)->tryLoadAny();
+			if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
+				$node = self::siblings($parentId)->addCondition('key', $nodeKey)->tryLoadAny();
     		    
-    			if (! $node->loaded()) return false;
+				if (! $node->loaded()) return false;
 
-    			self::$cache['id'][$parentId][$nodeKey] = $node->id;
-    		}
+				self::$cache['id'][$parentId][$nodeKey] = $node->id;
+			}
     		
-    		$id = self::$cache['id'][$parentId][$nodeKey];
-    	}
+			$id = self::$cache['id'][$parentId][$nodeKey];
+		}
     	
-    	return $id;
-    }
+		return $id;
+	}
    
-    public static function newId($path, $readonly = false)
-    {
-    	if (! $path = trim($path,'/')) return false;
+	public static function newId($path, $readonly = false)
+	{
+		if (! $path = trim($path,'/')) return false;
 
-    	$id = null;
-    	foreach(explode('/', $path) as $nodeKey) {
-    		if ($nodeKey === '') continue;
+		$id = null;
+		foreach(explode('/', $path) as $nodeKey) {
+			if ($nodeKey === '') continue;
     		
-    		$parentId = $id;
+			$parentId = $id;
     		
-    		$node = self::siblings($parentId)->addCondition('key', $nodeKey)->tryLoadAny();
+			$node = self::siblings($parentId)->addCondition('key', $nodeKey)->tryLoadAny();
 
-    		if ($node->loaded()) {
-    		    $id = $node->id;
-    		}
-    		else {
-    		    $id = $node->insert([
-    		            'parent' => $parentId,
-    		            'key' => $nodeKey,
-    		            'readonly' => $readonly
-    		    ]);
-    		}
-    	}
+			if ($node->loaded()) {
+				$id = $node->id;
+			}
+			else {
+				$id = $node->insert([
+						'parent' => $parentId,
+						'key' => $nodeKey,
+						'readonly' => $readonly
+				]);
+			}
+		}
     	
-    	return $id;
-    }
+		return $id;
+	}
     
-    public static function setValue($path, $value, $overwrite = true, $readonly = false)
-    {
-    	if (! $id = self::getId($path)) {
-    		if (! $id = self::newId($path, $readonly)) return false;
-    	} else {
-    		if (! $overwrite) return false;
-    	}
+	public static function setValue($path, $value, $overwrite = true, $readonly = false)
+	{
+		if (! $id = self::getId($path)) {
+			if (! $id = self::newId($path, $readonly)) return false;
+		} else {
+			if (! $overwrite) return false;
+		}
 
-    	self::create()->tryLoad($id)->save(compact('value', 'readonly'));
+		self::create()->tryLoad($id)->save(compact('value', 'readonly'));
     	
-    	self::clearCache();
+		self::clearCache();
     	
-    	return true;
-    }
+		return true;
+	}
     
-    public static function clearCache()
-    {
-    	self::$cache = array_fill_keys(array_keys(self::$cache), []);
-    }
+	public static function clearCache()
+	{
+		self::$cache = array_fill_keys(array_keys(self::$cache), []);
+	}
     
-    public static function getValue($path, $translate = false)
-    {
-    	$key = md5(serialize($path));
+	public static function getValue($path, $translate = false)
+	{
+		$key = md5(serialize($path));
     	
-    	if (! isset(self::$cache['value'][$key])) {
-    		if(! $id = self::getId($path)) return false;
+		if (! isset(self::$cache['value'][$key])) {
+			if(! $id = self::getId($path)) return false;
 
-    		self::$cache['value'][$key] = self::create()->tryLoad($id)->get('value');
-	    }
+			self::$cache['value'][$key] = self::create()->tryLoad($id)->get('value');
+		}
 	    
-	    return $translate? __(self::$cache['value'][$key]): self::$cache['value'][$key];
-    }
+		return $translate? __(self::$cache['value'][$key]): self::$cache['value'][$key];
+	}
         
-    /**
-     * Creates new array for common use.
-     *
-     * @param $path string
-     * @param $array array initialization value
-     * @param $overwrite bool whether method should overwrite if array already exists, otherwise the data will be appended
-     * @param $readonly bool do not allow user to change this array from GUI
-     */
-    public static function newArray($path, $array, $overwrite = false, $readonly = false)
-    {
-    	self::validateArrayKeys($array);
+	/**
+	 * Creates new array for common use.
+	 *
+	 * @param $path string
+	 * @param $array array initialization value
+	 * @param $overwrite bool whether method should overwrite if array already exists, otherwise the data will be appended
+	 * @param $readonly bool do not allow user to change this array from GUI
+	 */
+	public static function newArray($path, $array, $overwrite = false, $readonly = false)
+	{
+		self::validateArrayKeys($array);
     		
-    	$path = trim($path, '/');
+		$path = trim($path, '/');
     	
 		if ($id = self::getId($path)) {
-    		if (! $overwrite) {
-    			self::extendArray($path, $array);
-    			return true;
-    		}
+			if (! $overwrite) {
+				self::extendArray($path, $array);
+				return true;
+			}
     				
-    		self::create()->delete($id);
-    	}
+			self::create()->delete($id);
+		}
     			
-    	if(! $id = self::newId($path, $readonly)) return false;
+		if(! $id = self::newId($path, $readonly)) return false;
     			
-    	if ($overwrite) {
-    	    self::create()->tryLoad($id)->save(compact('readonly'));
-    	}
+		if ($overwrite) {
+			self::create()->tryLoad($id)->save(compact('readonly'));
+		}
     			
-    	foreach ($array as $key => $value) {
-    		self::setValue($path . '/' . $key, $value, true, $readonly);
-    	}
+		foreach ($array as $key => $value) {
+			self::setValue($path . '/' . $key, $value, true, $readonly);
+		}
     			
-    	return true;
-    }
+		return true;
+	}
 
-    /**
-     * Extends common data array.
-     *
-     * @param $path string
-     * @param $array array values to insert
-     * @param $overwrite bool whether method should overwrite data if array key already exists, otherwise the data will be preserved
-     */
-    public static function extendArray($path, $array, $overwrite=false, $readonly=false)
-    {
-    	self::validateArrayKeys($array);
+	/**
+	 * Extends common data array.
+	 *
+	 * @param $path string
+	 * @param $array array values to insert
+	 * @param $overwrite bool whether method should overwrite data if array key already exists, otherwise the data will be preserved
+	 */
+	public static function extendArray($path, $array, $overwrite=false, $readonly=false)
+	{
+		self::validateArrayKeys($array);
     	
-    	$path = trim($path, '/');
+		$path = trim($path, '/');
     			
-    	if (! self::getId($path)){
-    		return self::newArray($path, $array, $overwrite, $readonly);
-    	}
+		if (! self::getId($path)){
+			return self::newArray($path, $array, $overwrite, $readonly);
+		}
 
-    	foreach ($array as $key => $value) {
-    		self::setValue($path . '/' . $key, $value, $overwrite, $readonly);
-    	}
-    }
+		foreach ($array as $key => $value) {
+			self::setValue($path . '/' . $key, $value, $overwrite, $readonly);
+		}
+	}
         
-    /**
-     * Returns common data array.
-     *
-     * @param string array name
-     * @return mixed returns an array if such array exists, false otherwise
-     */
-    public static function getArray($path, $sortColumn = 'position', $silent = false)
-    {
-    	return self::getCollection($path, $silent)->sortBy($sortColumn)->pluck('value', 'key')->all();
-    }
+	/**
+	 * Returns common data array.
+	 *
+	 * @param string array name
+	 * @return mixed returns an array if such array exists, false otherwise
+	 */
+	public static function getArray($path, $sortColumn = 'position', $silent = false)
+	{
+		return self::getCollection($path, $silent)->sortBy($sortColumn)->pluck('value', 'key')->all();
+	}
 
-    /**
-     * Removes common data array or entry.
-     *
-     * @param $path string
-     * @return true on success, false otherwise
-     */
-    public static function deleteArray($path){
-    	if (! $id = self::getId($path, true)) return false;
+	/**
+	 * Removes common data array or entry.
+	 *
+	 * @param $path string
+	 * @return true on success, false otherwise
+	 */
+	public static function deleteArray($path){
+		if (! $id = self::getId($path, true)) return false;
     	
-    	self::create()->delete($id);
+		self::create()->delete($id);
     	
-    	self::clearCache();
-    }
+		self::clearCache();
+	}
     
-    public static function siblings($parent = null)
-    {
-        $parentId = is_numeric($parent)? $parent: self::getId($parent);
+	public static function siblings($parent = null)
+	{
+		$parentId = is_numeric($parent)? $parent: self::getId($parent);
 
-        $model = self::create();
+		$model = self::create();
         
-        //@TODO: remove below when adding null condition fixed
-        return $parentId? $model->addCondition('parent', $parentId): $model->addCondition($model->expr('parent is NULL'));
-    }
+		//@TODO: remove below when adding null condition fixed
+		return $parentId? $model->addCondition('parent', $parentId): $model->addCondition($model->expr('parent is NULL'));
+	}
         
-    public static function ancestors($node)
-    {
-        $node = is_numeric($node)? self::create()->tryLoad($node): $node;
+	public static function ancestors($node)
+	{
+		$node = is_numeric($node)? self::create()->tryLoad($node): $node;
 
-        if (! $node['parent']) return [];
+		if (! $node['parent']) return [];
         
-        return array_filter(array_merge([$node['parent']], self::ancestors($node['parent'])));
-    }
+		return array_filter(array_merge([$node['parent']], self::ancestors($node['parent'])));
+	}
     
-    public static function ancestorsAndSelf($node)
-    {
-        $node = is_numeric($node)? self::create()->tryLoad($node): $node;
+	public static function ancestorsAndSelf($node)
+	{
+		$node = is_numeric($node)? self::create()->tryLoad($node): $node;
         
-        return array_filter(array_merge([$node['id']], self::ancestors($node)));
-    }
+		return array_filter(array_merge([$node['id']], self::ancestors($node)));
+	}
     
-    /**
-     * Returns common data collection.
-     *
-     * @param $path string
-     * @return Collection
-     */
-    public static function getCollection($path, $silent = false)
-    {
-    	if(isset(self::$cache['array'][$path])) {
-    		return self::$cache['array'][$path];
-    	}
+	/**
+	 * Returns common data collection.
+	 *
+	 * @param $path string
+	 * @return Collection
+	 */
+	public static function getCollection($path, $silent = false)
+	{
+		if(isset(self::$cache['array'][$path])) {
+			return self::$cache['array'][$path];
+		}
     	
-    	if (! $id = self::getId($path)) {
-    		if ($silent) return collect();
+		if (! $id = self::getId($path)) {
+			if ($silent) return collect();
     		
-    		throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
-    	}
+			throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
+		}
     	
-    	return self::$cache['array'][$path] = collect(self::siblings($id)->export());
-    }
+		return self::$cache['array'][$path] = collect(self::siblings($id)->export());
+	}
     
-    protected static function validateArrayKeys($array)
-    {
-    	foreach($array as $key => $value) {
-    		if (strpos($key, '/') === false) continue;
+	protected static function validateArrayKeys($array)
+	{
+		foreach($array as $key => $value) {
+			if (strpos($key, '/') === false) continue;
     		
-    		\Exception('Invalid common data key: '. $key);
-    	}
-    }
+			\Exception('Invalid common data key: '. $key);
+		}
+	}
 }
\ No newline at end of file

Braces +38 added lines, -14 removed lines

@@ -50,12 +50,17 @@ 
     	foreach(explode('/', trim($path,'/')) as $nodeKey) {
     	    $parentId = $id;
     	    
-    		if ($nodeKey === '') continue; //ignore empty paths
+    		if ($nodeKey === '') {
+    			continue;
+    		}
+    		//ignore empty paths
     		
     		if ($clearCache || empty(self::$cache['id'][$parentId][$nodeKey])) {
     		    $node = self::siblings($parentId)->addCondition('key', $nodeKey)->tryLoadAny();
     		    
-    			if (! $node->loaded()) return false;
+    			if (! $node->loaded()) {
+    				return false;
+    			}
 
     			self::$cache['id'][$parentId][$nodeKey] = $node->id;
     		}
@@ -68,11 +73,15 @@ 
    
     public static function newId($path, $readonly = false)
     {
-    	if (! $path = trim($path,'/')) return false;
+    	if (! $path = trim($path,'/')) {
+    		return false;
+    	}
 
     	$id = null;
     	foreach(explode('/', $path) as $nodeKey) {
-    		if ($nodeKey === '') continue;
+    		if ($nodeKey === '') {
+    			continue;
+    		}
     		
     		$parentId = $id;
     		
@@ -80,8 +89,7 @@ 
 
     		if ($node->loaded()) {
     		    $id = $node->id;
-    		}
-    		else {
+    		} else {
     		    $id = $node->insert([
     		            'parent' => $parentId,
     		            'key' => $nodeKey,
@@ -96,9 +104,13 @@ 
     public static function setValue($path, $value, $overwrite = true, $readonly = false)
     {
     	if (! $id = self::getId($path)) {
-    		if (! $id = self::newId($path, $readonly)) return false;
+    		if (! $id = self::newId($path, $readonly)) {
+    			return false;
+    		}
     	} else {
-    		if (! $overwrite) return false;
+    		if (! $overwrite) {
+    			return false;
+    		}
     	}
 
     	self::create()->tryLoad($id)->save(compact('value', 'readonly'));
@@ -118,7 +130,9 @@ 
     	$key = md5(serialize($path));
     	
     	if (! isset(self::$cache['value'][$key])) {
-    		if(! $id = self::getId($path)) return false;
+    		if(! $id = self::getId($path)) {
+    			return false;
+    		}
 
     		self::$cache['value'][$key] = self::create()->tryLoad($id)->get('value');
 	    }
@@ -149,7 +163,9 @@ 
     		self::create()->delete($id);
     	}
     			
-    	if(! $id = self::newId($path, $readonly)) return false;
+    	if(! $id = self::newId($path, $readonly)) {
+    		return false;
+    	}
     			
     	if ($overwrite) {
     	    self::create()->tryLoad($id)->save(compact('readonly'));
@@ -202,7 +218,9 @@ 
      * @return true on success, false otherwise
      */
     public static function deleteArray($path){
-    	if (! $id = self::getId($path, true)) return false;
+    	if (! $id = self::getId($path, true)) {
+    		return false;
+    	}
     	
     	self::create()->delete($id);
     	
@@ -223,7 +241,9 @@ 
     {
         $node = is_numeric($node)? self::create()->tryLoad($node): $node;
 
-        if (! $node['parent']) return [];
+        if (! $node['parent']) {
+        	return [];
+        }
         
         return array_filter(array_merge([$node['parent']], self::ancestors($node['parent'])));
     }
@@ -248,7 +268,9 @@ 
     	}
     	
     	if (! $id = self::getId($path)) {
-    		if ($silent) return collect();
+    		if ($silent) {
+    			return collect();
+    		}
     		
     		throw new CommonDataNotFound('Invalid CommonData::getArray() request: ' . $path);
     	}
@@ -259,7 +281,9 @@ 
     protected static function validateArrayKeys($array)
     {
     	foreach($array as $key => $value) {
-    		if (strpos($key, '/') === false) continue;
+    		if (strpos($key, '/') === false) {
+    			continue;
+    		}
     		
     		\Exception('Invalid common data key: '. $key);
     	}

src/CommonData/Fields/CommonData.php

Indentation +34 added lines, -34 removed lines

@@ -17,8 +17,8 @@ 
 	public $path = '';
 
 	public $serialize = [
-	        [__CLASS__, 'serialize'],
-	        [__CLASS__, 'unserialize'],
+			[__CLASS__, 'serialize'],
+			[__CLASS__, 'unserialize'],
 	];
 	
 	public $multiple = false;
@@ -33,75 +33,75 @@ 
 		$this->_init();
 		
 		if ($this->getDependency()) {
-		    $this->ui['form'] = [
-		            'AutoComplete', 
-		            'model' => CommonDataModel::create(),
-		            'dependency' => function($model, $data) {
-		                $model->addCondition('parent', CommonDataModel::getId($this->getDependencyPath($data)));
-        		    },
-        		    'renderRowFunction' => function($field, $row) {
-        		        return [
-        		          'value' => $row['key'],
-        		          'title' => $row['value'] ?: $row['key'],
-        		        ];
-        		     },
-        		     'multiple' => $this->multiple
-		    ];
+			$this->ui['form'] = [
+					'AutoComplete', 
+					'model' => CommonDataModel::create(),
+					'dependency' => function($model, $data) {
+						$model->addCondition('parent', CommonDataModel::getId($this->getDependencyPath($data)));
+					},
+					'renderRowFunction' => function($field, $row) {
+						return [
+						  'value' => $row['key'],
+						  'title' => $row['value'] ?: $row['key'],
+						];
+					 },
+					 'multiple' => $this->multiple
+			];
 		} else {
-		    $this->values = CommonDataModel::getArray($this->path);
+			$this->values = CommonDataModel::getArray($this->path);
 		}
 
 		$this->ui = array_merge([
-		        'table' => ['Multiformat', [$this, 'format']],
-		        'form' => ['isMultiple' => $this->multiple]
+				'table' => ['Multiformat', [$this, 'format']],
+				'form' => ['isMultiple' => $this->multiple]
 		], $this->ui);
 	}
 	
 	public function getDependency()
 	{
-	    $fields = (array) $this->path;
+		$fields = (array) $this->path;
 	    
-	    $path = array_shift($fields);
+		$path = array_shift($fields);
 	    
-	    return $fields? compact('path', 'fields'): false;
+		return $fields? compact('path', 'fields'): false;
 	}
 	
 	public function getDependencyPath($data)
 	{
-	    if (! $dependency = $this->getDependency()) return false;
+		if (! $dependency = $this->getDependency()) return false;
 	    
-	    return implode('/', array_merge([$dependency['path']], array_intersect_key($data, array_flip($dependency['fields']))));
+		return implode('/', array_merge([$dependency['path']], array_intersect_key($data, array_flip($dependency['fields']))));
 	}
 	
 	public function getValues($data)
 	{
-	    $path = $this->getDependencyPath($data) ?: $this->path;
+		$path = $this->getDependencyPath($data) ?: $this->path;
 	    
-	    return CommonDataModel::getArray($path);
+		return CommonDataModel::getArray($path);
 	}
 	
 	public static function serialize($field, $value, $persistence)
 	{
-	    return $field->multiple? implode(',', (array) $value): $value;
+		return $field->multiple? implode(',', (array) $value): $value;
 	}
 	
 	public static function unserialize($field, $value, $persistence)
 	{
-	    return $field->multiple? explode(',', $value): $value;
+		return $field->multiple? explode(',', $value): $value;
 	}
 
 	public function format($row, $field)
 	{	
-	    $values = array_intersect_key($this->getValues($row->get()), array_flip((array) $row[$field]));
+		$values = array_intersect_key($this->getValues($row->get()), array_flip((array) $row[$field]));
 	    
-	    return [[
-	            'Template',
-	            implode('<br>', $values),
-	    ]];
+		return [[
+				'Template',
+				implode('<br>', $values),
+		]];
 	}
 	
 	public function normalize($value)
 	{
-	    return $this->multiple? parent::normalize($value): $value;
+		return $this->multiple? parent::normalize($value): $value;
 	}
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
 	
 	public function getDependencyPath($data)
 	{
-	    if (! $dependency = $this->getDependency()) return false;
+	    if (! $dependency = $this->getDependency()) {
+	    	return false;
+	    }
 	    
 	    return implode('/', array_merge([$dependency['path']], array_intersect_key($data, array_flip($dependency['fields']))));
 	}

src/Dashboard/Models/DashboardApplet.php

Indentation +13 added lines, -13 removed lines

@@ -7,21 +7,21 @@
 
 class DashboardApplet extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
-    public $table = 'dashboard_applets';
+	public $table = 'dashboard_applets';
     
-    public function init()
-    {
-        parent::init();
+	public function init()
+	{
+		parent::init();
         
-        $this->addFields([
-                'class' => ['type' => 'string'],
-                'column' => ['type' => 'integer', 'default' => 1],
-                'row' => ['type' => 'integer', 'default' => 0],
-                'options' => ['type' => 'array', 'default' => []]
-        ]);
+		$this->addFields([
+				'class' => ['type' => 'string'],
+				'column' => ['type' => 'integer', 'default' => 1],
+				'row' => ['type' => 'integer', 'default' => 0],
+				'options' => ['type' => 'array', 'default' => []]
+		]);
         
-        $this->hasOne('dashboard', [Dashboard::class, 'our_field' => 'dashboard_id']);
-    }
+		$this->hasOne('dashboard', [Dashboard::class, 'our_field' => 'dashboard_id']);
+	}
 }

src/Dashboard/Models/Dashboard.php

Indentation +15 added lines, -15 removed lines

@@ -8,25 +8,25 @@
 
 class Dashboard extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
-    public $table = 'dashboards';
+	public $table = 'dashboards';
     
-    public function init()
-    {
-        parent::init();
+	public function init()
+	{
+		parent::init();
         
-        $this->addFields([
-                'name' => ['type' => 'string'],
-                'position' => ['type' => 'integer', 'default' => 0]
-        ]);
+		$this->addFields([
+				'name' => ['type' => 'string'],
+				'position' => ['type' => 'integer', 'default' => 0]
+		]);
         
-        $this->hasOne('user', [User::class, 'our_field' => 'user_id']);
+		$this->hasOne('user', [User::class, 'our_field' => 'user_id']);
         
-        $this->hasMany('applets', [DashboardApplet::class, 'their_field' => 'dashboard_id']);
+		$this->hasMany('applets', [DashboardApplet::class, 'their_field' => 'dashboard_id']);
         
-        $this->addHook('beforeDelete', function($id) {
-            $this->withID($id)->ref('applets')->action('delete')->execute();
-        });
-    }
+		$this->addHook('beforeDelete', function($id) {
+			$this->withID($id)->ref('applets')->action('delete')->execute();
+		});
+	}
 }

src/Dashboard/DashboardCore.php

Indentation +15 added lines, -15 removed lines

@@ -18,23 +18,23 @@ 
 	
 	public function install()
 	{
-	    Models\Dashboard::migrate();
-	    Models\DashboardApplet::migrate();
+		Models\Dashboard::migrate();
+		Models\DashboardApplet::migrate();
 		
 		// setup default dashboard
-	    $dashboardId = (int) Models\Dashboard::create()->insert([
+		$dashboardId = (int) Models\Dashboard::create()->insert([
 				'user_id' => 0,
 				'name' => __('Admin Default')
 		]);
 		
-	    Models\DashboardApplet::create()->insert([
-	            [
-	                    'dashboard_id' => $dashboardId,
-	                    'class' => 'Epesi\\Applets\\Clock\\ClockApplet',
-	                    'row' => 0,
-	                    'column' => 3,
-	            ]
-	    ]);
+		Models\DashboardApplet::create()->insert([
+				[
+						'dashboard_id' => $dashboardId,
+						'class' => 'Epesi\\Applets\\Clock\\ClockApplet',
+						'row' => 0,
+						'column' => 3,
+				]
+		]);
 	}
 	
 	public static function info()
@@ -51,14 +51,14 @@ 
 	{
 		// create user default dashboard as copy of the system default
 		User::created(function(User $user) {
-		    if (! $defaultDashboard = Models\Dashboard::create()->addCondition('user_id', 0)->tryLoadAny()) return;
+			if (! $defaultDashboard = Models\Dashboard::create()->addCondition('user_id', 0)->tryLoadAny()) return;
 			$userDefaultDashboard = (clone $defaultDashboard)->duplicate()->save([
-			        'name' => __('Default'),
-			        'user_id' => $user->id
+					'name' => __('Default'),
+					'user_id' => $user->id
 			]);
 
 			foreach ($defaultDashboard->ref('applets') as $defaultApplet) {
-			    $defaultApplet->duplicate()->saveAndUnload(['dashboard_id' => $userDefaultDashboard->id]);
+				$defaultApplet->duplicate()->saveAndUnload(['dashboard_id' => $userDefaultDashboard->id]);
 			}
 		});
 	}

Braces +3 added lines, -1 removed lines

@@ -51,7 +51,9 @@
 	{
 		// create user default dashboard as copy of the system default
 		User::created(function(User $user) {
-		    if (! $defaultDashboard = Models\Dashboard::create()->addCondition('user_id', 0)->tryLoadAny()) return;
+		    if (! $defaultDashboard = Models\Dashboard::create()->addCondition('user_id', 0)->tryLoadAny()) {
+		    	return;
+		    }
 			$userDefaultDashboard = (clone $defaultDashboard)->duplicate()->save([
 			        'name' => __('Default'),
 			        'user_id' => $user->id