crocodic-studio / crudbooster

src/CRUDBoosterServiceProvider.php

Spacing +12 added lines, -12 removed lines

@@ -25,13 +25,13 @@ 
         // Register views
         $this->loadViewsFrom(__DIR__.'/views', 'crudbooster');
         $this->loadViewsFrom(__DIR__.'/types', 'types');
-        $this->loadTranslationsFrom(__DIR__."/localization","cb");
+        $this->loadTranslationsFrom(__DIR__."/localization", "cb");
 
         // Publish the files
-        $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')],'cb_config');
-        $this->publishes([__DIR__.'/database' => base_path('database')],'cb_migration');
-        $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')],'cb_hook');
-        $this->publishes([__DIR__ . '/assets' =>public_path('cb_asset')],'cb_asset');
+        $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')], 'cb_config');
+        $this->publishes([__DIR__.'/database' => base_path('database')], 'cb_migration');
+        $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')], 'cb_hook');
+        $this->publishes([__DIR__.'/assets' =>public_path('cb_asset')], 'cb_asset');
 
         // Override Local FileSystem
         Config::set("filesystems.disks.local.root", cbConfig("LOCAL_FILESYSTEM_PATH", public_path("storage")));
@@ -53,7 +53,7 @@ 
         require __DIR__.'/helpers/Helper.php';
 
         // Singletons
-        $this->app->singleton('crudbooster', function ()
+        $this->app->singleton('crudbooster', function()
         {
             return true;
         });
@@ -76,7 +76,7 @@ 
         }
 
         // Merging configuration
-        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php','crudbooster');
+        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php', 'crudbooster');
 
         // Register additional library
         $this->app->register('Intervention\Image\ImageServiceProvider');
@@ -84,17 +84,17 @@ 
 
     private function registerPlugin()
     {
-        if(file_exists(app_path("CBPlugins"))) {
+        if (file_exists(app_path("CBPlugins"))) {
             $views = scandir(app_path("CBPlugins"));
-            foreach($views as $view) {
-                if($view != "." && $view != "..") {
+            foreach ($views as $view) {
+                if ($view != "." && $view != "..") {
                     $basename = basename($view);
 
                     // register migrations
                     $this->loadMigrationsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Migrations"));
 
                     // register view
-                    $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"),$basename);
+                    $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"), $basename);
 
                     // register route
                     require app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Routes".DIRECTORY_SEPARATOR."Route.php");
@@ -107,7 +107,7 @@ 
 
     private function registerTypeRoutes() {
         $routes = rglob(__DIR__.DIRECTORY_SEPARATOR."types".DIRECTORY_SEPARATOR."Route.php");
-        foreach($routes as $route) {
+        foreach ($routes as $route) {
             require $route;
         }
     }

src/helpers/Module.php

Spacing +46 added lines, -46 removed lines

@@ -26,17 +26,17 @@ 
         try {
             $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->privilege = cb()->find("cb_role_privileges",[
+                    $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 = cb()->find("cb_role_privileges", [
                             "cb_menus_id"=>$this->menu->id,
                             "cb_roles_id"=>cb()->session()->roleId()
                         ]);
@@ -57,9 +57,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;
             }
         }
@@ -70,128 +70,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')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
             return action($this->controller.'@getEdit')."/".$id;
-        }else{
+        } else {
             return null;
         }
     }
 
     public function editSaveURL($id = null)
     {
-        if(method_exists($this->controller_class, 'postEditSave')) {
+        if (method_exists($this->controller_class, 'postEditSave')) {
             return action($this->controller.'@postEditSave')."/".$id;
-        }else{
+        } else {
             return null;
         }
     }
 
-    public function detailURL($id=null)
+    public function detailURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
             return action($this->controller.'@getDetail')."/".$id;
-        }else{
+        } else {
             return null;
         }
     }
 
-    public function deleteURL($id=null)
+    public function deleteURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
             return action($this->controller.'@getDelete')."/".$id;
-        }else{
+        } 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;
         }
     }

Braces +37 added lines, -22 removed lines

@@ -90,45 +90,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;
         }
     }
@@ -137,7 +152,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else{
             return null;
         }
     }
