phpsa / datastore

src/Http/Controllers/Admin/Controller.php

Spacing +45 added lines, -45 removed lines

@@ -45,31 +45,31 @@ 
 	 *
 	 * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
 	 */
-	public function list($asset,Request $request){
+	public function list($asset, Request $request){
 
 		$assetData = Helpers::parseAssetType($asset);
 
 		return view('phpsa-datastore::backend.ams.list')
 		->withAsset($assetData)
 		->withAssetType($asset)
-		->withContent($this->datastoreRepository->paginateAssets($assetData, 25, 'page' ));
+		->withContent($this->datastoreRepository->paginateAssets($assetData, 25, 'page'));
 
 	}
 
-	public function inject(Request $request){
+	public function inject(Request $request) {
 		$assetData = Helpers::parseAssetType($request->input('asset'), true);
 		$newAsset = Datastore::getAsset($assetData);
 		return response($newAsset->injectForm($request->input('idx')));
 	}
 
 
-	protected function _getKids($asset){
+	protected function _getKids($asset) {
 		$children = [];
-		if ( ! empty($asset->children))
+		if (!empty($asset->children))
 		{
-			$children				 = Helpers::assetInfo($asset->children);
-			$children['classname']	 = $asset->children;
-			$children['path']        = Helpers::getPath($asset->children);
+			$children = Helpers::assetInfo($asset->children);
+			$children['classname'] = $asset->children;
+			$children['path'] = Helpers::getPath($asset->children);
 
 			$kids = $asset->children();
 
@@ -83,7 +83,7 @@ 
 		return $children;
 	}
 
-	protected function _getParents($asset){
+	protected function _getParents($asset) {
 
 		$type = str_replace('\\', "\\\\", $asset->type);
 		$parentAssets = $this->datastoreRepository->where('accept', '%' . $type . '%', 'like')->distinct()->get(['type', 'name', 'accept_limit'])->toArray();
@@ -118,19 +118,19 @@ 
 		return $parentAssets;
 	}
 
-	protected function _getPageData($asset){
-		return ($asset->is_child || !$asset->id )? null : DatastorePages::where('asset', $asset->id)->first();
+	protected function _getPageData($asset) {
+		return ($asset->is_child || !$asset->id) ? null : DatastorePages::where('asset', $asset->id)->first();
 	}
 
-	public function create($assetType, Request $request){
+	public function create($assetType, Request $request) {
 
 
 		$assetData = Helpers::parseAssetType($assetType, true);
 		$newAsset = Datastore::getAsset($assetData);
 
-		if($newAsset->max_instances > 0){
+		if ($newAsset->max_instances > 0) {
 			$count = DatastoreModel::where('type', $assetData)->count();
-			if($count >= $newAsset->max_instances){
+			if ($count >= $newAsset->max_instances) {
 				return redirect()->route('admin.ams.content.list', $assetType)->withFlashDanger("You can only create " . $newAsset->max_instances . " instances of this Asset");
 			}
 		}
@@ -147,7 +147,7 @@ 
 		->withPageData($pageData);
 	}
 
-	public function edit($assetType, $id){
+	public function edit($assetType, $id) {
 
 		$asset = Datastore::getAssetById($id);
 
@@ -163,7 +163,7 @@ 
 		->withPageData($pageData);
 	}
 
-	public function save($assetType , Request $request){
+	public function save($assetType, Request $request) {
 
 
 		$assetData = Helpers::parseAssetType($assetType, true);
@@ -175,8 +175,8 @@ 
 		unset($form['assetRemove']);
 
 
-		$form_valid	 = $newAsset->validate($form);
-		if(!$form_valid){
+		$form_valid = $newAsset->validate($form);
+		if (!$form_valid) {
 			die("@TODO STILL");
 		}
 
@@ -275,7 +275,7 @@ 
 			}
 		}
 
-		if(!empty($form['page_title']) && !empty($form['page_slug'])){
+		if (!empty($form['page_title']) && !empty($form['page_slug'])) {
 			$pageData = DatastorePages::firstOrNew(['asset' => $id]);
 			$pageData->title = $form['page_title'];
 			$pageData->slug = $form['page_slug'];
@@ -289,9 +289,9 @@ 
 	}
 
 
-	public function destroy($id, Request $request){
+	public function destroy($id, Request $request) {
 		$asset = DatastoreModel::findOrFail($id);
-		if(!$asset || $asset->namespace !== 'asset'){
+		if (!$asset || $asset->namespace !== 'asset') {
 			throw new GeneralException("NOT FOUND");
 		}
 		$path = $asset->content_path;
@@ -306,24 +306,24 @@ 
 	{
 		DB::enableQueryLog();
 
-		$slug	 = $request->input('page_slug');
-		$id		 = (int)$request->input('id');
+		$slug = $request->input('page_slug');
+		$id = (int) $request->input('id');
 		$generate = $request->input('generate');
 
 
-		if($generate){
+		if ($generate) {
 			$slug = Str::slug($slug);
 		}
 
 		$exists = DatastorePages::where('slug', $slug)->where('asset', '!=', $id)->exists();
 
-		if($generate){
+		if ($generate) {
 			return response()->json([
 				'slug' => $slug,
 				'available' => $exists ? 0 : 1
 			]);
 		}
-		return response()->json($exists ? "Slug already in use": true);
+		return response()->json($exists ? "Slug already in use" : true);
 
 
 	}
@@ -333,10 +333,10 @@ 
             'file' => 'required'
 		 ]);
 
-		 $originalFile= $request->file('file');
+		 $originalFile = $request->file('file');
 
 		 $t = time();
-		 $filename = Str::slug($t.$originalFile->getClientOriginalName(),".");
+		 $filename = Str::slug($t . $originalFile->getClientOriginalName(), ".");
 
 		 $path = $request->file('file')->storeAs(
 			'public', $filename
@@ -350,26 +350,26 @@ 
             'file' => 'image|required|mimes:jpeg,png,jpg,gif,svg'
 		 ]);
 
-		 $originalImage= $request->file('file');
+		 $originalImage = $request->file('file');
 
 		 $t = time();
-		 $filename = Str::slug($t.$originalImage->getClientOriginalName(),".");
+		 $filename = Str::slug($t . $originalImage->getClientOriginalName(), ".");
 
 
-		if(!is_dir(public_path().'/vendor/phpsa-datastore/thumbs')){
-			mkdir(public_path().'/vendor/phpsa-datastore/thumbs', 0755, true);
+		if (!is_dir(public_path() . '/vendor/phpsa-datastore/thumbs')) {
+			mkdir(public_path() . '/vendor/phpsa-datastore/thumbs', 0755, true);
 		}
 
 
 		 $thumbnailImage = Image::make($originalImage);
-		 $thumbnailPath = public_path().'/vendor/phpsa-datastore/img/';
-		 $originalPath = public_path().'/vendor/phpsa-datastore/thumbs/';
-		 $thumbnailImage->save($originalPath.$filename);
+		 $thumbnailPath = public_path() . '/vendor/phpsa-datastore/img/';
+		 $originalPath = public_path() . '/vendor/phpsa-datastore/thumbs/';
+		 $thumbnailImage->save($originalPath . $filename);
 
-		 $thumbnailImage->resize(150,150, function ($constraint) {
+		 $thumbnailImage->resize(150, 150, function($constraint) {
 			$constraint->aspectRatio();
 		});
-		 $thumbnailImage->save($thumbnailPath.$filename);
+		 $thumbnailImage->save($thumbnailPath . $filename);
 
 
 		return response()->json(["file" => $filename]);
@@ -377,14 +377,14 @@ 
 
 
 
-	public function indentityAutocomplete(Request $request){
+	public function indentityAutocomplete(Request $request) {
 		$search = urldecode($request->input('q'));
 		$results = [];
-		if( strlen($search) >= 3 )
+		if (strlen($search) >= 3)
 		{
 			$userModel = config('auth.providers.users.model');
-			$records = $userModel::whereRaw("concat_ws(' ', first_name, last_name) like ? ", ["{$search}%"])->limit(10)->get(['id','first_name','last_name']);
-			foreach($records as $record)
+			$records = $userModel::whereRaw("concat_ws(' ', first_name, last_name) like ? ", ["{$search}%"])->limit(10)->get(['id', 'first_name', 'last_name']);
+			foreach ($records as $record)
 			{
 				$result = [
 					'value' => $record->id,
@@ -434,13 +434,13 @@ 
             }
 
 
-			$query = DatastoreModel::where('value','like','%' . $term . '%')
+			$query = DatastoreModel::where('value', 'like', '%' . $term . '%')
 			->where('type', $type);
-			if($q == 'fieldset'){
+			if ($q == 'fieldset') {
 				$query->order_by('value');
 			}
 			$data = $query->get(['value as label', 'id as value']);
-			return response()->json($data );
+			return response()->json($data);
 /*
 			//db query
 			if ($q == 'fieldset') {
@@ -455,7 +455,7 @@ 
             echo json_encode($data);
             exit;*/
         }
-        return response()->json( []);
+        return response()->json([]);
     }
 
 }

src/routes.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
 $prefix = config("datastore.urlprefix");
 
-Route::group(['namespace' => 'Backend', 'prefix' => 'admin', 'as' => 'admin.ams.', 'middleware' => ['admin',  'permission:manage datastore']], function () {
+Route::group(['namespace' => 'Backend', 'prefix' => 'admin', 'as' => 'admin.ams.', 'middleware' => ['admin', 'permission:manage datastore']], function() {
 	Route::get('ams/slug', [AdminController::class, 'slug'])->name('content.slug');
 	Route::post('ams/file', [AdminController::class, 'file'])->name('content.file');
 	Route::post('ams/image', [AdminController::class, 'image'])->name('content.image');
@@ -26,7 +26,7 @@ 
 	Route::get('/ams/gettypedata', [AdminController::class, 'getTypeData'])->name('content.test.typedata');
 });
 
-Route::group(['namespace' => 'Frontend', 'as' => 'frontend.ams.', 'prefix' => $prefix ], function () {
+Route::group(['namespace' => 'Frontend', 'as' => 'frontend.ams.', 'prefix' => $prefix], function() {
 	Route::get('{slug}', [DatastoreController::class, 'page'])->name('page.slug');
 	Route::get('articles/author/{id}-{slug}', [DatastoreController::class, 'articleByAuthor'])->name('article.byauthor');
 	Route::get('articles/{slug}', [DatastoreController::class, 'page'])->name('article.category');

src/breadcrumbs.php

Spacing +3 added lines, -3 removed lines

@@ -1,17 +1,17 @@
 <?php
 
-Breadcrumbs::for('admin.ams.content.list', function ($trail, $asset) {
+Breadcrumbs::for ('admin.ams.content.list', function($trail, $asset) {
     $trail->parent('admin.dashboard');
 	$trail->push(__('phpsa-datastore::backend.menus.sidebar.main'), route('admin.ams.content.list', $asset));
 });
 
-Breadcrumbs::for('admin.ams.content.create', function ($trail, $asset) {
+Breadcrumbs::for ('admin.ams.content.create', function($trail, $asset) {
     $trail->parent('admin.dashboard');
 	$trail->push(__('phpsa-datastore::backend.menus.sidebar.main'), route('admin.ams.content.list', $asset));
 	$trail->push(__('phpsa-datastore::backend.menus.sidebar.create'));
 });
 
-Breadcrumbs::for('admin.ams.content.update', function ($trail, $asset) {
+Breadcrumbs::for ('admin.ams.content.update', function($trail, $asset) {
     $trail->parent('admin.dashboard');
 	$trail->push(__('phpsa-datastore::backend.menus.sidebar.main'), route('admin.ams.content.list', $asset));
 	$trail->push(__('phpsa-datastore::backend.menus.sidebar.update'));

src/views/render/image-asset.blade.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
-	$src = $params['assetClass']::getImageUrl($value, !empty($params['width']) ? $params['width']: null,!empty($params['height']) ? $params['height']: null);
+	$src = $params['assetClass']::getImageUrl($value, !empty($params['width']) ? $params['width'] : null, !empty($params['height']) ? $params['height'] : null);
 	$image = html()->img()->src($src);
-	foreach(['id','class','onError','alt','title'] as $prop){
-		if(!empty($params[$prop])){
+	foreach (['id', 'class', 'onError', 'alt', 'title'] as $prop) {
+		if (!empty($params[$prop])) {
 			$image = $image->attribute($prop, $params[$prop]);
 		}
 	}

src/views/backend/sidebar.blade.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 				@foreach ($datastoreData as $ksk => $dsa)
 				<?php
-					$link = strtolower($datastoreKey ? $datastoreKey .'.' . $ksk : $ksk);
+					$link = strtolower($datastoreKey ? $datastoreKey . '.' . $ksk : $ksk);
 					$route = 'admin.ams.content.list';
 
 					?>

src/views/backend/ams/create.blade.php

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 								<?php if ($children): ?>
 
 									<li class="nav-item ">
-											<a class="nav-link" id="{{ Str::slug($children['path']) }}-child-tab" data-toggle="tab"  href="#{{ Str::slug($children['path']) }}-child" role="tab" aria-controls="<?php echo  Str::slug($children['path']) ; ?>-child" aria-selected="false">{{ $children['name'] }}</a>
+											<a class="nav-link" id="{{ Str::slug($children['path']) }}-child-tab" data-toggle="tab"  href="#{{ Str::slug($children['path']) }}-child" role="tab" aria-controls="<?php echo  Str::slug($children['path']); ?>-child" aria-selected="false">{{ $children['name'] }}</a>
 									</li>
 
 								<?php endif; ?>
@@ -47,8 +47,8 @@ 
 									<li class="nav-item">
 										<a class="nav-link" id="seo-tab" data-toggle="tab" href="#seo" role="tab" aria-controls="seo" aria-selected="false">@lang('phpsa-datastore::backend.labels.tabs.seo')</a>
 									</li>
-								<?php endif ;?>
-								<?php  if($asset->hasDeveloperForm()) :?>
+								<?php endif; ?>
+								<?php  if ($asset->hasDeveloperForm()) :?>
 								<li class="nav-item">
 									<a class="nav-link" id="cssjs-tab" data-toggle="tab" href="#cssjs" role="tab" aria-controls="cssjs" aria-selected="false">@lang('phpsa-datastore::backend.labels.tabs.cssjs')</a>
 								</li>
@@ -82,7 +82,7 @@ 
 															<?php foreach ($parent['related'] as $k => $v): ?>
 
 															<div class="form-check form-check-inline mr-3">
-																<input class="form-check-input" id="parent_{{ $pid }}_{{ $k }}" type="<?php echo ((int)$v['accept_limit'] === 1 ? 'radio' : 'checkbox'); ?>" name="related_assets[]" value="<?php echo $v['id']; ?>" <?php echo (isset($v['assigned_and_found']) && $v['assigned_and_found']) ? ' checked="checked"' : ''; ?>/>
+																<input class="form-check-input" id="parent_{{ $pid }}_{{ $k }}" type="<?php echo ((int) $v['accept_limit'] === 1 ? 'radio' : 'checkbox'); ?>" name="related_assets[]" value="<?php echo $v['id']; ?>" <?php echo (isset($v['assigned_and_found']) && $v['assigned_and_found']) ? ' checked="checked"' : ''; ?>/>
 																<input name="related_id[]" type="hidden" value="<?php echo $v['id']; ?>" />
 																<label class="form-check-label" for="parent_{{ $pid }}_{{ $k }}"><?php echo $v['value']; ?></label>
 															</div>
@@ -128,7 +128,7 @@ 
 
 														<div class="tab-content tab-validate border-0" id="v-pills-tabContent">
 																<?php foreach ($children['kids'] as $idx => $child): ?>
-																	<div class="child-tab-pane tab-pane fade<?php echo $idx == 0 ? ' show active' : '';?>" id="v-pills-{{ $idx }}" role="tabpanel" aria-labelledby="v-{{ $idx }}-home-tab">
+																	<div class="child-tab-pane tab-pane fade<?php echo $idx == 0 ? ' show active' : ''; ?>" id="v-pills-{{ $idx }}" role="tabpanel" aria-labelledby="v-{{ $idx }}-home-tab">
 																			<fieldset>
 																					<h6><span><?php echo ucwords($children['name']) . ' ' . ($idx + 1); ?></span>
 																						<div class="btn-toolbar float-right" role="toolbar" aria-label="@lang('labels.general.toolbar_btn_groups')">
@@ -144,7 +144,7 @@ 
 																					</div>
 																			</fieldset>
 																	</div>
-																<?php endforeach ;?>
+																<?php endforeach; ?>
 
 														</div>
 
@@ -215,7 +215,7 @@ 
 									</div>
 
 								<?php endif; ?>
-								<?php  if($asset->hasDeveloperForm()) :?>
+								<?php  if ($asset->hasDeveloperForm()) :?>
 									<div class="tab-pane fade" id="cssjs" role="tabpanel" aria-labelledby="cssjs-tab">
 										<fieldset>
 												<h6>@lang('phpsa-datastore::backend.labels.tabs.cssjs')<small> - @lang('phpsa-datastore::backend.labels.tabs.label.createmodifycssjs')</small></h6>

src/views/backend/ams/list.blade.php

Spacing +2 added lines, -2 removed lines

@@ -16,11 +16,11 @@
             </div><!--col-->
 
             <div class="col-sm-7">
-				<?php if($asset['max_instances'] == 0 || $content->total() < $asset['max_instances']): ?>
+				<?php if ($asset['max_instances'] == 0 || $content->total() < $asset['max_instances']): ?>
 				@include('phpsa-datastore::backend.ams.includes.header-buttons')
 			<?php endif; ?>
 			</div><!--col-->
-			<?php if($asset['about']): ?>
+			<?php if ($asset['about']): ?>
 			<div class="col-sm-11">
 				<div class="alert alert-info">{{ $asset['about'] }}</div>
 			</div>

src/views/form/html-asset.blade.php

Spacing +4 added lines, -4 removed lines

@@ -9,15 +9,15 @@
 			->attribute('cols', 40)
 			->attribute('id', $data['key'])
 			->class('form-control ams-htmleditor');
-			if($data['required']){
+			if ($data['required']) {
 				$input = $input->required();
 			}
-			if($asset_classname){
+			if ($asset_classname) {
 				$name = 'assetInjectionform[' . $asset_classname . '][' . $data['unique_id'] . '][' . $data['key'] . ']';
-			}else{
+			}else {
 				$name = $data['key'];
 			}
-			$name .= (isset($multiform) && $multiform) ? '[]' : '';?>
+			$name .= (isset($multiform) && $multiform) ? '[]' : ''; ?>
 
 			{{ $input->name($name)->value(old($name, !empty($data['value']) ? $data['value'] : NULL)) }}
 

src/views/form/image-asset.blade.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@ 
 <div class="row form-group">
-	<?php $key = isset($data['unique_id']) ? $data['key'] . '_' . $data['unique_id'] : $data['key'] ; ?>
+	<?php $key = isset($data['unique_id']) ? $data['key'] . '_' . $data['unique_id'] : $data['key']; ?>
 		{{ html()->label($data['name'])->class('col-md-2 form-control-label')->for($key) }}
 		<div class="col-md-10">
 			<?php
-			if($asset_classname){
+			if ($asset_classname) {
 				$name = 'assetInjectionform[' . $asset_classname . '][' . $data['unique_id'] . '][' . $data['key'] . ']';
-			}else{
+			}else {
 				$name = $data['key'];
 			}
 
@@ -31,7 +31,7 @@ 
 			->attribute('id', $key . '_file')
 			->placeholder('Choose File')
 			->class('form-control ams-upload-filename');
-			if($data['required']){
+			if ($data['required']) {
 				$input = $input->required();
 			}
 			?>