crocodic-studio / crudbooster

src/controllers/AdminAuthController.php

Braces +6 added lines, -4 removed lines

@@ -7,7 +7,9 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if(!auth()->guest()) {
+            return redirect(cb()->getAdminUrl());
+        }
 
         cbHook()->hookGetLogin();
 
@@ -28,7 +30,7 @@ 
             } else {
                 return redirect(cb()->getLoginUrl())->with(['message'=>__('crudbooster.alert_password_wrong'),'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(cb()->getAdminUrl("login"),$e->getMessage(),'warning');
         }
     }
@@ -57,11 +59,11 @@ 
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
+            } else{
                 return cb()->redirectBack("Username and or password is wrong!");
             }
 
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(cb()->getLoginUrl(),$e->getMessage(),'warning');
         }
     }

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');
         }
     }
 

src/helpers/Module.php

Braces +37 added lines, -22 removed lines

@@ -76,45 +76,60 @@ 
 
     public function canBrowse() {
         if($this->privilege) {
-            if($this->privilege->can_browse) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_browse) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canCreate() {
         if($this->privilege) {
-            if($this->privilege->can_create) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_create) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canRead() {
         if($this->privilege) {
-            if($this->privilege->can_read) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_read) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canUpdate() {
         if($this->privilege) {
-            if($this->privilege->can_update) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_update) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canDelete() {
         if($this->privilege) {
-            if($this->privilege->can_delete) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_delete) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
@@ -123,7 +138,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else{
             return null;
         }
     }
@@ -132,7 +147,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else{
             return null;
         }
     }
@@ -141,7 +156,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
             return action($this->controller.'@getEdit',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -150,7 +165,7 @@ 
     {
         if(method_exists($this->controller_class, 'postEditSave')) {
             return action($this->controller.'@postEditSave',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -159,7 +174,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
             return action($this->controller.'@getDetail',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -168,7 +183,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
             return action($this->controller.'@getDelete',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -177,7 +192,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
             return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        } else{
             return null;
         }
     }

Spacing +49 added lines, -49 removed lines

@@ -25,16 +25,16 @@ 
     {
         $routeArray = request()->route()->getAction();
         $this->controller = class_basename($routeArray['controller']);
-        $this->controller = strtok($this->controller,"@");
+        $this->controller = strtok($this->controller, "@");
 
         $className = "\\".$routeArray["namespace"]."\\".$this->controller;
-        if(class_exists($className)) {
-            $this->module = cb()->find("cb_modules",["controller"=>$this->controller]);
-            if($this->module) {
+        if (class_exists($className)) {
+            $this->module = cb()->find("cb_modules", ["controller"=>$this->controller]);
+            if ($this->module) {
                 $this->controller_class = new $className();
-                $this->menu = cb()->find("cb_menus",["cb_modules_id"=>$this->module->id]);
-                $this->menu = (!$this->menu)?cb()->find("cb_menus",["type"=>"path","path"=>request()->segment(2)]):$this->menu;
-                if($this->menu) {
+                $this->menu = cb()->find("cb_menus", ["cb_modules_id"=>$this->module->id]);
+                $this->menu = (!$this->menu) ?cb()->find("cb_menus", ["type"=>"path", "path"=>request()->segment(2)]) : $this->menu;
+                if ($this->menu) {
                     $this->privilege = DB::table("cb_role_privileges")
                         ->where("cb_menus_id", $this->menu->id)
                         ->where("cb_roles_id", cb()->session()->roleId())
@@ -53,9 +53,9 @@ 
     }
 
     public function getData($key) {
-        if($this->controller_class) {
+        if ($this->controller_class) {
             $value = $this->controller_class->getData($key);
-            if(isset($value)) {
+            if (isset($value)) {
                 return $value;
             }
         }
@@ -66,128 +66,128 @@ 
      * @return CBController
      */
     public function getController() {
-        return ($this->controller_class)?$this->controller_class:null;
+        return ($this->controller_class) ? $this->controller_class : null;
     }
 
     public function getPageTitle()
     {
-        return ($this->controller_class)?$this->controller_class->getData("page_title")?:cb()->getAppName():null;
+        return ($this->controller_class) ? $this->controller_class->getData("page_title") ?: cb()->getAppName() : null;
     }
 
     public function getTable()
     {
-        return ($this->controller_class)?$this->controller_class->getData("table"):null;
+        return ($this->controller_class) ? $this->controller_class->getData("table") : null;
     }
 
     public function getPageIcon()
     {
-        return ($this->controller_class)?$this->controller_class->getData('page_icon')?:"fa fa-bars":null;
+        return ($this->controller_class) ? $this->controller_class->getData('page_icon') ?: "fa fa-bars" : null;
     }
 
     public function canBrowse() {
-        if($this->privilege) {
-            if($this->privilege->can_browse) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_browse) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canCreate() {
-        if($this->privilege) {
-            if($this->privilege->can_create) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_create) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canRead() {
-        if($this->privilege) {
-            if($this->privilege->can_read) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_read) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canUpdate() {
-        if($this->privilege) {
-            if($this->privilege->can_update) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_update) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canDelete() {
-        if($this->privilege) {
-            if($this->privilege->can_delete) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_delete) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function addURL()
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else {
             return null;
         }
     }
 
     public function addSaveURL()
     {
-        if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else {
             return null;
         }
     }
 
     public function editURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
-            return action($this->controller.'@getEdit',['id'=>$id]);
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
+            return action($this->controller.'@getEdit', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
     public function editSaveURL($id = null)
     {
-        if(method_exists($this->controller_class, 'postEditSave')) {
-            return action($this->controller.'@postEditSave',['id'=>$id]);
-        }else{
+        if (method_exists($this->controller_class, 'postEditSave')) {
+            return action($this->controller.'@postEditSave', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
-    public function detailURL($id=null)
+    public function detailURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
-            return action($this->controller.'@getDetail',['id'=>$id]);
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
+            return action($this->controller.'@getDetail', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
-    public function deleteURL($id=null)
+    public function deleteURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
-            return action($this->controller.'@getDelete',['id'=>$id]);
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
+            return action($this->controller.'@getDelete', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
     public function url($path = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
-            return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
+            return trim(action($this->controller.'@getIndex').'/'.$path, '/');
+        } else {
             return null;
         }
     }

src/types/datetime/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()};
         }
     }

src/types/radio/Radio.php

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();

Spacing +3 added lines, -3 removed lines

@@ -35,13 +35,13 @@ 
      */
     public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) {
 
-        if(strpos($table,"App\Models")!==false) {
+        if (strpos($table, "App\Models") !== false) {
             $table = new $table();
             $table = $table::$tableName;
         }
 
         $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,7 +49,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);
     }

src/types/select/Hook.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         if($column->getOptionsFromTable()) {
             $option = $column->getOptionsFromTable();
             return $row->{ $option['table'].'_'.$option['display_field'] };
-        }else{
+        } else{
             $option = $column->getOptions();
             $key = $row->{ $column->getField() };
             return @$option[ $key ];

Spacing +5 added lines, -5 removed lines

@@ -19,9 +19,9 @@ 
      */
     public function query($query, $column)
     {
-        if($column->getOptionsFromTable()) {
+        if ($column->getOptionsFromTable()) {
             $option = $column->getOptionsFromTable();
-            $query->leftjoin($option["table"],$option["table"].'.'.$option["key_field"],"=", $column->getName());
+            $query->leftjoin($option["table"], $option["table"].'.'.$option["key_field"], "=", $column->getName());
             $query->addSelect($option['table'].'.'.$option['display_field'].' as '.$option['table'].'_'.$option['display_field']);
         }
         return $query;
@@ -33,13 +33,13 @@ 
      */
     public function indexRender($row, $column)
     {
-        if($column->getOptionsFromTable()) {
+        if ($column->getOptionsFromTable()) {
             $option = $column->getOptionsFromTable();
             return $row->{ $option['table'].'_'.$option['display_field'] };
-        }else{
+        } else {
             $option = $column->getOptions();
             $key = $row->{ $column->getField() };
-            return @$option[ $key ];
+            return @$option[$key];
         }
     }
 

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/types/checkbox/Checkbox.php

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();

Spacing +3 added lines, -3 removed lines

@@ -40,13 +40,13 @@ 
      * @param $SQLCondition string|callable
      */
     public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) {
-        if(strpos($table,"App\Models")!==false) {
+        if (strpos($table, "App\Models") !== false) {
             $table = new $table();
             $table = $table::$tableName;
         }
 
         $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);
@@ -54,7 +54,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);
     }

src/types/select/Select.php

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();

Spacing +7 added lines, -7 removed lines

@@ -41,13 +41,13 @@ 
      */
     public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) {
 
-        if(strpos($table,"App\Models")!==false) {
+        if (strpos($table, "App\Models") !== false) {
             $table = new $table();
             $table = $table::$tableName;
         }
 
         $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);
@@ -55,11 +55,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);
@@ -75,10 +75,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/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()};
         }
     }