crocodic-studio / crudbooster

src/controllers/traits/Query.php

Spacing +28 added lines, -28 removed lines

@@ -25,13 +25,13 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
-        if($softDelete === true && SchemaHelper::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && SchemaHelper::hasColumn($this->data['table'], 'deleted_at')) {
             $query->whereNull($this->data['table'].'.deleted_at');
         }
 
-        if(isset($joins)) {
-            foreach($joins as $join)
+        if (isset($joins)) {
+            foreach ($joins as $join)
             {
                 $query->join($join['target_table'],
                     $join['target_table_primary'],
@@ -41,14 +41,14 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if($column->getType() != "custom") {
-                if(strpos($column->getField(),".") === false) {
-                    if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
+            if ($column->getType() != "custom") {
+                if (strpos($column->getField(), ".") === false) {
+                    if (SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else {
                     $query->addSelect($column->getField());
                 }
             }
@@ -57,27 +57,27 @@ 
             $query = getTypeHook($column->getType())->query($query, $column);
 
             // Filter Query From Type
-            $filterValue = request("filter_".slug($column->getFilterColumn(),"_"));
-            if(is_array($filterValue) || sanitizeXSS($filterValue)) {
+            $filterValue = request("filter_".slug($column->getFilterColumn(), "_"));
+            if (is_array($filterValue) || sanitizeXSS($filterValue)) {
                 $query = getTypeHook($column->getType())->filterQuery($query, $column, $filterValue);
             }
         }
 
-        if(request()->has('q'))
+        if (request()->has('q'))
         {
             $keyword = sanitizeXSS(request("q"));
-            if(isset($this->data['hook_search_query'])) {
+            if (isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query);
-            }else{
-                $query->where(function ($where) use ($columns, $keyword) {
+            } else {
+                $query->where(function($where) use ($columns, $keyword) {
                     /**
                      * @var $where Builder
                      */
-                    foreach($columns as $column)
+                    foreach ($columns as $column)
                     {
-                        if(strpos($column->getField(),".") === false) {
+                        if (strpos($column->getField(), ".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else {
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.$keyword.'%');
@@ -90,36 +90,36 @@ 
         /*
          * This script to hanlde the callback inputed on this query method
          */
-        if(isset($callback) && is_callable($callback)) {
+        if (isset($callback) && is_callable($callback)) {
             $query = call_user_func($callback, $query);
         }
 
-        if(isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
+        if (isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
             $query = call_user_func($this->data['hook_index_query'], $query);
         }
 
 
-        if(request()->has(['order_by','order_sort']))
+        if (request()->has(['order_by', 'order_sort']))
         {
-            $sort = (request("order_sort")=="asc")?"asc":"desc";
+            $sort = (request("order_sort") == "asc") ? "asc" : "desc";
             /*
              * Check if order by contain "." it means {table}.{column} we have to parsing that
              */
-            if(strpos(request("order_by"), ".")!==false) {
-                $orderByTable = explode(".",request("order_by"))[0];
-                $orderByColumn = explode(".",request("order_by"))[1];
-                if(SchemaHelper::hasColumn($orderByTable, $orderByColumn)) {
+            if (strpos(request("order_by"), ".") !== false) {
+                $orderByTable = explode(".", request("order_by"))[0];
+                $orderByColumn = explode(".", request("order_by"))[1];
+                if (SchemaHelper::hasColumn($orderByTable, $orderByColumn)) {
                     $query->orderBy($orderByTable.".".$orderByColumn, $sort);
                 }
             } else {
                 /*
                  * Check if order_by column in registered columns
                  */
-                if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) {
+                if (in_array(request('order_by'), columnSingleton()->getColumnNameOnly())) {
                     $query->orderBy(request('order_by'), request('order_sort'));
                 }
             }
-        }else{
+        } else {
             /*
              * For default, query will be order by primary key as descending
              */

src/controllers/scaffolding/traits/DefaultOption.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $data = ColumnSingleton()->getColumn($this->index);
         $data->setFilterable($boolean);
         $data->setFilterHelp($help_info);
-        $data->setFilterPlaceholder($placeholder?:"Filter by ".$data->getLabel());
+        $data->setFilterPlaceholder($placeholder ?: "Filter by ".$data->getLabel());
         // Save back
         columnSingleton()->setColumn($this->index, $data);
 

src/controllers/scaffolding/traits/ColumnsRegister.php

Spacing +37 added lines, -37 removed lines

@@ -65,8 +65,8 @@ 
         $data = new TextModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("text");
@@ -83,8 +83,8 @@ 
         $data = new CheckboxModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("checkbox");
@@ -101,8 +101,8 @@ 
         $data = new PasswordModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("password");
@@ -121,8 +121,8 @@ 
         $data = new ImageModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("image");
@@ -139,8 +139,8 @@ 
         $data = new TextAreaModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("text_area");
@@ -165,7 +165,7 @@ 
      */
     public function addSelectTable($label, $name = null, $selectConfig)
     {
-        if(isset($selectConfig['table']) &&
+        if (isset($selectConfig['table']) &&
             isset($selectConfig['value_option']) &&
             isset($selectConfig['display_option'])) {
             $this->index++;
@@ -173,7 +173,7 @@ 
             $data = new SelectTableModel();
             $data = $this->setDefaultModelValue($data);
             $data->setLabel($label);
-            $data->setName($this->name($label,$name));
+            $data->setName($this->name($label, $name));
             $data->setField($this->name($label, $name));
             $data->setType("select_table");
             $data->setOrderByColumn($selectConfig['table'].".".$selectConfig["display_option"]);
@@ -181,7 +181,7 @@ 
             columnSingleton()->setColumn($this->index, $data);
 
             $selectTable = new SelectTable($this->index);
-            $selectTable->optionsFromTable($selectConfig['table'],$selectConfig['value_option'],$selectConfig['display_option'],@$selectConfig['sql_condition']);
+            $selectTable->optionsFromTable($selectConfig['table'], $selectConfig['value_option'], $selectConfig['display_option'], @$selectConfig['sql_condition']);
 
             return $selectTable;
         } else {
@@ -196,7 +196,7 @@ 
         $data = new SelectOptionModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
+        $data->setName($this->name($label, $name));
         $data->setField($this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
@@ -206,7 +206,7 @@ 
 
         $selectOption = new SelectOption($this->index);
 
-        if($options) {
+        if ($options) {
             $selectOption->options($options);
         }
 
@@ -221,8 +221,8 @@ 
         $data = new CustomModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("custom");
@@ -239,8 +239,8 @@ 
         $data = new DateModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("date");
@@ -257,8 +257,8 @@ 
         $data = new TimeModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("time");
@@ -275,8 +275,8 @@ 
         $data = new DatetimeModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("datetime");
@@ -293,8 +293,8 @@ 
         $data = new EmailModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("email");
@@ -311,8 +311,8 @@ 
         $data = new FileModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("file");
@@ -330,8 +330,8 @@ 
         $data = new HiddenModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("hidden");
@@ -348,8 +348,8 @@ 
         $data = new NumberModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("number");
@@ -366,8 +366,8 @@ 
         $data = new MoneyModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("money");
@@ -384,8 +384,8 @@ 
         $data = new RadioModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("radio");
@@ -402,8 +402,8 @@ 
         $data = new WysiwygModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("wysiwyg");

src/controllers/scaffolding/singletons/ColumnSingleton.php

Spacing +24 added lines, -24 removed lines

@@ -42,17 +42,17 @@ 
     public function valueAssignment($data_row = null) {
         foreach ($this->getColumns() as $index=>$column) {
 
-            if (! $column->getName()) {
+            if (!$column->getName()) {
                 continue;
             }
 
             /** @var ColumnModel $column */
-            if($data_row) {
-                $value = (isset($data_row->{$column->getField()}))?$data_row->{ $column->getField() }:null;
-            }else{
+            if ($data_row) {
+                $value = (isset($data_row->{$column->getField()})) ? $data_row->{ $column->getField() }:null;
+            } else {
                 $value = request($column->getName());
 
-                if(!$value && $column->getDefaultValue()) {
+                if (!$value && $column->getDefaultValue()) {
                     $value = $column->getDefaultValue();
                 }
 
@@ -68,9 +68,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowIndex()) {
+            if ($item->getShowIndex()) {
                 $newData[] = $item;
             }
         }
@@ -81,9 +81,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowAdd() || $item->getShowEdit()) {
+            if ($item->getShowAdd() || $item->getShowEdit()) {
                 $newData[] = $item;
             }
         }
@@ -94,9 +94,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowEdit()) {
+            if ($item->getShowEdit()) {
                 $newData[] = $item;
             }
         }
@@ -107,9 +107,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowAdd()) {
+            if ($item->getShowAdd()) {
                 $newData[] = $item;
             }
         }
@@ -120,9 +120,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getFilterable()) {
+            if ($item->getFilterable()) {
                 $newData[] = $item;
             }
         }
@@ -133,9 +133,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowDetail()) {
+            if ($item->getShowDetail()) {
                 $newData[] = $item;
             }
         }
@@ -145,14 +145,14 @@ 
     public function getAssignmentData()
     {
         $data = [];
-        foreach($this->columns as $column) {
+        foreach ($this->columns as $column) {
             /** @var ColumnModel $column */
 
-            if(is_array($column->getValue())) {
-                foreach($column->getValue() as $key=>$val) {
+            if (is_array($column->getValue())) {
+                foreach ($column->getValue() as $key=>$val) {
                     $data[$key] = $val;
                 }
-            }else{
+            } else {
                 $data[$column->getField()] = $column->getValue();
             }
         }
@@ -162,10 +162,10 @@ 
     public function removeColumn($label_or_name)
     {
         $data = $this->getColumns();
-        foreach($data as $i=>$d)
+        foreach ($data as $i=>$d)
         {
             /** @var ColumnModel $d */
-            if($d->getLabel() == $label_or_name || $d->getName() == $label_or_name) {
+            if ($d->getLabel() == $label_or_name || $d->getName() == $label_or_name) {
                 unset($data[$i]);
             }
         }
@@ -175,7 +175,7 @@ 
     public function getColumnNameOnly()
     {
         $result = [];
-        foreach($this->columns as $column) {
+        foreach ($this->columns as $column) {
             /** @var ColumnModel $column */
             $result[] = $column->getName();
         }

src/views/dev_layouts/modules/modules/add.blade.php

Spacing +16 added lines, -16 removed lines

@@ -223,7 +223,7 @@ 
                                             <select v-model="item.column_type" @change="changeTypeColumn($event, idx)" class="column_type form-control">
                                                 @foreach($types as $type)
                                                     @if($type != "." && $type != ".." && is_dir($dirPath.'/'.$type))
-                                                        <?php $filterable = (file_exists($dirPath."/filter.blade.php"))?1:0; ?>
+                                                        <?php $filterable = (file_exists($dirPath."/filter.blade.php")) ? 1 : 0; ?>
                                                         <option data-filterable="{{ $filterable }}" value="{{ $type }}">{{ $type }}</option>
                                                     @endif
                                                 @endforeach
@@ -797,21 +797,21 @@ 
                     <?php
                     $font = new \crocodicstudio\crudbooster\helpers\FontAwesome();
                     $fontData = [
-                        ["data"=>$font->text(),"label"=>"Text"],
-                        ["data"=>$font->web(),"label"=>"Web"],
-                        ["data"=>$font->video(),"label"=>"Video"],
-                        ["data"=>$font->transportation(),"label"=>"Transportation"],
-                        ["data"=>$font->payment(),"label"=>"Payment"],
-                        ["data"=>$font->medical(),"label"=>"Medical"],
-                        ["data"=>$font->hand(),"label"=>"Hand"],
-                        ["data"=>$font->fileType(),"label"=>"File Type"],
-                        ["data"=>$font->directional(),"label"=>"Directional"],
-                        ["data"=>$font->currency(),"label"=>"Currency"],
-                        ["data"=>$font->chart(),"label"=>"Chart"],
-                        ["data"=>$font->brands(),"label"=>"Brand"],
-                        ["data"=>$font->gender(),"label"=>"Gender"],
-                        ["data"=>$font->form(),"label"=>"Form"],
-                        ["data"=>$font->spinner(),"label"=>"Spinner"]
+                        ["data"=>$font->text(), "label"=>"Text"],
+                        ["data"=>$font->web(), "label"=>"Web"],
+                        ["data"=>$font->video(), "label"=>"Video"],
+                        ["data"=>$font->transportation(), "label"=>"Transportation"],
+                        ["data"=>$font->payment(), "label"=>"Payment"],
+                        ["data"=>$font->medical(), "label"=>"Medical"],
+                        ["data"=>$font->hand(), "label"=>"Hand"],
+                        ["data"=>$font->fileType(), "label"=>"File Type"],
+                        ["data"=>$font->directional(), "label"=>"Directional"],
+                        ["data"=>$font->currency(), "label"=>"Currency"],
+                        ["data"=>$font->chart(), "label"=>"Chart"],
+                        ["data"=>$font->brands(), "label"=>"Brand"],
+                        ["data"=>$font->gender(), "label"=>"Gender"],
+                        ["data"=>$font->form(), "label"=>"Form"],
+                        ["data"=>$font->spinner(), "label"=>"Spinner"]
                     ];
                     ?>
                     @foreach($fontData as $f)

src/types/text/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function indexRender($row, $column)
     {
         $value = trim(strip_tags($row->{ $column->getField() }));
-        if($column->getLimit()) {
+        if ($column->getLimit()) {
             $value = Str::limit($value, $column->getLimit());
         }
         return $value;
@@ -31,7 +31,7 @@ 
 
     public function filterQuery($query, $column, $value)
     {
-        $query->where($column->getFilterColumn(),"like","%".$value."%");
+        $query->where($column->getFilterColumn(), "like", "%".$value."%");
         return $query;
     }
 

src/types/select_table/filter.blade.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
     /** @var \crocodicstudio\crudbooster\types\text\TextModel $column */
-    $filterName = "filter_".slug($column->getFilterColumn(),"_");
+    $filterName = "filter_".slug($column->getFilterColumn(), "_");
     $filterValue = sanitizeXSS(request($filterName));
 ?>
 <select name="filter_{{ slug($column->getFilterColumn(),"_") }}" style="width: 100%" id="filter_{{ $column->getName()  }}" class="form-control select2">

src/helpers/ModuleGenerator.php

Spacing +40 added lines, -40 removed lines

@@ -37,15 +37,15 @@ 
     }
 
     public function make() {
-        $name = trim(($this->name)?:ucwords(str_replace("_"," ",$this->table)));
+        $name = trim(($this->name) ?: ucwords(str_replace("_", " ", $this->table)));
 
         $template = file_get_contents(__DIR__."/../templates/FooBarController.stub");
 
         //Replace table
-        $template = str_replace("{table}",'"'.$this->table.'"', $template);
+        $template = str_replace("{table}", '"'.$this->table.'"', $template);
 
         //Replace permalink
-        $permalink = strtolower(Str::slug($name,"_"));
+        $permalink = strtolower(Str::slug($name, "_"));
         $template = str_replace("{permalink}", '"'.$permalink.'"', $template);
 
         //Replace Page title
@@ -53,20 +53,20 @@ 
 
         //Replace scaffolding
         $scaffold = "";
-        foreach($this->columns as $field) {
+        foreach ($this->columns as $field) {
             $label = $field['column_label'];
             $column = $field['column_field'];
-            $help = isset($field['column_help'])?"->help(\"".$field['column_help']."\")":"";
-            $required = ($field['column_mandatory']=="on")?"":"->required(false)";
-            $indexShow = ($field['column_browse']=="on")?"":"->showIndex(false)";
-            $detailShow = ($field['column_detail']=="on")?"":"->showDetail(false)";
-            $editShow = ($field['column_edit']=="on")?"":"->showEdit(false)";
-            $addShow = ($field['column_add']=="on")?"":"->showAdd(false)";
+            $help = isset($field['column_help']) ? "->help(\"".$field['column_help']."\")" : "";
+            $required = ($field['column_mandatory'] == "on") ? "" : "->required(false)";
+            $indexShow = ($field['column_browse'] == "on") ? "" : "->showIndex(false)";
+            $detailShow = ($field['column_detail'] == "on") ? "" : "->showDetail(false)";
+            $editShow = ($field['column_edit'] == "on") ? "" : "->showEdit(false)";
+            $addShow = ($field['column_add'] == "on") ? "" : "->showAdd(false)";
             $optionTable = $field['column_option_table'];
             $optionValue = $field['column_option_value'];
             $optionDisplay = $field['column_option_display'];
             $optionSqlCondition = $field['column_option_sql_condition'];
-            $optionSqlCondition = str_replace('"',"'", $optionSqlCondition);
+            $optionSqlCondition = str_replace('"', "'", $optionSqlCondition);
             $sqlRawQuery = $field['column_sql_query'];
             $options = $field['column_options'];
             $imageResizeWidth = $field['column_image_width'];
@@ -80,49 +80,49 @@ 
             $moneyPrecision = $field['column_money_precision'];
             $moneyThousandSeparator = $field['column_money_thousand_separator'];
             $moneyDecimalSeparator = $field['column_money_decimal_separator'];
-            $filterable = ($field['column_filterable']=="on")?"->filterable(true)":"";
-            $foreign_key = (isset($field['column_foreign']))?"->foreignKey('".$field['column_foreign']."')":"";
+            $filterable = ($field['column_filterable'] == "on") ? "->filterable(true)" : "";
+            $foreign_key = (isset($field['column_foreign'])) ? "->foreignKey('".$field['column_foreign']."')" : "";
 
             // Additional Attributes
-            $additional = $required . $indexShow . $detailShow . $addShow . $editShow . $help . $filterable . $foreign_key ;
+            $additional = $required.$indexShow.$detailShow.$addShow.$editShow.$help.$filterable.$foreign_key;
 
             // Additional money
-            $additional .= ($moneyPrefix && $field['column_type']=='money')?"->prefix('".$moneyPrefix."')":"";
-            $additional .= ($moneyPrecision && $field['column_type']=='money')?"->precision('".$moneyPrecision."')":"";
-            $additional .= ($moneyThousandSeparator && $field['column_type']=='money')?"->thousandSeparator('".$moneyThousandSeparator."')":"";
-            $additional .= ($moneyDecimalSeparator && $field['column_type']=='money')?"->decimalSeparator('".$moneyDecimalSeparator."')":"";
+            $additional .= ($moneyPrefix && $field['column_type'] == 'money') ? "->prefix('".$moneyPrefix."')" : "";
+            $additional .= ($moneyPrecision && $field['column_type'] == 'money') ? "->precision('".$moneyPrecision."')" : "";
+            $additional .= ($moneyThousandSeparator && $field['column_type'] == 'money') ? "->thousandSeparator('".$moneyThousandSeparator."')" : "";
+            $additional .= ($moneyDecimalSeparator && $field['column_type'] == 'money') ? "->decimalSeparator('".$moneyDecimalSeparator."')" : "";
 
             // Additional for image & file type
-            $additional .= ($fileEncrypt && in_array($field['column_type'],['file','image']))?"->encrypt(true)":"";
-            $additional .= ($imageResizeWidth && in_array($field['column_type'],['file','image']))?"->resize(".$imageResizeWidth.",".$imageResizeHeight.")":"";
+            $additional .= ($fileEncrypt && in_array($field['column_type'], ['file', 'image'])) ? "->encrypt(true)" : "";
+            $additional .= ($imageResizeWidth && in_array($field['column_type'], ['file', 'image'])) ? "->resize(".$imageResizeWidth.",".$imageResizeHeight.")" : "";
 
             // Additional for date & datetime
-            $additional .= ($dateFormat && in_array($field['column_type'],['date','datetime']))?"->format('".$dateFormat."')":"";
+            $additional .= ($dateFormat && in_array($field['column_type'], ['date', 'datetime'])) ? "->format('".$dateFormat."')" : "";
 
             // Additional for text
-            $additional .= ($textDisplayLimit!="" && in_array($field['column_type'],['text','text_area','wysiwyg']))?"->strLimit(".$textDisplayLimit.")":"";
-            $additional .= ($maxCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->maxLength(".$maxCharacter.")":"";
-            $additional .= ($minCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->minLength(".$minCharacter.")":"";
+            $additional .= ($textDisplayLimit != "" && in_array($field['column_type'], ['text', 'text_area', 'wysiwyg'])) ? "->strLimit(".$textDisplayLimit.")" : "";
+            $additional .= ($maxCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->maxLength(".$maxCharacter.")" : "";
+            $additional .= ($minCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->minLength(".$minCharacter.")" : "";
 
             $methodName = Str::studly($field['column_type']);
-            if($label && $column) {
-                if(in_array($field['column_type'],['radio','select_option','checkbox'])) {
-                    if($options) {
+            if ($label && $column) {
+                if (in_array($field['column_type'], ['radio', 'select_option', 'checkbox'])) {
+                    if ($options) {
                         $optResult = [];
-                        foreach($options as $opt) {
+                        foreach ($options as $opt) {
                             $optResult[$opt['key']] = $opt['label'];
                         }
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $additional . ';' . "\n\t\t";
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")->options('.min_var_export($optResult).')'.$additional.';'."\n\t\t";
                     }
-                }elseif (in_array($field['column_type'],['radio_table','select_table'])) {
+                }elseif (in_array($field['column_type'], ['radio_table', 'select_table'])) {
                     if ($optionTable && $optionValue && $optionDisplay) {
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $additional . ';' . "\n\t\t";
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'",["table"=>"'.$optionTable.'","value_option"=>"'.$optionValue.'","display_option"=>"'.$optionDisplay.'","sql_condition"=>"'.$optionSqlCondition.'"])'.$additional.';'."\n\t\t";
                     }
                 }elseif ($field['column_type'] == "select_query") {
-                    if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) {
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $additional . ';' . "\n\t\t";
+                    if ($sqlRawQuery && Str::contains($sqlRawQuery, ["as `key`", "as `label`"])) {
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'","'.$sqlRawQuery.'")'.$additional.';'."\n\t\t";
                     }
-                }else{
+                } else {
                     $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$additional.';'."\n\t\t";
                 }
             }
@@ -145,10 +145,10 @@ 
         $module['controller'] = $filename;
         $module['last_column_build'] = json_encode($this->columns);
 
-        if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) {
-            DB::table("cb_modules")->where("id",$moduleData->id)->update($module);
+        if ($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name", $this->table)->first()) {
+            DB::table("cb_modules")->where("id", $moduleData->id)->update($module);
             $id_modules = $moduleData->id;
-        }else{
+        } else {
             $id_modules = DB::table('cb_modules')->insertGetId($module);
         }
 
@@ -157,9 +157,9 @@ 
         $menu['name'] = $module['name'];
         $menu['type'] = 'module';
         $menu['cb_modules_id'] = $id_modules;
-        if(isset($moduleData)) {
-            DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu);
-        }else{
+        if (isset($moduleData)) {
+            DB::table("cb_menus")->where("cb_modules_id", $moduleData->id)->update($menu);
+        } else {
             DB::table('cb_menus')->insertGetId($menu);
         }
 

src/views/dev_layouts/modules/appearance/index.blade.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                                 <label>Dashboard Controller</label>
                                 <select name="dashboard_controller" class="form-control">
                                     <option value="">** Default CB</option>
-                                    <?php $controllers = glob(app_path("Http/Controllers/*Controller.php"));?>
+                                    <?php $controllers = glob(app_path("Http/Controllers/*Controller.php")); ?>
                                     @foreach($controllers as $controller)
                                         @if(basename($controller) != "Controller.php")
                                         <option {{ getSetting("dashboard_controller")==rtrim(basename($controller),".php")?"selected":"" }} value="{{ rtrim(basename($controller),".php") }}">{{ rtrim(basename($controller),".php") }}</option>