crocodic-studio / crudbooster

src/middlewares/CBBackend.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
      */
     public function handle($request, Closure $next)
     {
-        if(auth()->guest()) {
-            return cb()->redirect(cb()->getLoginUrl("login"),trans('crudbooster.not_logged_in'),'warning');
+        if (auth()->guest()) {
+            return cb()->redirect(cb()->getLoginUrl("login"), trans('crudbooster.not_logged_in'), 'warning');
         }
 
         CBHook::beforeBackendMiddleware($request);

src/database/migrations/2016_08_07_152421_table_menus.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function up()
     {
-        Schema::create('cb_menus', function (Blueprint $table) {
+        Schema::create('cb_menus', function(Blueprint $table) {
             $table->increments("id");
             $table->string('name');
             $table->string("icon")->nullable();

src/controllers/CBController.php

Spacing +50 added lines, -50 removed lines

@@ -27,14 +27,14 @@ 
 
     public function __call($method, $parameters)
     {
-        if($method == "getData") {
+        if ($method == "getData") {
             $key = $parameters[0];
-            if(isset($this->data[$key])) {
+            if (isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else {
                 return null;
             }
-        }else{
+        } else {
             return null;
         }
     }
@@ -49,19 +49,19 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
         {
             $query = call_user_func($this->data['hook_query_index'], $query);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
-        if($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && Schema::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'],
@@ -71,31 +71,31 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if(strpos($column->getField(),".") === false) {
+            if (strpos($column->getField(), ".") === false) {
                 $query->addSelect($this->data['table'].'.'.$column->getField());
-            }else{
+            } else {
                 $query->addSelect($column->getField());
             }
 
             $query = getTypeHook($column->getType())->query($query, $column);
         }
 
-        if(request()->has('q'))
+        if (request()->has('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) {
+            } else {
+                $query->where(function($where) use ($columns) {
                     /**
                      * @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', '%'.request('q').'%');
@@ -104,17 +104,17 @@ 
             }
         }
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
             $query = call_user_func($this->data['hook_query_index'], $query);
         }
 
 
-        if(request()->has(['order_by','order_sort']))
+        if (request()->has(['order_by', 'order_sort']))
         {
-            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 {
             $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc");
         }
 
@@ -123,7 +123,7 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $query = $this->repository();
         $result = $query->paginate(20);
@@ -137,51 +137,51 @@ 
      */
     private function validation()
     {
-        if(isset($this->data['validation'])) {
+        if (isset($this->data['validation'])) {
             $validator = Validator::make(request()->all(), @$this->data['validation'], @$this->data['validation_messages']);
             if ($validator->fails()) {
                 $message = $validator->messages();
                 $message_all = $message->all();
-                throw new CBValidationException(implode(', ',$message_all));
+                throw new CBValidationException(implode(', ', $message_all));
             }
         }
     }
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : Add';
         $data['action_url'] = module()->addSaveURL();
-        return view('crudbooster::module.form.form',$data);
+        return view('crudbooster::module.form.form', $data);
     }
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         try {
             $this->validation();
             columnSingleton()->valueAssignment();
             $data = columnSingleton()->getAssignmentData();
 
-            if(Schema::hasColumn($this->data['table'], 'created_at')) {
+            if (Schema::hasColumn($this->data['table'], 'created_at')) {
                 $data['created_at'] = date('Y-m-d H:i:s');
             }
 
             $id = DB::table($this->data['table'])->insertGetId($data);
 
-            if(isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
+            if (isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
                 call_user_func($this->data['hook_after_insert'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
         if (request('submit') == trans('crudbooster.button_save_more')) {
@@ -193,7 +193,7 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -204,17 +204,17 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         try {
             $this->validation();
             columnSingleton()->valueAssignment();
             $data = columnSingleton()->getAssignmentData();
-            if(Schema::hasColumn($this->data['table'], 'updated_at')) {
+            if (Schema::hasColumn($this->data['table'], 'updated_at')) {
                 $data['updated_at'] = date('Y-m-d H:i:s');
             }
 
-            if(isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
+            if (isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
                 call_user_func($this->data['hook_before_update'], $id);
             }
 
@@ -222,16 +222,16 @@ 
                 ->where(cb()->pk($this->data['table']), $id)
                 ->update($data);
 
-            if(isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
+            if (isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
                 call_user_func($this->data['hook_after_update'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
 
@@ -244,15 +244,15 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
-        if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
+        if (isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
 
-        if ($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) {
             DB::table($this->data['table'])
                 ->where(getPrimaryKey($this->data['table']), $id)
                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
@@ -262,7 +262,7 @@ 
                 ->delete();
         }
 
-        if(isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
+        if (isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
             call_user_func($this->data['hook_after_delete'], $id);
         }
 
@@ -271,7 +271,7 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -281,21 +281,21 @@ 
 
     public function postUploadFile()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if (auth()->guest()) return redirect(cb()->getLoginUrl());
 
         $file = null;
         try {
 
             cb()->validation([
-                'userfile' => 'required|mimes:' . config('crudbooster.UPLOAD_TYPES')
+                'userfile' => 'required|mimes:'.config('crudbooster.UPLOAD_TYPES')
             ]);
 
             $file = cb()->uploadFile('userfile', true);
 
         } 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([

Braces +30 added lines, -14 removed lines

@@ -31,10 +31,10 @@ 
             $key = $parameters[0];
             if(isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else{
                 return null;
             }
-        }else{
+        } else{
             return null;
         }
     }
@@ -75,7 +75,7 @@ 
             /** @var ColumnModel $column */
             if(strpos($column->getField(),".") === false) {
                 $query->addSelect($this->data['table'].'.'.$column->getField());
-            }else{
+            } else{
                 $query->addSelect($column->getField());
             }
 
@@ -86,7 +86,7 @@ 
         {
             if(isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query);
-            }else{
+            } else{
                 $query->where(function ($where) use ($columns) {
                     /**
                      * @var $where Builder
@@ -95,7 +95,7 @@ 
                     {
                         if(strpos($column->getField(),".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else{
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.request('q').'%');
@@ -114,7 +114,7 @@ 
             if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) {
                 $query->orderBy(request('order_by'), request('order_sort'));
             }
-        }else{
+        } else{
             $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc");
         }
 
@@ -123,7 +123,9 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $query = $this->repository();
         $result = $query->paginate(20);
@@ -149,7 +151,9 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : Add';
@@ -159,7 +163,9 @@ 
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         try {
             $this->validation();
@@ -193,7 +199,9 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -204,7 +212,9 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         try {
             $this->validation();
@@ -244,7 +254,9 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canDelete()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
@@ -271,7 +283,9 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canRead()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -281,7 +295,9 @@ 
 
     public function postUploadFile()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if(auth()->guest()) {
+            return redirect(cb()->getLoginUrl());
+        }
 
         $file = null;
         try {

src/types/checkbox/Checkbox.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,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);
@@ -42,7 +42,7 @@ 
         $data = $data->get();
         $options = [];
         foreach ($data as $d) {
-            $options[ $d->$key_field ] = $d->$display_field;
+            $options[$d->$key_field] = $d->$display_field;
         }
         $this->options($options);
     }

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $data = DB::table($table);
         if($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
-        }elseif ($SQLCondition && is_string($SQLCondition)) {
+        } elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
         }
         $data = $data->get();

src/types/date/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
      */
     public function indexRender($row, $column)
     {
-        if($column->getFormat()) {
+        if ($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else {
             return $row->{$column->getField()};
         }
     }

Braces +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
         if($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else{
             return $row->{$column->getField()};
         }
     }