crocodic-studio / crudbooster

src/types/select/component.blade.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
         <option value="">** Select a {{ $column->getLabel() }}</option>
         @if(!$column->getForeignKey())
             <?php
-                $columnValue = old($column->getName())?:($column->getDefaultValue())?:$column->getValue();
+                $columnValue = old($column->getName()) ?: ($column->getDefaultValue()) ?: $column->getValue();
             ?>
             @foreach($column->getOptions() as $key=>$value)
                 <option {{ $columnValue==$key?'selected':'' }} value="{{ $key }}">{{ $value }}</option>

src/controllers/scaffolding/traits/ColumnsRegister.php

Spacing +32 added lines, -32 removed lines

@@ -55,8 +55,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->setType("text");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -71,8 +71,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->setType("checkbox");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -87,8 +87,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->setType("password");
         $data->setShowDetail(false);
         $data->setShowIndex(false);
@@ -105,8 +105,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->setType("image");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -121,8 +121,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->setType("text_area");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -137,8 +137,8 @@ 
         $data = new SelectModel();
         $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->setType("select");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -154,8 +154,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->setType("custom");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -170,8 +170,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->setType("date");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -186,8 +186,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->setType("datetime");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -202,8 +202,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->setType("email");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -218,8 +218,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->setType("file");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -235,8 +235,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->setType("hidden");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -251,8 +251,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->setType("number");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -267,8 +267,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->setType("money");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -283,8 +283,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->setType("radio");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -299,8 +299,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->setType("wysiwyg");
 
         columnSingleton()->setColumn($this->index, $data);

src/types/money/Hook.php

Spacing +4 added lines, -4 removed lines

@@ -21,16 +21,16 @@
      */
     public function assignment($value, $column)
     {
-        $value = str_replace($column->getThousands()?:",","", $value);
-        $value = str_replace($column->getDecimal()?:".",".",$value);
+        $value = str_replace($column->getThousands() ?: ",", "", $value);
+        $value = str_replace($column->getDecimal() ?: ".", ".", $value);
         return $value;
     }
 
     public function indexRender($row, $column)
     {
         $value = $row->{$column->getField()};
-        $prefix = ($column->getPrefix())?:"";
-        return $prefix.number_format($value, $column->getPrecision()?:0, $column->getDecimal()?:".", $column->getThousands()?:",");
+        $prefix = ($column->getPrefix()) ?: "";
+        return $prefix.number_format($value, $column->getPrecision() ?: 0, $column->getDecimal() ?: ".", $column->getThousands() ?: ",");
     }
 
     public function detailRender($row, $column)

src/controllers/scaffolding/singletons/ColumnSingleton.php

Spacing +22 added lines, -22 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->getShowDetail()) {
+            if ($item->getShowDetail()) {
                 $newData[] = $item;
             }
         }
@@ -132,14 +132,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();
             }
         }
@@ -149,10 +149,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]);
             }
         }
