Laravel-Backpack / CRUD

src/app/Http/Controllers/CrudController.php

Doc Comments +3 added lines, -4 removed lines

@@ -110,7 +110,7 @@ 
 	/**
 	 * Store a newly created resource in the database.
 	 *
-	 * @return Response
+	 * @return \Illuminate\Http\RedirectResponse|null
 	 */
 	public function storeCrud(StoreRequest $request = null)
 	{
@@ -187,8 +187,7 @@ 
 	/**
 	 * Update the specified resource in the database.
 	 *
-	 * @param  int  $id
-	 * @return Response
+	 * @return \Illuminate\Http\RedirectResponse
 	 */
 	public function updateCrud(UpdateRequest $request = null)
 	{
@@ -242,7 +241,7 @@ 
 	 * Remove the specified resource from storage.
 	 *
 	 * @param  int  $id
-	 * @return Response
+	 * @return string
 	 */
 	public function destroy($id)
 	{

Unused Use Statements -3 removed lines

@@ -4,12 +4,9 @@
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\Request;
-use Crypt;
-use Illuminate\Support\Facades\Form as Form;
 use Alert;
 
 // VALIDATION: change the requests to match your own file names if you need form validation
-use Backpack\CRUD\app\Http\Requests\CrudRequest as StoreRequest;
 use Backpack\CRUD\app\Http\Requests\CrudRequest as UpdateRequest;
 
 class CrudController extends BaseController {

Indentation +587 added lines, -587 removed lines

@@ -14,592 +14,592 @@
 
 class CrudController extends BaseController {
 
-	use DispatchesJobs, ValidatesRequests;
-
-	public $data = array();
-	public $crud = array(
-						"model" => "\App\Models\Entity",
-						"entity_name" => "entry",
-						"entity_name_plural" => "entries",
-						"view_table_permission" => true,
-						"add_permission" => true,
-						"edit_permission" => true,
-						"delete_permission" => true,
-						"reorder_permission" => true,
-						"reorder_max_level" => 3,
-						"details_row" => false,
-						);
-
-	public function __construct()
-	{
-		$this->data['crud'] = $this->crud;
-
-		// Check for the right roles to access these pages
-		// if (!\Entrust::can('view-admin-panel')) {
-	 //        abort(403, trans('backpack::crud.unauthorized_access'));
-	 //    }
-	}
-
-	/**
-	 * Display all rows in the database for this entity.
-	 *
-	 * @return Response
-	 */
-	public function index()
-	{
-		// SECURITY:
-		// if view_table_permission is false, abort
-		if (isset($this->crud['view_table_permission']) && !$this->crud['view_table_permission']) {
-			abort(403, 'Not allowed.');
-		}
-
-		// get all results for that entity
-		$model = $this->crud['model'];
-		if (property_exists($model, 'translatable'))
-		{
-			$this->data['entries'] = $model::where('translation_lang', \Lang::locale())->get();
-		}
-		else
-		{
-			$this->data['entries'] = $model::all();
-		}
-
-			// add the fake fields for each entry
-			foreach ($this->data['entries'] as $key => $entry) {
-				$entry->addFakes($this->getFakeColumnsAsArray());
-			}
-
-		$this->prepareColumns();
-		$this->data['crud'] = $this->crud;
-		$this->data['title'] = ucfirst($this->crud['entity_name_plural']);
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::list', $this->data);
-	}
-
-
-	/**
-	 * Show the form for creating inserting a new row.
-	 *
-	 * @return Response
-	 */
-	public function create()
-	{
-		// SECURITY:
-		// if add_permission is false, abort
-		if (isset($this->crud['add_permission']) && !$this->crud['add_permission']) {
-			abort(403, 'Not allowed.');
-		}
-
-		// get the fields you need to show
-		if (isset($this->data['crud']['create_fields']))
-		{
-			$this->crud['fields'] = $this->data['crud']['create_fields'];
-		}
-
-		// prepare the fields you need to show
-		$this->prepareFields();
-		$this->data['crud'] = $this->crud;
-		$this->data['title'] = trans('backpack::crud.add').' '.$this->crud['entity_name'];
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::create', $this->data);
-	}
-
-
-	/**
-	 * Store a newly created resource in the database.
-	 *
-	 * @return Response
-	 */
-	public function storeCrud(StoreRequest $request = null)
-	{
-		// SECURITY:
-		// if add_permission is false, abort
-		if (isset($this->crud['add_permission']) && !$this->crud['add_permission']) {
-			abort(403, 'Not allowed.');
-		}
-
-		// compress the fake fields into one field
-		$model = $this->crud['model'];
-		$values_to_store = $this->compactFakeFields(\Request::all());
-		$item = $model::create($values_to_store);
-
-		// if it's a relationship with a pivot table, also sync that
-		$this->prepareFields();
-		foreach ($this->crud['fields'] as $k => $field) {
-			if (isset($field['pivot']) && $field['pivot']==true && \Request::has($field['name']))
-			{
-				$model::find($item->id)->$field['name']()->attach(\Request::input($field['name']));
-			}
-		}
-
-		// show a success message
-		\Alert::success(trans('backpack::crud.insert_success'))->flash();
-
-		// redirect the user where he chose to be redirected
-		switch (\Request::input('redirect_after_save')) {
-			case 'current_item_edit':
-				return \Redirect::to($this->crud['route'].'/'.$item->id.'/edit');
-				break;
-
-			default:
-				return \Redirect::to(\Request::input('redirect_after_save'));
-				break;
-		}
-	}
-
-
-	/**
-	 * Show the form for editing the specified resource.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function edit($id)
-	{
-		// SECURITY:
-		// if edit_permission is false, abort
-		if (isset($this->crud['edit_permission']) && !$this->crud['edit_permission']) {
-			abort(403, 'Not allowed.');
-		}
-
-		// get the info for that entry
-		$model = $this->crud['model'];
-		$this->data['entry'] = $model::find($id);
-		$this->data['entry']->addFakes($this->getFakeColumnsAsArray());
-
-		if (isset($this->data['crud']['update_fields']))
-		{
-			$this->crud['fields'] = $this->data['crud']['update_fields'];
-		}
-
-		// prepare the fields you need to show and prepopulate the values
-		$this->prepareFields($this->data['entry']);
-		$this->data['crud'] = $this->crud;
-		$this->data['title'] = trans('backpack::crud.edit').' '.$this->crud['entity_name'];
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::edit', $this->data);
-	}
-
-
-	/**
-	 * Update the specified resource in the database.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function updateCrud(UpdateRequest $request = null)
-	{
-		// if edit_permission is false, abort
-		if (isset($this->crud['edit_permission']) && !$this->crud['edit_permission']) {
-			abort(403, 'Not allowed.');
-		}
-
-		$model = $this->crud['model'];
-		$this->prepareFields($model::find(\Request::input('id')));
-
-		$item = $model::find(\Request::input('id'))
-						->update($this->compactFakeFields(\Request::all()));
-
-		// if it's a relationship with a pivot table, also sync that
-		foreach ($this->crud['fields'] as $k => $field) {
-			if (isset($field['pivot']) && $field['pivot']==true && \Request::has($field['name']))
-			{
-				$model::find(\Request::input('id'))->$field['name']()->sync(\Request::input($field['name']));
-			}
-		}
-
-		// show a success message
-		\Alert::success(trans('backpack::crud.update_success'))->flash();
-
-		return \Redirect::to($this->crud['route']);
-	}
-
-
-	/**
-	 * Display the specified resource.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function show($id)
-	{
-		// get the info for that entry
-		$model = $this->crud['model'];
-		$this->data['entry'] = $model::find($id);
-		$this->data['entry']->addFakes($this->getFakeColumnsAsArray());
-		$this->data['crud'] = $this->crud;
-		$this->data['title'] = trans('backpack::crud.preview').' '.$this->crud['entity_name'];
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::show', $this->data);
-	}
-
-
-	/**
-	 * Remove the specified resource from storage.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function destroy($id)
-	{
-		// SECURITY:
-		// if delete_permission is false, abort
-		if (isset($this->crud['delete_permission']) && !$this->crud['delete_permission']) {
-			abort(403, trans('backpack::crud.unauthorized_access'));
-		}
-
-		$model = $this->crud['model'];
-		$item = $model::find($id);
-		$item->delete();
-
-		return 'true';
-	}
-
-
-	/**
-	 *  Reorder the items in the database using the Nested Set pattern.
-	 *
-	 *	Database columns needed: id, parent_id, lft, rgt, depth, name/title
-	 *
-	 *  @return Response
-	 */
-	public function reorder($lang = false)
-	{
-		// if reorder_table_permission is false, abort
-		if (isset($this->crud['reorder_permission']) && !$this->crud['reorder_permission']) {
-			abort(403, 'Not allowed.');
-		}
-
-		if ($lang == false)
-		{
-			$lang = \Lang::locale();
-		}
-
-		// get all results for that entity
-		$model = $this->crud['model'];
-		if (property_exists($model, 'translatable'))
-		{
-			$this->data['entries'] = $model::where('translation_lang', $lang)->get();
-			$this->data['languages'] = \Backpack\LangFileManager\app\Models\Language::all();
-			$this->data['active_language'] = $lang;
-		}
-		else
-		{
-			$this->data['entries'] = $model::all();
-		}
-		$this->data['crud'] = $this->crud;
-		$this->data['title'] = trans('backpack::crud.reorder').' '.$this->crud['entity_name'];
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::reorder', $this->data);
-	}
-
-
-	/**
-	 * Save the new order, using the Nested Set pattern.
-	 *
-	 * Database columns needed: id, parent_id, lft, rgt, depth, name/title
-	 *
-	 * @return
-	 */
-	public function saveReorder()
-	{
-		// if reorder_table_permission is false, abort
-		if (isset($this->crud['reorder_permission']) && !$this->crud['reorder_permission']) {
-			abort(403, 'Not allowed.');
-		}
-
-		$model = $this->crud['model'];
-		$count = 0;
-		$all_entries = \Request::input('tree');
-
-		if (count($all_entries)) {
-			foreach ($all_entries as $key => $entry) {
-				if ($entry['item_id'] != "" && $entry['item_id'] != null) {
-					$item = $model::find($entry['item_id']);
-					$item->parent_id = $entry['parent_id'];
-					$item->depth = $entry['depth'];
-					$item->lft = $entry['left'];
-					$item->rgt = $entry['right'];
-					$item->save();
-
-					$count++;
-				}
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return 'success for '.$count." items";
-	}
-
-
-	/**
-	 * Used with AJAX in the list view (datatables) to show extra information about that row that didn't fit in the table.
-	 * It defaults to showing all connected translations and their CRUD buttons.
-	 *
-	 * It's enabled by:
-	 * - setting the $crud['details_row'] variable to true;
-	 * - adding the details route for the entity; ex: Route::get('page/{id}/details', 'PageCrudController@showDetailsRow');
-	 */
-	public function showDetailsRow($id)
-	{
-		// get the info for that entry
-		$model = $this->crud['model'];
-		$this->data['entry'] = $model::find($id);
-		$this->data['entry']->addFakes($this->getFakeColumnsAsArray());
-		$this->data['original_entry'] = $this->data['entry'];
-		$this->data['crud'] = $this->crud;
-
-		if (property_exists($model, 'translatable'))
-		{
-			$this->data['translations'] = $this->data['entry']->translations();
-
-			// create a list of languages the item is not translated in
-			$this->data['languages'] = \Backpack\LangFileManager\app\Models\Language::all();
-			$this->data['languages_already_translated_in'] = $this->data['entry']->translationLanguages();
-			$this->data['languages_to_translate_in'] = $this->data['languages']->diff($this->data['languages_already_translated_in']);
-			$this->data['languages_to_translate_in'] = $this->data['languages_to_translate_in']->reject(function ($item) {
-			    return $item->abbr == \Lang::locale();
-			});
-		}
-
-		// load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-		return view('crud::details_row', $this->data);
-	}
-
-
-	/**
-	 * Duplicate an existing item into another language and open it for editing.
-	 */
-	public function translateItem($id, $lang)
-	{
-		$model = $this->crud['model'];
-		$this->data['entry'] = $model::find($id);
-		// check if there isn't a translation already
-		$existing_translation = $this->data['entry']->translation($lang);
-
-		if ($existing_translation)
-		{
-			$new_entry = $existing_translation;
-		}
-		else
-		{
-			// get the info for that entry
-			$new_entry_attributes = $this->data['entry']->getAttributes();
-			$new_entry_attributes['translation_lang'] = $lang;
-			$new_entry_attributes['translation_of'] = $id;
-			$new_entry_attributes = array_except($new_entry_attributes, 'id');
-
-			$new_entry = $model::create($new_entry_attributes);
-		}
-
-		// redirect to the edit form for that translation
-		return redirect(str_replace($id, $new_entry->id, str_replace('translate/'.$lang, 'edit', \Request::url())));
-	}
-
-
-
-	/**
-	 * COMMODITY FUNCTIONS
-	 */
-
-
-	/**
-	 * Refactor the request array to something that can be passed to the model's create or update function.
-	 * The resulting array will only include the fields that are stored in the database and their values,
-	 * plus the '_token' and 'redirect_after_save' variables.
-	 *
-	 * @param 	Request 	$request - everything that was sent from the form, usually \Request::all()
-	 * @return 	array
-	 */
-	protected function compactFakeFields($request) {
-
-		$this->prepareFields();
-
-		$fake_field_columns_to_encode = [];
-
-		// go through each defined field
-		foreach ($this->crud['fields'] as $k => $field) {
-			// if it's a fake field
-			if (isset($this->crud['fields'][$k]['fake']) && $this->crud['fields'][$k]['fake']==true) {
-				// add it to the request in its appropriate variable - the one defined, if defined
-				if (isset($this->crud['fields'][$k]['store_in'])) {
-					$request[$this->crud['fields'][$k]['store_in']][$this->crud['fields'][$k]['name']] = $request[$this->crud['fields'][$k]['name']];
-
-					$remove_fake_field = array_pull($request, $this->crud['fields'][$k]['name']);
-					if(!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)){
-				        array_push($fake_field_columns_to_encode, $this->crud['fields'][$k]['store_in']);
-				    }
-				}
-				else //otherwise in the one defined in the $crud variable
-				{
-					$request['extras'][$this->crud['fields'][$k]['name']] = $request[$this->crud['fields'][$k]['name']];
-
-					$remove_fake_field = array_pull($request, $this->crud['fields'][$k]['name']);
-					if(!in_array('extras', $fake_field_columns_to_encode, true)){
-				        array_push($fake_field_columns_to_encode, 'extras');
-				    }
-				}
-			}
-		}
-
-		// json_encode all fake_value columns in the database, so they can be properly stored and interpreted
-		if (count($fake_field_columns_to_encode)) {
-			foreach ($fake_field_columns_to_encode as $key => $value) {
-				$request[$value] = json_encode($request[$value]);
-			}
-		}
-
-		// if there are no fake fields defined, this will just return the original Request in full
-		// since no modifications or additions have been made to $request
-		return $request;
-	}
-
-
-	/**
-	 * Returns an array of database columns names, that are used to store fake values.
-	 * Returns ['extras'] if no columns have been found.
-	 *
-	 */
-	protected function getFakeColumnsAsArray() {
-
-		$this->prepareFields();
-
-		$fake_field_columns_to_encode = [];
-
-		foreach ($this->crud['fields'] as $k => $field) {
-			// if it's a fake field
-			if (isset($this->crud['fields'][$k]['fake']) && $this->crud['fields'][$k]['fake']==true) {
-				// add it to the request in its appropriate variable - the one defined, if defined
-				if (isset($this->crud['fields'][$k]['store_in'])) {
-					if(!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)){
-				        array_push($fake_field_columns_to_encode, $this->crud['fields'][$k]['store_in']);
-				    }
-				}
-				else //otherwise in the one defined in the $crud variable
-				{
-					if(!in_array('extras', $fake_field_columns_to_encode, true)){
-				        array_push($fake_field_columns_to_encode, 'extras');
-				    }
-				}
-			}
-		}
-
-		if (!count($fake_field_columns_to_encode)) {
-			return ['extras'];
-		}
-
-		return $fake_field_columns_to_encode;
-	}
-
-
-	// If it's not an array of array and it's a simple array, create a proper array of arrays for it
-	protected function prepareColumns()
-	{
-		// if the columns aren't set, we can't show this page
-		// TODO: instead of dying, show the columns defined as visible on the model
-		if (!isset($this->crud['columns']))
-		{
-			abort(500, "CRUD columns are not defined.");
-		}
-
-		// if the columns are defined as a string, transform it to a proper array
-		if (!is_array($this->crud['columns']))
-		{
-			$current_columns_array = explode(",", $this->crud['columns']);
-			$proper_columns_array = array();
-
-			foreach ($current_columns_array as $key => $col) {
-				$proper_columns_array[] = [
-								'name' => $col,
-								'label' => ucfirst($col) //TODO: also replace _ with space
-							];
-			}
-
-			$this->crud['columns'] = $proper_columns_array;
-		}
-	}
-
-	/**
-	 * Prepare the fields to be shown, stored, updated or created.
-	 *
-	 * Makes sure $this->crud['fields'] is in the proper format (array of arrays);
-	 * Makes sure $this->crud['fields'] also contains the id of the current item;
-	 * Makes sure $this->crud['fields'] also contains the values for each field;
-	 *
-	 */
-	protected function prepareFields($entry = false)
-	{
-		// if the fields have been defined separately for create and update, use that
-		if (!isset($this->crud['fields']))
-		{
-			if (isset($this->crud['create_fields']))
-			{
-				$this->crud['fields'] = $this->crud['create_fields'];
-			}
-			elseif (isset($this->crud['update_fields']))
-			{
-				$this->crud['fields'] = $this->crud['update_fields'];
-			}
-		}
-
-		// PREREQUISITES CHECK:
-		// if the fields aren't set, trigger error
-		if (!isset($this->crud['fields']))
-		{
-			abort(500, "The CRUD fields are not defined.");
-		}
-
-		// if the fields are defined as a string, transform it to a proper array
-		if (!is_array($this->crud['fields']))
-		{
-			$current_fields_array = explode(",", $this->crud['fields']);
-			$proper_fields_array = array();
-
-			foreach ($current_fields_array as $key => $field) {
-				$proper_fields_array[] = [
-								'name' => $field,
-								'label' => ucfirst($field), // TODO: also replace _ with space
-								'type' => 'text' // TODO: choose different types of fields depending on the MySQL column type
-							];
-			}
-
-			$this->crud['fields'] = $proper_fields_array;
-		}
-
-		// if no field type is defined, assume the "text" field type
-		foreach ($this->crud['fields'] as $k => $field) {
-				if (!isset($this->crud['fields'][$k]['type']))
-					$this->crud['fields'][$k]['type'] = 'text';
-			}
-
-		// if an entry was passed, we're preparing for the update form, not create
-		if ($entry) {
-			// put the values in the same 'fields' variable
-			$fields = $this->crud['fields'];
-
-			foreach ($fields as $k => $field) {
-				// set the value
-				if (!isset($this->crud['fields'][$k]['value']))
-				{
-					$this->crud['fields'][$k]['value'] = $entry->$field['name'];
-				}
-			}
-
-			// always have a hidden input for the entry id
-			$this->crud['fields'][] = array(
-												'name' => 'id',
-												'value' => $entry->id,
-												'type' => 'hidden'
-											);
-		}
-	}
+    use DispatchesJobs, ValidatesRequests;
+
+    public $data = array();
+    public $crud = array(
+                        "model" => "\App\Models\Entity",
+                        "entity_name" => "entry",
+                        "entity_name_plural" => "entries",
+                        "view_table_permission" => true,
+                        "add_permission" => true,
+                        "edit_permission" => true,
+                        "delete_permission" => true,
+                        "reorder_permission" => true,
+                        "reorder_max_level" => 3,
+                        "details_row" => false,
+                        );
+
+    public function __construct()
+    {
+        $this->data['crud'] = $this->crud;
+
+        // Check for the right roles to access these pages
+        // if (!\Entrust::can('view-admin-panel')) {
+        //        abort(403, trans('backpack::crud.unauthorized_access'));
+        //    }
+    }
+
+    /**
+     * Display all rows in the database for this entity.
+     *
+     * @return Response
+     */
+    public function index()
+    {
+        // SECURITY:
+        // if view_table_permission is false, abort
+        if (isset($this->crud['view_table_permission']) && !$this->crud['view_table_permission']) {
+            abort(403, 'Not allowed.');
+        }
+
+        // get all results for that entity
+        $model = $this->crud['model'];
+        if (property_exists($model, 'translatable'))
+        {
+            $this->data['entries'] = $model::where('translation_lang', \Lang::locale())->get();
+        }
+        else
+        {
+            $this->data['entries'] = $model::all();
+        }
+
+            // add the fake fields for each entry
+            foreach ($this->data['entries'] as $key => $entry) {
+                $entry->addFakes($this->getFakeColumnsAsArray());
+            }
+
+        $this->prepareColumns();
+        $this->data['crud'] = $this->crud;
+        $this->data['title'] = ucfirst($this->crud['entity_name_plural']);
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::list', $this->data);
+    }
+
+
+    /**
+     * Show the form for creating inserting a new row.
+     *
+     * @return Response
+     */
+    public function create()
+    {
+        // SECURITY:
+        // if add_permission is false, abort
+        if (isset($this->crud['add_permission']) && !$this->crud['add_permission']) {
+            abort(403, 'Not allowed.');
+        }
+
+        // get the fields you need to show
+        if (isset($this->data['crud']['create_fields']))
+        {
+            $this->crud['fields'] = $this->data['crud']['create_fields'];
+        }
+
+        // prepare the fields you need to show
+        $this->prepareFields();
+        $this->data['crud'] = $this->crud;
+        $this->data['title'] = trans('backpack::crud.add').' '.$this->crud['entity_name'];
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::create', $this->data);
+    }
+
+
+    /**
+     * Store a newly created resource in the database.
+     *
+     * @return Response
+     */
+    public function storeCrud(StoreRequest $request = null)
+    {
+        // SECURITY:
+        // if add_permission is false, abort
+        if (isset($this->crud['add_permission']) && !$this->crud['add_permission']) {
+            abort(403, 'Not allowed.');
+        }
+
+        // compress the fake fields into one field
+        $model = $this->crud['model'];
+        $values_to_store = $this->compactFakeFields(\Request::all());
+        $item = $model::create($values_to_store);
+
+        // if it's a relationship with a pivot table, also sync that
+        $this->prepareFields();
+        foreach ($this->crud['fields'] as $k => $field) {
+            if (isset($field['pivot']) && $field['pivot']==true && \Request::has($field['name']))
+            {
+                $model::find($item->id)->$field['name']()->attach(\Request::input($field['name']));
+            }
+        }
+
+        // show a success message
+        \Alert::success(trans('backpack::crud.insert_success'))->flash();
+
+        // redirect the user where he chose to be redirected
+        switch (\Request::input('redirect_after_save')) {
+            case 'current_item_edit':
+                return \Redirect::to($this->crud['route'].'/'.$item->id.'/edit');
+                break;
+
+            default:
+                return \Redirect::to(\Request::input('redirect_after_save'));
+                break;
+        }
+    }
+
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function edit($id)
+    {
+        // SECURITY:
+        // if edit_permission is false, abort
+        if (isset($this->crud['edit_permission']) && !$this->crud['edit_permission']) {
+            abort(403, 'Not allowed.');
+        }
+
+        // get the info for that entry
+        $model = $this->crud['model'];
+        $this->data['entry'] = $model::find($id);
+        $this->data['entry']->addFakes($this->getFakeColumnsAsArray());
+
+        if (isset($this->data['crud']['update_fields']))
+        {
+            $this->crud['fields'] = $this->data['crud']['update_fields'];
+        }
+
+        // prepare the fields you need to show and prepopulate the values
+        $this->prepareFields($this->data['entry']);
+        $this->data['crud'] = $this->crud;
+        $this->data['title'] = trans('backpack::crud.edit').' '.$this->crud['entity_name'];
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::edit', $this->data);
+    }
+
+
+    /**
+     * Update the specified resource in the database.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function updateCrud(UpdateRequest $request = null)
+    {
+        // if edit_permission is false, abort
+        if (isset($this->crud['edit_permission']) && !$this->crud['edit_permission']) {
+            abort(403, 'Not allowed.');
+        }
+
+        $model = $this->crud['model'];
+        $this->prepareFields($model::find(\Request::input('id')));
+
+        $item = $model::find(\Request::input('id'))
+                        ->update($this->compactFakeFields(\Request::all()));
+
+        // if it's a relationship with a pivot table, also sync that
+        foreach ($this->crud['fields'] as $k => $field) {
+            if (isset($field['pivot']) && $field['pivot']==true && \Request::has($field['name']))
+            {
+                $model::find(\Request::input('id'))->$field['name']()->sync(\Request::input($field['name']));
+            }
+        }
+
+        // show a success message
+        \Alert::success(trans('backpack::crud.update_success'))->flash();
+
+        return \Redirect::to($this->crud['route']);
+    }
+
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function show($id)
+    {
+        // get the info for that entry
+        $model = $this->crud['model'];
+        $this->data['entry'] = $model::find($id);
+        $this->data['entry']->addFakes($this->getFakeColumnsAsArray());
+        $this->data['crud'] = $this->crud;
+        $this->data['title'] = trans('backpack::crud.preview').' '.$this->crud['entity_name'];
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::show', $this->data);
+    }
+
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function destroy($id)
+    {
+        // SECURITY:
+        // if delete_permission is false, abort
+        if (isset($this->crud['delete_permission']) && !$this->crud['delete_permission']) {
+            abort(403, trans('backpack::crud.unauthorized_access'));
+        }
+
+        $model = $this->crud['model'];
+        $item = $model::find($id);
+        $item->delete();
+
+        return 'true';
+    }
+
+
+    /**
+     *  Reorder the items in the database using the Nested Set pattern.
+     *
+     *	Database columns needed: id, parent_id, lft, rgt, depth, name/title
+     *
+     *  @return Response
+     */
+    public function reorder($lang = false)
+    {
+        // if reorder_table_permission is false, abort
+        if (isset($this->crud['reorder_permission']) && !$this->crud['reorder_permission']) {
+            abort(403, 'Not allowed.');
+        }
+
+        if ($lang == false)
+        {
+            $lang = \Lang::locale();
+        }
+
+        // get all results for that entity
+        $model = $this->crud['model'];
+        if (property_exists($model, 'translatable'))
+        {
+            $this->data['entries'] = $model::where('translation_lang', $lang)->get();
+            $this->data['languages'] = \Backpack\LangFileManager\app\Models\Language::all();
+            $this->data['active_language'] = $lang;
+        }
+        else
+        {
+            $this->data['entries'] = $model::all();
+        }
+        $this->data['crud'] = $this->crud;
+        $this->data['title'] = trans('backpack::crud.reorder').' '.$this->crud['entity_name'];
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::reorder', $this->data);
+    }
+
+
+    /**
+     * Save the new order, using the Nested Set pattern.
+     *
+     * Database columns needed: id, parent_id, lft, rgt, depth, name/title
+     *
+     * @return
+     */
+    public function saveReorder()
+    {
+        // if reorder_table_permission is false, abort
+        if (isset($this->crud['reorder_permission']) && !$this->crud['reorder_permission']) {
+            abort(403, 'Not allowed.');
+        }
+
+        $model = $this->crud['model'];
+        $count = 0;
+        $all_entries = \Request::input('tree');
+
+        if (count($all_entries)) {
+            foreach ($all_entries as $key => $entry) {
+                if ($entry['item_id'] != "" && $entry['item_id'] != null) {
+                    $item = $model::find($entry['item_id']);
+                    $item->parent_id = $entry['parent_id'];
+                    $item->depth = $entry['depth'];
+                    $item->lft = $entry['left'];
+                    $item->rgt = $entry['right'];
+                    $item->save();
+
+                    $count++;
+                }
+            }
+        }
+        else
+        {
+            return false;
+        }
+
+        return 'success for '.$count." items";
+    }
+
+
+    /**
+     * Used with AJAX in the list view (datatables) to show extra information about that row that didn't fit in the table.
+     * It defaults to showing all connected translations and their CRUD buttons.
+     *
+     * It's enabled by:
+     * - setting the $crud['details_row'] variable to true;
+     * - adding the details route for the entity; ex: Route::get('page/{id}/details', 'PageCrudController@showDetailsRow');
+     */
+    public function showDetailsRow($id)
+    {
+        // get the info for that entry
+        $model = $this->crud['model'];
+        $this->data['entry'] = $model::find($id);
+        $this->data['entry']->addFakes($this->getFakeColumnsAsArray());
+        $this->data['original_entry'] = $this->data['entry'];
+        $this->data['crud'] = $this->crud;
+
+        if (property_exists($model, 'translatable'))
+        {
+            $this->data['translations'] = $this->data['entry']->translations();
+
+            // create a list of languages the item is not translated in
+            $this->data['languages'] = \Backpack\LangFileManager\app\Models\Language::all();
+            $this->data['languages_already_translated_in'] = $this->data['entry']->translationLanguages();
+            $this->data['languages_to_translate_in'] = $this->data['languages']->diff($this->data['languages_already_translated_in']);
+            $this->data['languages_to_translate_in'] = $this->data['languages_to_translate_in']->reject(function ($item) {
+                return $item->abbr == \Lang::locale();
+            });
+        }
+
+        // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
+        return view('crud::details_row', $this->data);
+    }
+
+
+    /**
+     * Duplicate an existing item into another language and open it for editing.
+     */
+    public function translateItem($id, $lang)
+    {
+        $model = $this->crud['model'];
+        $this->data['entry'] = $model::find($id);
+        // check if there isn't a translation already
+        $existing_translation = $this->data['entry']->translation($lang);
+
+        if ($existing_translation)
+        {
+            $new_entry = $existing_translation;
+        }
+        else
+        {
+            // get the info for that entry
+            $new_entry_attributes = $this->data['entry']->getAttributes();
+            $new_entry_attributes['translation_lang'] = $lang;
+            $new_entry_attributes['translation_of'] = $id;
+            $new_entry_attributes = array_except($new_entry_attributes, 'id');
+
+            $new_entry = $model::create($new_entry_attributes);
+        }
+
+        // redirect to the edit form for that translation
+        return redirect(str_replace($id, $new_entry->id, str_replace('translate/'.$lang, 'edit', \Request::url())));
+    }
+
+
+
+    /**
+     * COMMODITY FUNCTIONS
+     */
+
+
+    /**
+     * Refactor the request array to something that can be passed to the model's create or update function.
+     * The resulting array will only include the fields that are stored in the database and their values,
+     * plus the '_token' and 'redirect_after_save' variables.
+     *
+     * @param 	Request 	$request - everything that was sent from the form, usually \Request::all()
+     * @return 	array
+     */
+    protected function compactFakeFields($request) {
+
+        $this->prepareFields();
+
+        $fake_field_columns_to_encode = [];
+
+        // go through each defined field
+        foreach ($this->crud['fields'] as $k => $field) {
+            // if it's a fake field
+            if (isset($this->crud['fields'][$k]['fake']) && $this->crud['fields'][$k]['fake']==true) {
+                // add it to the request in its appropriate variable - the one defined, if defined
+                if (isset($this->crud['fields'][$k]['store_in'])) {
+                    $request[$this->crud['fields'][$k]['store_in']][$this->crud['fields'][$k]['name']] = $request[$this->crud['fields'][$k]['name']];
+
+                    $remove_fake_field = array_pull($request, $this->crud['fields'][$k]['name']);
+                    if(!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)){
+                        array_push($fake_field_columns_to_encode, $this->crud['fields'][$k]['store_in']);
+                    }
+                }
+                else //otherwise in the one defined in the $crud variable
+                {
+                    $request['extras'][$this->crud['fields'][$k]['name']] = $request[$this->crud['fields'][$k]['name']];
+
+                    $remove_fake_field = array_pull($request, $this->crud['fields'][$k]['name']);
+                    if(!in_array('extras', $fake_field_columns_to_encode, true)){
+                        array_push($fake_field_columns_to_encode, 'extras');
+                    }
+                }
+            }
+        }
+
+        // json_encode all fake_value columns in the database, so they can be properly stored and interpreted
+        if (count($fake_field_columns_to_encode)) {
+            foreach ($fake_field_columns_to_encode as $key => $value) {
+                $request[$value] = json_encode($request[$value]);
+            }
+        }
+
+        // if there are no fake fields defined, this will just return the original Request in full
+        // since no modifications or additions have been made to $request
+        return $request;
+    }
+
+
+    /**
+     * Returns an array of database columns names, that are used to store fake values.
+     * Returns ['extras'] if no columns have been found.
+     *
+     */
+    protected function getFakeColumnsAsArray() {
+
+        $this->prepareFields();
+
+        $fake_field_columns_to_encode = [];
+
+        foreach ($this->crud['fields'] as $k => $field) {
+            // if it's a fake field
+            if (isset($this->crud['fields'][$k]['fake']) && $this->crud['fields'][$k]['fake']==true) {
+                // add it to the request in its appropriate variable - the one defined, if defined
+                if (isset($this->crud['fields'][$k]['store_in'])) {
+                    if(!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)){
+                        array_push($fake_field_columns_to_encode, $this->crud['fields'][$k]['store_in']);
+                    }
+                }
+                else //otherwise in the one defined in the $crud variable
+                {
+                    if(!in_array('extras', $fake_field_columns_to_encode, true)){
+                        array_push($fake_field_columns_to_encode, 'extras');
+                    }
+                }
+            }
+        }
+
+        if (!count($fake_field_columns_to_encode)) {
+            return ['extras'];
+        }
+
+        return $fake_field_columns_to_encode;
+    }
+
+
+    // If it's not an array of array and it's a simple array, create a proper array of arrays for it
+    protected function prepareColumns()
+    {
+        // if the columns aren't set, we can't show this page
+        // TODO: instead of dying, show the columns defined as visible on the model
+        if (!isset($this->crud['columns']))
+        {
+            abort(500, "CRUD columns are not defined.");
+        }
+
+        // if the columns are defined as a string, transform it to a proper array
+        if (!is_array($this->crud['columns']))
+        {
+            $current_columns_array = explode(",", $this->crud['columns']);
+            $proper_columns_array = array();
+
+            foreach ($current_columns_array as $key => $col) {
+                $proper_columns_array[] = [
+                                'name' => $col,
+                                'label' => ucfirst($col) //TODO: also replace _ with space
+                            ];
+            }
+
+            $this->crud['columns'] = $proper_columns_array;
+        }
+    }
+
+    /**
+     * Prepare the fields to be shown, stored, updated or created.
+     *
+     * Makes sure $this->crud['fields'] is in the proper format (array of arrays);
+     * Makes sure $this->crud['fields'] also contains the id of the current item;
+     * Makes sure $this->crud['fields'] also contains the values for each field;
+     *
+     */
+    protected function prepareFields($entry = false)
+    {
+        // if the fields have been defined separately for create and update, use that
+        if (!isset($this->crud['fields']))
+        {
+            if (isset($this->crud['create_fields']))
+            {
+                $this->crud['fields'] = $this->crud['create_fields'];
+            }
+            elseif (isset($this->crud['update_fields']))
+            {
+                $this->crud['fields'] = $this->crud['update_fields'];
+            }
+        }
+
+        // PREREQUISITES CHECK:
+        // if the fields aren't set, trigger error
+        if (!isset($this->crud['fields']))
+        {
+            abort(500, "The CRUD fields are not defined.");
+        }
+
+        // if the fields are defined as a string, transform it to a proper array
+        if (!is_array($this->crud['fields']))
+        {
+            $current_fields_array = explode(",", $this->crud['fields']);
+            $proper_fields_array = array();
+
+            foreach ($current_fields_array as $key => $field) {
+                $proper_fields_array[] = [
+                                'name' => $field,
+                                'label' => ucfirst($field), // TODO: also replace _ with space
+                                'type' => 'text' // TODO: choose different types of fields depending on the MySQL column type
+                            ];
+            }
+
+            $this->crud['fields'] = $proper_fields_array;
+        }
+
+        // if no field type is defined, assume the "text" field type
+        foreach ($this->crud['fields'] as $k => $field) {
+                if (!isset($this->crud['fields'][$k]['type']))
+                    $this->crud['fields'][$k]['type'] = 'text';
+            }
+
+        // if an entry was passed, we're preparing for the update form, not create
+        if ($entry) {
+            // put the values in the same 'fields' variable
+            $fields = $this->crud['fields'];
+
+            foreach ($fields as $k => $field) {
+                // set the value
+                if (!isset($this->crud['fields'][$k]['value']))
+                {
+                    $this->crud['fields'][$k]['value'] = $entry->$field['name'];
+                }
+            }
+
+            // always have a hidden input for the entry id
+            $this->crud['fields'][] = array(
+                                                'name' => 'id',
+                                                'value' => $entry->id,
+                                                'type' => 'hidden'
+                                            );
+        }
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -128,7 +128,7 @@ 
 		// if it's a relationship with a pivot table, also sync that
 		$this->prepareFields();
 		foreach ($this->crud['fields'] as $k => $field) {
-			if (isset($field['pivot']) && $field['pivot']==true && \Request::has($field['name']))
+			if (isset($field['pivot']) && $field['pivot'] == true && \Request::has($field['name']))
 			{
 				$model::find($item->id)->$field['name']()->attach(\Request::input($field['name']));
 			}
@@ -205,7 +205,7 @@ 
 
 		// if it's a relationship with a pivot table, also sync that
 		foreach ($this->crud['fields'] as $k => $field) {
-			if (isset($field['pivot']) && $field['pivot']==true && \Request::has($field['name']))
+			if (isset($field['pivot']) && $field['pivot'] == true && \Request::has($field['name']))
 			{
 				$model::find(\Request::input('id'))->$field['name']()->sync(\Request::input($field['name']));
 			}
@@ -365,7 +365,7 @@ 
 			$this->data['languages'] = \Backpack\LangFileManager\app\Models\Language::all();
 			$this->data['languages_already_translated_in'] = $this->data['entry']->translationLanguages();
 			$this->data['languages_to_translate_in'] = $this->data['languages']->diff($this->data['languages_already_translated_in']);
-			$this->data['languages_to_translate_in'] = $this->data['languages_to_translate_in']->reject(function ($item) {
+			$this->data['languages_to_translate_in'] = $this->data['languages_to_translate_in']->reject(function($item) {
 			    return $item->abbr == \Lang::locale();
 			});
 		}
@@ -428,13 +428,13 @@ 
 		// go through each defined field
 		foreach ($this->crud['fields'] as $k => $field) {
 			// if it's a fake field
-			if (isset($this->crud['fields'][$k]['fake']) && $this->crud['fields'][$k]['fake']==true) {
+			if (isset($this->crud['fields'][$k]['fake']) && $this->crud['fields'][$k]['fake'] == true) {
 				// add it to the request in its appropriate variable - the one defined, if defined
 				if (isset($this->crud['fields'][$k]['store_in'])) {
 					$request[$this->crud['fields'][$k]['store_in']][$this->crud['fields'][$k]['name']] = $request[$this->crud['fields'][$k]['name']];
 
 					$remove_fake_field = array_pull($request, $this->crud['fields'][$k]['name']);
-					if(!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)){
+					if (!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)) {
 				        array_push($fake_field_columns_to_encode, $this->crud['fields'][$k]['store_in']);
 				    }
 				}
@@ -443,7 +443,7 @@ 
 					$request['extras'][$this->crud['fields'][$k]['name']] = $request[$this->crud['fields'][$k]['name']];
 
 					$remove_fake_field = array_pull($request, $this->crud['fields'][$k]['name']);
-					if(!in_array('extras', $fake_field_columns_to_encode, true)){
+					if (!in_array('extras', $fake_field_columns_to_encode, true)) {
 				        array_push($fake_field_columns_to_encode, 'extras');
 				    }
 				}
@@ -476,16 +476,16 @@ 
 
 		foreach ($this->crud['fields'] as $k => $field) {
 			// if it's a fake field
-			if (isset($this->crud['fields'][$k]['fake']) && $this->crud['fields'][$k]['fake']==true) {
+			if (isset($this->crud['fields'][$k]['fake']) && $this->crud['fields'][$k]['fake'] == true) {
 				// add it to the request in its appropriate variable - the one defined, if defined
 				if (isset($this->crud['fields'][$k]['store_in'])) {
-					if(!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)){
+					if (!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)) {
 				        array_push($fake_field_columns_to_encode, $this->crud['fields'][$k]['store_in']);
 				    }
 				}
 				else //otherwise in the one defined in the $crud variable
 				{
-					if(!in_array('extras', $fake_field_columns_to_encode, true)){
+					if (!in_array('extras', $fake_field_columns_to_encode, true)) {
 				        array_push($fake_field_columns_to_encode, 'extras');
 				    }
 				}

Braces +10 added lines, -16 removed lines

@@ -58,8 +58,7 @@ 
 		if (property_exists($model, 'translatable'))
 		{
 			$this->data['entries'] = $model::where('translation_lang', \Lang::locale())->get();
-		}
-		else
+		} else
 		{
 			$this->data['entries'] = $model::all();
 		}
@@ -286,8 +285,7 @@ 
 			$this->data['entries'] = $model::where('translation_lang', $lang)->get();
 			$this->data['languages'] = \Backpack\LangFileManager\app\Models\Language::all();
 			$this->data['active_language'] = $lang;
-		}
-		else
+		} else
 		{
 			$this->data['entries'] = $model::all();
 		}
@@ -330,8 +328,7 @@ 
 					$count++;
 				}
 			}
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -388,8 +385,7 @@ 
 		if ($existing_translation)
 		{
 			$new_entry = $existing_translation;
-		}
-		else
+		} else
 		{
 			// get the info for that entry
 			$new_entry_attributes = $this->data['entry']->getAttributes();
@@ -437,8 +433,7 @@ 
 					if(!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)){
 				        array_push($fake_field_columns_to_encode, $this->crud['fields'][$k]['store_in']);
 				    }
-				}
-				else //otherwise in the one defined in the $crud variable
+				} else //otherwise in the one defined in the $crud variable
 				{
 					$request['extras'][$this->crud['fields'][$k]['name']] = $request[$this->crud['fields'][$k]['name']];
 
@@ -482,8 +477,7 @@ 
 					if(!in_array($this->crud['fields'][$k]['store_in'], $fake_field_columns_to_encode, true)){
 				        array_push($fake_field_columns_to_encode, $this->crud['fields'][$k]['store_in']);
 				    }
-				}
-				else //otherwise in the one defined in the $crud variable
+				} else //otherwise in the one defined in the $crud variable
 				{
 					if(!in_array('extras', $fake_field_columns_to_encode, true)){
 				        array_push($fake_field_columns_to_encode, 'extras');
@@ -543,8 +537,7 @@ 
 			if (isset($this->crud['create_fields']))
 			{
 				$this->crud['fields'] = $this->crud['create_fields'];
-			}
-			elseif (isset($this->crud['update_fields']))
+			} elseif (isset($this->crud['update_fields']))
 			{
 				$this->crud['fields'] = $this->crud['update_fields'];
 			}
@@ -576,8 +569,9 @@ 
 
 		// if no field type is defined, assume the "text" field type
 		foreach ($this->crud['fields'] as $k => $field) {
-				if (!isset($this->crud['fields'][$k]['type']))
-					$this->crud['fields'][$k]['type'] = 'text';
+				if (!isset($this->crud['fields'][$k]['type'])) {
+									$this->crud['fields'][$k]['type'] = 'text';
+				}
 			}
 
 		// if an entry was passed, we're preparing for the update form, not create

src/CrudServiceProvider.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace Backpack\CRUD;
 
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Routing\Router;
 use Route;
 
 class CrudServiceProvider extends ServiceProvider

Spacing +4 added lines, -4 removed lines

@@ -32,11 +32,11 @@ 
 
         // PUBLISH FILES
         // publish lang files
-        $this->publishes([ __DIR__.'/resources/lang' => resource_path('lang/vendor/backpack'), ], 'lang');
+        $this->publishes([__DIR__.'/resources/lang' => resource_path('lang/vendor/backpack'), ], 'lang');
         // publish views
-        $this->publishes([ __DIR__.'/resources/views' => resource_path('views/vendor/backpack/crud'), ], 'views');
+        $this->publishes([__DIR__.'/resources/views' => resource_path('views/vendor/backpack/crud'), ], 'views');
         // publish public Backpack CRUD assets
-        $this->publishes([ __DIR__.'/public' => public_path('vendor/backpack'), ], 'public');
+        $this->publishes([__DIR__.'/public' => public_path('vendor/backpack'), ], 'public');
         // publish custom files for elFinder
         $this->publishes([
                             __DIR__.'/config/elfinder.php' => config_path('elfinder.php'),
@@ -73,7 +73,7 @@ 
 
     private function registerCRUD()
     {
-        $this->app->bind('CRUD',function($app){
+        $this->app->bind('CRUD', function($app) {
             return new CRUD($app);
         });
     }

src/CrudTrait.php

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
      * Return the entity with fake fields as attributes.
      *
      * @param  array  $columns - the database columns that contain the JSONs
-     * @return obj
+     * @return CrudTrait
      */
     public function withFakes($columns = [])
     {

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php namespace Backpack\CRUD;
 
-use Illuminate\Database\Eloquent\Model;
 use DB;
 use Lang;
 

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     |--------------------------------------------------------------------------
     */
 
-	public static function getPossibleEnumValues($field_name){
+    public static function getPossibleEnumValues($field_name){
         $instance = new static; // create an instance of the model to be able to get the table name
         $type = DB::select( DB::raw('SHOW COLUMNS FROM '.$instance->getTable().' WHERE Field = "'.$field_name.'"') )[0]->Type;
         preg_match('/^enum\((.*)\)$/', $type, $matches);

Spacing +7 added lines, -7 removed lines

@@ -12,14 +12,14 @@ 
     |--------------------------------------------------------------------------
     */
 
-	public static function getPossibleEnumValues($field_name){
+	public static function getPossibleEnumValues($field_name) {
         $instance = new static; // create an instance of the model to be able to get the table name
-        $type = DB::select( DB::raw('SHOW COLUMNS FROM '.$instance->getTable().' WHERE Field = "'.$field_name.'"') )[0]->Type;
+        $type = DB::select(DB::raw('SHOW COLUMNS FROM '.$instance->getTable().' WHERE Field = "'.$field_name.'"'))[0]->Type;
         preg_match('/^enum\((.*)\)$/', $type, $matches);
         $enum = array();
         $exploded = explode(',', $matches[1]);
-        foreach($exploded as $value){
-            $v = trim( $value, "'" );
+        foreach ($exploded as $value) {
+            $v = trim($value, "'");
             $enum[] = $v;
         }
         return $enum;
@@ -27,9 +27,9 @@ 
 
     public static function isColumnNullable($column_name) {
         $instance = new static; // create an instance of the model to be able to get the table name
-        $answer = DB::select( DB::raw("SELECT IS_NULLABLE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$instance->getTable()."' AND COLUMN_NAME='".$column_name."' AND table_schema='".env('DB_DATABASE')."'") )[0];
+        $answer = DB::select(DB::raw("SELECT IS_NULLABLE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$instance->getTable()."' AND COLUMN_NAME='".$column_name."' AND table_schema='".env('DB_DATABASE')."'"))[0];
 
-        return ($answer->IS_NULLABLE == 'YES'?true:false);
+        return ($answer->IS_NULLABLE == 'YES' ? true : false);
     }
 
 
@@ -129,7 +129,7 @@ 
 
     public function translation($translation_lang = false)
     {
-        if ($translation_lang==false) {
+        if ($translation_lang == false) {
             $translation_lang = Lang::locale();
         }
 

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
         if (!count($columns)) {
             if (property_exists($model, 'fakeColumns')) {
                 $columns = $this->fakeColumns;
-            }
-            else
+            } else
             {
                 $columns = ['extras'];
             }

src/app/Http/Requests/CrudRequest.php

Indentation +22 added lines, -22 removed lines

@@ -4,30 +4,30 @@
 
 class CrudRequest extends FormRequest {
 
-	/**
-	 * Determine if the user is authorized to make this request.
-	 *
-	 * @return bool
-	 */
-	public function authorize()
-	{
-		// only allow creates if the user is logged in
-		return \Auth::check();
-	}
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        // only allow creates if the user is logged in
+        return \Auth::check();
+    }
 
-	/**
-	 * Get the validation rules that apply to the request.
-	 *
-	 * @return array
-	 */
-	public function rules()
-	{
-		return [
-			// 'name' => 'required|min:3|max:255'
-		];
-	}
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            // 'name' => 'required|min:3|max:255'
+        ];
+    }
 
-	// OPTIONAL OVERRIDE
+    // OPTIONAL OVERRIDE
     // public function forbiddenResponse()
     // {
         // Optionally, send a custom response on authorize failure

src/resources/views-elfinder/elfinder.blade.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
     <!-- elFinder JS (REQUIRED) -->
     <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script>
 
-    <?php if($locale){ ?>
+    <?php if ($locale) { ?>
     <!-- elFinder translation (OPTIONAL) -->
     <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
     <?php } ?>
@@ -26,7 +26,7 @@ 
         $().ready(function() {
             $('#elfinder').elfinder({
                 // set your elFinder options here
-                <?php if($locale){ ?>
+                <?php if ($locale) { ?>
                     lang: '<?= $locale ?>', // locale
                 <?php } ?>
                 customData: {

src/resources/views-elfinder/ckeditor4.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     <!-- elFinder JS (REQUIRED) -->
     <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script>
 
-    <?php if($locale){ ?>
+    <?php if ($locale) { ?>
         <!-- elFinder translation (OPTIONAL) -->
         <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
     <?php } ?>
@@ -37,7 +37,7 @@ 
 
             var elf = $('#elfinder').elfinder({
                 // set your elFinder options here
-                <?php if($locale){ ?>
+                <?php if ($locale) { ?>
                     lang: '<?= $locale ?>', // locale
                 <?php } ?>
                 customData: {

src/resources/views-elfinder/tinymce.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     <!-- TinyMCE Popup class (REQUIRED) -->
     <script type="text/javascript" src="<?= asset($dir.'/js/tiny_mce_popup.js') ?>"></script>
 
-    <?php if($locale){ ?>
+    <?php if ($locale) { ?>
         <!-- elFinder translation (OPTIONAL) -->
         <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
     <?php } ?>
@@ -60,7 +60,7 @@ 
         $().ready(function() {
             var elf = $('#elfinder').elfinder({
                 // set your elFinder options here
-                <?php if($locale){ ?>
+                <?php if ($locale) { ?>
                     lang: '<?= $locale ?>', // locale
                 <?php } ?>
                 customData: {

src/resources/views-elfinder/filepicker.php

Spacing +5 added lines, -5 removed lines

@@ -10,28 +10,28 @@
     <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
 
     <!-- elFinder CSS (REQUIRED) -->
-    <link rel="stylesheet" type="text/css" href="<?= asset($dir . '/css/elfinder.min.css') ?>">
+    <link rel="stylesheet" type="text/css" href="<?= asset($dir.'/css/elfinder.min.css') ?>">
     <!-- <link rel="stylesheet" type="text/css" href="<?= asset($dir.'/css/theme.css') ?>"> -->
     <link rel="stylesheet" type="text/css" href="<?= asset('vendor/backpack/elfinder/elfinder.backpack.theme.css') ?>">
 
     <!-- elFinder JS (REQUIRED) -->
-    <script src="<?= asset($dir . '/js/elfinder.min.js') ?>"></script>
+    <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script>
 
     <?php if ($locale) { ?>
         <!-- elFinder translation (OPTIONAL) -->
-        <script src="<?= asset($dir . "/js/i18n/elfinder.$locale.js") ?>"></script>
+        <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
     <?php } ?>
     <!-- Include jQuery, jQuery UI, elFinder (REQUIRED) -->
 
     <?php
-    $mimeTypes = implode(',',array_map(function($t){return "'".$t."'";}, explode(',',$type)));
+    $mimeTypes = implode(',', array_map(function($t) {return "'".$t."'"; }, explode(',', $type)));
     ?>
 
     <script type="text/javascript">
         $().ready(function () {
             var elf = $('#elfinder').elfinder({
                 // set your elFinder options here
-                <?php if($locale){ ?>
+                <?php if ($locale) { ?>
                     lang: '<?= $locale ?>', // locale
                 <?php } ?>
                 customData: {

src/resources/views-elfinder/tinymce4.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     <!-- elFinder JS (REQUIRED) -->
     <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script>
 
-    <?php if($locale){ ?>
+    <?php if ($locale) { ?>
         <!-- elFinder translation (OPTIONAL) -->
         <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script>
     <?php } ?>
@@ -40,7 +40,7 @@ 
         $().ready(function() {
             var elf = $('#elfinder').elfinder({
                 // set your elFinder options here
-                <?php if($locale){ ?>
+                <?php if ($locale) { ?>
                     lang: '<?= $locale ?>', // locale
                 <?php } ?>
                 customData: {