x-systems / epesi-base

src/CommonData/Database/Migrations/2019_11_10_213529_create_commondata_table.php

Indentation +25 added lines, -25 removed lines

@@ -6,31 +6,31 @@
 
 class CreateCommondataTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('commondata', function (Blueprint $table) {
-            $table->bigIncrements('id');            
-            $table->nestedSet();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('commondata', function (Blueprint $table) {
+			$table->bigIncrements('id');            
+			$table->nestedSet();
             
-            $table->string('key', 64);
-            $table->text('value')->nullable();
-            $table->integer('position')->nullable()->default(0);
-            $table->smallInteger('readonly')->nullable()->default(0);
-        });
-    }
+			$table->string('key', 64);
+			$table->text('value')->nullable();
+			$table->integer('position')->nullable()->default(0);
+			$table->smallInteger('readonly')->nullable()->default(0);
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('commondata');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('commondata');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('commondata', function (Blueprint $table) {
+        Schema::create('commondata', function(Blueprint $table) {
             $table->bigIncrements('id');            
             $table->nestedSet();
             

src/CommonData/Database/Models/CommonData.php

Indentation +149 added lines, -149 removed lines

@@ -7,198 +7,198 @@
 use Illuminate\Database\Eloquent\Collection;
 
 class CommonData extends Model {
-    use NodeTrait;
+	use NodeTrait;
     
-    protected $table = 'commondata';
-    public $timestamps = false;
-    protected static $unguarded = true;
+	protected $table = 'commondata';
+	public $timestamps = false;
+	protected static $unguarded = true;
     
-    public static function getId($path, $clearCache = false)
-    {
-    	static $cache;
+	public static function getId($path, $clearCache = false)
+	{
+		static $cache;
 
-    	$parentId = null;
-    	foreach(explode('/', trim($path,'/')) as $nodeKey) {
-    		if ($nodeKey === '') continue; //ignore empty paths
+		$parentId = null;
+		foreach(explode('/', trim($path,'/')) as $nodeKey) {
+			if ($nodeKey === '') continue; //ignore empty paths
     		
-    		if (empty($cache[$parentId][$nodeKey])) {
-    			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
-    				return false;
-    			}
+			if (empty($cache[$parentId][$nodeKey])) {
+				if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+					return false;
+				}
 
-    			$cache[$parentId][$nodeKey] = $node->id;
-    		}
+				$cache[$parentId][$nodeKey] = $node->id;
+			}
     		
-    		$parentId = $id = $cache[$parentId][$nodeKey];
-    	}
+			$parentId = $id = $cache[$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 = $parentId = null;
-    	foreach(explode('/', $path) as $nodeKey) {
-    		if ($nodeKey === '') continue;
+		$id = $parentId = null;
+		foreach(explode('/', $path) as $nodeKey) {
+			if ($nodeKey === '') continue;
 
-    		if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
-    			$node = self::create([
-    					'parent_id' => $parentId,
-    					'key' => $nodeKey,
-    					'readonly' => $readonly,
-    					'position' => self::where('parent_id', $parentId)->count()
-    			], $parentId? self::find($parentId): null);
-    		}
+			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+				$node = self::create([
+						'parent_id' => $parentId,
+						'key' => $nodeKey,
+						'readonly' => $readonly,
+						'position' => self::where('parent_id', $parentId)->count()
+				], $parentId? self::find($parentId): null);
+			}
     		
-    		$parentId = $id = $node->id;
-    	}
+			$parentId = $id = $node->id;
+		}
     	
-    	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::find($id)->update(compact('value', 'readonly'));
+		self::find($id)->update(compact('value', 'readonly'));
     	
-    	return true;
-    }
+		return true;
+	}
     
-    public static function getValue($path, $translate = false)
-    {
-    	static $cache;
+	public static function getValue($path, $translate = false)
+	{
+		static $cache;
     	
-    	$key = md5(serialize([$path, $translate]));
+		$key = md5(serialize([$path, $translate]));
     	
-    	if (! isset($cache[$key])) {
-    		if(! $id = self::getId($path)) return false;
+		if (! isset($cache[$key])) {
+			if(! $id = self::getId($path)) return false;
 
-    		$ret = self::find($id)->value;
+			$ret = self::find($id)->value;
 
-	    	$cache[$key] = $translate? __($ret): $ret;
-	    }
+			$cache[$key] = $translate? __($ret): $ret;
+		}
 	    
-	    return $cache[$key];
-    }
+		return $cache[$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::find($id)->delete();
-    	}
+			self::find($id)->delete();
+		}
     			
-    	if(! $id = self::newId($path, $readonly)) return false;
+		if(! $id = self::newId($path, $readonly)) return false;
     			
-    	if ($overwrite) {
-    		self::find($id)->update(compact('readonly'));
-    	}
+		if ($overwrite) {
+			self::find($id)->update(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::find($id)->delete();
-    }
+		self::find($id)->delete();
+	}
 
-    /**
-     * Returns common data collection.
-     *
-     * @param $path string
-     * @return Collection
-     */
-    public static function getCollection($path, $silent = false)
-    {
-    	static $cache;
+	/**
+	 * Returns common data collection.
+	 *
+	 * @param $path string
+	 * @return Collection
+	 */
+	public static function getCollection($path, $silent = false)
+	{
+		static $cache;
 
-    	if(isset($cache[$path])) {
-    		return $cache[$path];
-    	}
+		if(isset($cache[$path])) {
+			return $cache[$path];
+		}
     	
-    	if (! $id = self::getId($path)) {
-    		if ($silent) return collection();
+		if (! $id = self::getId($path)) {
+			if ($silent) return collection();
     		
-    		new \Exception('Invalid CommonData::getArray() request: ' . $path);
-    	}
+			new \Exception('Invalid CommonData::getArray() request: ' . $path);
+		}
     	
-    	return $cache[$path] = self::where('parent_id', $id)->get();
-    }
+		return $cache[$path] = self::where('parent_id', $id)->get();
+	}
     
-    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

Spacing +22 added lines, -22 removed lines

@@ -18,11 +18,11 @@ 
     	static $cache;
 
     	$parentId = null;
-    	foreach(explode('/', trim($path,'/')) as $nodeKey) {
+    	foreach (explode('/', trim($path, '/')) as $nodeKey) {
     		if ($nodeKey === '') continue; //ignore empty paths
     		
     		if (empty($cache[$parentId][$nodeKey])) {
-    			if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+    			if (!$node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
     				return false;
     			}
 
@@ -37,19 +37,19 @@ 
    
     public static function newId($path, $readonly = false)
     {
-    	if (! $path = trim($path,'/')) return false;
+    	if (!$path = trim($path, '/')) return false;
 
     	$id = $parentId = null;
-    	foreach(explode('/', $path) as $nodeKey) {
+    	foreach (explode('/', $path) as $nodeKey) {
     		if ($nodeKey === '') continue;
 
-    		if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
+    		if (!$node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) {
     			$node = self::create([
     					'parent_id' => $parentId,
     					'key' => $nodeKey,
     					'readonly' => $readonly,
     					'position' => self::where('parent_id', $parentId)->count()
-    			], $parentId? self::find($parentId): null);
+    			], $parentId ? self::find($parentId) : null);
     		}
     		
     		$parentId = $id = $node->id;
@@ -60,10 +60,10 @@ 
     
     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::getId($path)) {
+    		if (!$id = self::newId($path, $readonly)) return false;
     	} else {
-    		if (! $overwrite) return false;
+    		if (!$overwrite) return false;
     	}
     	
     	self::find($id)->update(compact('value', 'readonly'));
@@ -77,12 +77,12 @@ 
     	
     	$key = md5(serialize([$path, $translate]));
     	
-    	if (! isset($cache[$key])) {
-    		if(! $id = self::getId($path)) return false;
+    	if (!isset($cache[$key])) {
+    		if (!$id = self::getId($path)) return false;
 
     		$ret = self::find($id)->value;
 
-	    	$cache[$key] = $translate? __($ret): $ret;
+	    	$cache[$key] = $translate ? __($ret) : $ret;
 	    }
 	    
 	    return $cache[$key];
@@ -104,7 +104,7 @@ 
     	$path = trim($path, '/');
     	
 		if ($id = self::getId($path)) {
-    		if (! $overwrite) {
+    		if (!$overwrite) {
     			self::extendArray($path, $array);
     			return true;
     		}
@@ -112,7 +112,7 @@ 
     		self::find($id)->delete();
     	}
     			
-    	if(! $id = self::newId($path, $readonly)) return false;
+    	if (!$id = self::newId($path, $readonly)) return false;
     			
     	if ($overwrite) {
     		self::find($id)->update(compact('readonly'));
@@ -132,13 +132,13 @@ 
      * @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)
+    public static function extendArray($path, $array, $overwrite = false, $readonly = false)
     {
     	self::validateArrayKeys($array);
     	
     	$path = trim($path, '/');
     			
-    	if (! self::getId($path)){
+    	if (!self::getId($path)) {
     		return self::newArray($path, $array, $overwrite, $readonly);
     	}
 
@@ -164,8 +164,8 @@ 
      * @param $path string
      * @return true on success, false otherwise
      */
-    public static function deleteArray($path){
-    	if (! $id = self::getId($path, true)) return false;
+    public static function deleteArray($path) {
+    	if (!$id = self::getId($path, true)) return false;
     	
     	self::find($id)->delete();
     }
@@ -180,11 +180,11 @@ 
     {
     	static $cache;
 
-    	if(isset($cache[$path])) {
+    	if (isset($cache[$path])) {
     		return $cache[$path];
     	}
     	
-    	if (! $id = self::getId($path)) {
+    	if (!$id = self::getId($path)) {
     		if ($silent) return collection();
     		
     		new \Exception('Invalid CommonData::getArray() request: ' . $path);
@@ -195,10 +195,10 @@ 
     
     protected static function validateArrayKeys($array)
     {
-    	foreach($array as $key => $value) {
+    	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

src/CommonData/CommonDataSettings.php

Spacing +15 added lines, -15 removed lines

@@ -30,7 +30,7 @@ 
 	{
 		ActionBar::addButton('back')->link(url('view/system'));
 		
-		$this->parentId = $this->stickyGet('parentId')?: null;
+		$this->parentId = $this->stickyGet('parentId') ?: null;
 		
 		$this->displayBreadCrumb();
 		
@@ -75,14 +75,14 @@ 
 
 		$this->grid->setModel($model = $this->getModel());
 		
-		if ($model->action('count')->getOne() ) {
+		if ($model->action('count')->getOne()) {
 			$this->grid->on('click', 'td', new jsExpression(
 					'document.location=\'?parentId=\'+[]',
 					[(new jQuery())->closest('tr')->data('id')]
 			));
 		}
 		
-		$this->grid->addDragHandler()->onReorder(function ($order) {
+		$this->grid->addDragHandler()->onReorder(function($order) {
 			$result = true;
 			foreach ($this->nodes()->get() as $node) {
 				$node->position = array_search($node->id, $order);
@@ -90,14 +90,14 @@ 
 				$result &= $node->save();
 			}
 			
-			$notifier = $result? $this->notify(__('Items reordered!')): $this->notifyError(__('Error saving order!'));
+			$notifier = $result ? $this->notify(__('Items reordered!')) : $this->notifyError(__('Error saving order!'));
 			
 			return $this->grid->jsSave($notifier);
 		});
 		
 		$this->addContolButton('update', $this->getUpdateModal(), 'edit');
 			
-		$this->addContolButton('delete', function ($jschain, $id) {
+		$this->addContolButton('delete', function($jschain, $id) {
 			CommonData::find($id)->delete();
 				
 			return $jschain->closest('tr')->transition('fade left');
@@ -119,7 +119,7 @@ 
 			$ret .= $button->getHtml();
 		}
 		
-		return $ret;;
+		return $ret; ;
 	}
 	
 	public function getUpdateModal()
@@ -128,9 +128,9 @@ 
 		
 		$grid->pageUpdate = $grid->add($grid->pageUpdate ?: $grid->pageDefault, ['short_name'=>'edit']);
 		
-		$modal = new jsModal(__('Edit'), $grid->pageUpdate, [$grid->name => $grid->jsRow()->data('id'), $grid->name.'_sort' => $grid->getSortBy()]);
+		$modal = new jsModal(__('Edit'), $grid->pageUpdate, [$grid->name => $grid->jsRow()->data('id'), $grid->name . '_sort' => $grid->getSortBy()]);
 		
-		$grid->pageUpdate->set(function () {
+		$grid->pageUpdate->set(function() {
 			$grid = $this->grid;
 			
 			$grid->model->load($grid->app->stickyGet($grid->name));
@@ -143,13 +143,13 @@ 
 			$grid->formUpdate->setModel($grid->model, $grid->fieldsUpdate ?: $grid->fieldsDefault);
 			
 			if ($sortBy = $grid->getSortBy()) {
-				$grid->formUpdate->stickyGet($grid->name.'_sort', $sortBy);
+				$grid->formUpdate->stickyGet($grid->name . '_sort', $sortBy);
 			}
 			
 			// set save handler with reload trigger
 			// adds default submit hook if it is not already set for this form
 			if (!$grid->formUpdate->hookHasCallbacks('submit')) {
-				$grid->formUpdate->onSubmit(function ($form) {
+				$grid->formUpdate->onSubmit(function($form) {
 					$form->model->save();
 					
 					return $this->grid->jsSaveUpdate();
@@ -166,7 +166,7 @@ 
 		
 		$this->grid->on('click', ".$class", $callback, [$this->grid->table->jsRow()->data('id')]);
 		
-		$this->buttons[$name] = new \atk4\ui\Button($icon? compact('icon'): $name);
+		$this->buttons[$name] = new \atk4\ui\Button($icon ? compact('icon') : $name);
 		
 		$this->buttons[$name]->app = $this->app;
 		
@@ -193,7 +193,7 @@ 
 		
 		$rowsEmpty = [];
 		
-		$model = new \atk4\data\Model($rows? new \atk4\data\Persistence_Static($rows): new \atk4\data\Persistence_Array($rowsEmpty));
+		$model = new \atk4\data\Model($rows ? new \atk4\data\Persistence_Static($rows) : new \atk4\data\Persistence_Array($rowsEmpty));
 		
 		$captions = [
 				'position' => __('Position'),
@@ -203,7 +203,7 @@ 
 		];
 		
 		foreach ($captions as $key => $caption) {
-			$field = $rows? $model->hasField($key): $model->addField($key);
+			$field = $rows ? $model->hasField($key) : $model->addField($key);
 			
 			if ($key === 'readonly') {
 				$field->setDefaults(['ui' => ['visible' => false]]);
@@ -219,7 +219,7 @@ 
 	
 	public function getNodeForm()
 	{
-		if (! $this->form) {
+		if (!$this->form) {
 			$this->form = new Form(['buttonSave' => ['Button', __('Save'), 'primary']]);
 			
 			$this->form->addHook('submit', function($form) {
@@ -233,7 +233,7 @@ 
 				
 				CommonData::create(array_merge($values, [
 						'position' => $this->nodes()->max('position') + 1
-				]), $this->parentId? CommonData::find($this->parentId): null);
+				]), $this->parentId ? CommonData::find($this->parentId) : null);
 				
 				return $this->grid->jsSaveCreate();
 			});