@@ -162,7 +162,7 @@ 
     public function getColumnNameOnly()
     {
         $result = [];
-        foreach($this->columns as $column) {
+        foreach ($this->columns as $column) {
             /** @var ColumnModel $column */
             $result[] = $column->getName();
         }

src/controllers/scaffolding/traits/ColumnsBasic.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 
     private function name($label, $name = null)
     {
-        return (!$name)?strtolower(slug($label,"_")):$name;
+        return (!$name) ?strtolower(slug($label, "_")) : $name;
     }
 
     /**
@@ -39,8 +39,8 @@ 
         $model->setShowAdd(true);
         $model->setShowEdit(true);
         $model->setShowDetail(true);
-        $model->setIndexDisplayTransform(function ($value, $row) { return $value; });
-        $model->setDetailDisplayTransform(function ($value, $row) { return $value; });
+        $model->setIndexDisplayTransform(function($value, $row) { return $value; });
+        $model->setDetailDisplayTransform(function($value, $row) { return $value; });
         return $model;
     }
 

src/types/TypesHook.php

Spacing +2 added lines, -2 removed lines

@@ -26,12 +26,12 @@
 
     public function indexRender($row, $column)
     {
-        return (isset($row->{$column->getField()}))?$row->{ $column->getField() }:null;
+        return (isset($row->{$column->getField()})) ? $row->{ $column->getField() }:null;
     }
 
     public function detailRender($row, $column)
     {
-        return (isset($row->{$column->getField()}))?$row->{ $column->getField() }:null;
+        return (isset($row->{$column->getField()})) ? $row->{ $column->getField() }:null;
     }
 
     /**

src/types/select/Select.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) {
         $data = DB::table($table);
-        if($SQLCondition && is_callable($SQLCondition)) {
+        if ($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
         }elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
@@ -49,11 +49,11 @@ 
         $data = $data->get();
         $options = [];
         foreach ($data as $d) {
-            $options[ $d->$key_field ] = $d->$display_field;
+            $options[$d->$key_field] = $d->$display_field;
         }
         $data = columnSingleton()->getColumn($this->index);
         /** @var $data SelectModel */
-        $data->setOptionsFromTable(["table"=>$table,"key_field"=>$key_field,"display_field"=>$display_field,"sql_condition"=>$SQLCondition]);
+        $data->setOptionsFromTable(["table"=>$table, "key_field"=>$key_field, "display_field"=>$display_field, "sql_condition"=>$SQLCondition]);
         columnSingleton()->setColumn($this->index, $data);
 
         $this->options($options);
@@ -69,10 +69,10 @@ 
         columnSingleton()->setColumn($this->index, $data);
 
         $result = call_user_func($query);
-        if($result) {
+        if ($result) {
             $options = [];
-            foreach($result as $r) {
-                $options[ $r->key ] = $r->label;
+            foreach ($result as $r) {
+                $options[$r->key] = $r->label;
             }
             $this->options($options);
         }

src/types/image/ImageController.php

Spacing +5 added lines, -5 removed lines

@@ -14,21 +14,21 @@
 {
     public function postUploadImage()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if (auth()->guest()) return redirect(cb()->getLoginUrl());
 
         $file = null;
         try {
 
             cb()->validation([
-                'userfile' => 'required|mimes:' . implode(",",config('crudbooster.UPLOAD_IMAGE_EXTENSION_ALLOWED'))
+                'userfile' => 'required|mimes:'.implode(",", config('crudbooster.UPLOAD_IMAGE_EXTENSION_ALLOWED'))
             ]);
 
-            $file = cb()->uploadFile('userfile', request("encrypt")?true:false, request("resize_width"), request("resize_height"));
+            $file = cb()->uploadFile('userfile', request("encrypt") ?true:false, request("resize_width"), request("resize_height"));
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         } catch (\Exception $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json([

src/controllers/AdminAuthController.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if (!auth()->guest()) return redirect(cb()->getAdminUrl());
 
         cbHook()->hookGetLogin();
 
@@ -17,20 +17,20 @@ 
 
     public function postLogin()
     {
-        try{
+        try {
             cb()->validation([
                 'email'=>'required|email',
                 'password'=>'required'
             ]);
-            $credential = request()->only(['email','password']);
+            $credential = request()->only(['email', 'password']);
             if (auth()->attempt($credential)) {
                 cbHook()->hookPostLogin();
                 return redirect(cb()->getAdminUrl());
             } else {
-                return redirect(cb()->getLoginUrl())->with(['message'=>__('crudbooster.alert_password_wrong'),'message_type'=>'warning']);
+                return redirect(cb()->getLoginUrl())->with(['message'=>__('crudbooster.alert_password_wrong'), 'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
-            return cb()->redirect(cb()->getAdminUrl("login"),$e->getMessage(),'warning');
+        } catch (CBValidationException $e) {
+            return cb()->redirect(cb()->getAdminUrl("login"), $e->getMessage(), 'warning');
         }
     }
 
@@ -45,25 +45,25 @@ 
     }
 
     public function postLoginDeveloper() {
-        try{
+        try {
             cb()->validation([
                 'username'=>'required',
                 'password'=>'required'
             ]);
 
-            if(request('username') == config('crudbooster.DEV_USERNAME')
+            if (request('username') == config('crudbooster.DEV_USERNAME')
                 && request('password') == Cache::get("developer_password")) {
 
                 session(['developer'=>1]);
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
+            } else {
                 return cb()->redirectBack("Username and or password is wrong!");
             }
 
-        }catch (CBValidationException $e) {
-            return cb()->redirect(cb()->getLoginUrl(),$e->getMessage(),'warning');
+        } catch (CBValidationException $e) {
+            return cb()->redirect(cb()->getLoginUrl(), $e->getMessage(), 'warning');
         }
     }