@@ -146,7 +161,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else{
             return null;
         }
     }
@@ -155,7 +170,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
             return action($this->controller.'@getEdit')."/".$id;
-        }else{
+        } else{
             return null;
         }
     }
@@ -164,7 +179,7 @@ 
     {
         if(method_exists($this->controller_class, 'postEditSave')) {
             return action($this->controller.'@postEditSave')."/".$id;
-        }else{
+        } else{
             return null;
         }
     }
@@ -173,7 +188,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
             return action($this->controller.'@getDetail')."/".$id;
-        }else{
+        } else{
             return null;
         }
     }
@@ -182,7 +197,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
             return action($this->controller.'@getDelete')."/".$id;
-        }else{
+        } else{
             return null;
         }
     }
@@ -191,7 +206,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
             return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        } else{
             return null;
         }
     }

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, $keyword);
-            }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
              */

Braces +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
                     if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else{
                     $query->addSelect($column->getField());
                 }
             }
@@ -68,7 +68,7 @@ 
             $keyword = sanitizeXSS(request("q"));
             if(isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query, $keyword);
-            }else{
+            } else{
                 $query->where(function ($where) use ($columns, $keyword) {
                     /**
                      * @var $where Builder
@@ -77,7 +77,7 @@ 
                     {
                         if(strpos($column->getField(),".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else{
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.$keyword.'%');
@@ -119,7 +119,7 @@ 
                     $query->orderBy(request('order_by'), request('order_sort'));
                 }
             }
-        }else{
+        } else{
             /*
              * For default, query will be order by primary key as descending
              */

src/helpers/CurlHelper.php

Spacing +6 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
 
     public function headers(array $headers) {
         $newHeaders = [];
-        foreach($headers as $key=>$val) {
+        foreach ($headers as $key=>$val) {
             $newHeaders[] = $key.": ".$val;
         }
         $this->headers = $newHeaders;
@@ -68,11 +68,11 @@ 
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_POSTFIELDS, $this->data);
         curl_setopt($ch, CURLOPT_HTTPHEADER, $this->headers);
-        curl_setopt($ch,CURLOPT_USERAGENT,$this->user_agent);
+        curl_setopt($ch, CURLOPT_USERAGENT, $this->user_agent);
         curl_setopt($ch, CURLOPT_REFERER, $this->referer);
-        if($this->cookie === true) {
+        if ($this->cookie === true) {
             $cookie_dir = storage_path("cookies");
-            if(!file_exists($cookie_dir)) mkdir($cookie_dir);
+            if (!file_exists($cookie_dir)) mkdir($cookie_dir);
             $cookie_file = $cookie_dir."/".md5(request()->ip()).".txt";
             curl_setopt($ch, CURLOPT_COOKIEFILE, $cookie_file);
             curl_setopt($ch, CURLOPT_COOKIEJAR, $cookie_file);
@@ -82,9 +82,9 @@ 
         $err = curl_error($ch);
         curl_close($ch);
 
-        if($err) {
+        if ($err) {
             return $err;
-        }else {
+        } else {
             return $response;
         }
     }

Braces +4 added lines, -2 removed lines

@@ -72,7 +72,9 @@ 
         curl_setopt($ch, CURLOPT_REFERER, $this->referer);
         if($this->cookie === true) {
             $cookie_dir = storage_path("cookies");
-            if(!file_exists($cookie_dir)) mkdir($cookie_dir);
+            if(!file_exists($cookie_dir)) {
+                mkdir($cookie_dir);
+            }
             $cookie_file = $cookie_dir."/".md5(request()->ip()).".txt";
             curl_setopt($ch, CURLOPT_COOKIEFILE, $cookie_file);
             curl_setopt($ch, CURLOPT_COOKIEJAR, $cookie_file);
@@ -84,7 +86,7 @@ 
 
         if($err) {
             return $err;
-        }else {
+        } else {
             return $response;
         }
     }

src/helpers/FCM.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
             'Content-Type:application/json',
         ];
 
-        if(static::$title && $this->message) {
+        if (static::$title && $this->message) {
             $ch = curl_init($url);
             curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);