crocodic-studio / crudbooster

src/helpers/CRUDBooster.php

Indentation +44 added lines, -44 removed lines

@@ -15,8 +15,8 @@ 
 class CRUDBooster
 {
     /**
-    *	Comma-delimited data output from the child table
-    */
+     *	Comma-delimited data output from the child table
+     */
     public static function echoSelect2Mult($values, $table, $id, $name) {
         $values = explode(",", $values);
         return implode(", ", DB::table($table)->whereIn($id, $values)->pluck($name)->toArray());
@@ -43,13 +43,13 @@ 
         @$mime_type = $mime_type[1];
         if ($mime_type) {
             $filePath = 'uploads/'.$userID.'/'.date('Y-m');
-		Storage::makeDirectory($filePath);
-		$filename = md5(str_random(5)).'.'.$mime_type;
-		if (Storage::put($filePath.'/'.$filename, $filedata)) {
-		    self::resizeImage($filePath.'/'.$filename);
+        Storage::makeDirectory($filePath);
+        $filename = md5(str_random(5)).'.'.$mime_type;
+        if (Storage::put($filePath.'/'.$filename, $filedata)) {
+            self::resizeImage($filePath.'/'.$filename);
 
-		    return $filePath.'/'.$filename;
-		}
+            return $filePath.'/'.$filename;
+        }
         }
     }
 
@@ -374,17 +374,17 @@ 
 
     public static function getCurrentModule()
     {
-	$modulepath = self::getModulePath();
+    $modulepath = self::getModulePath();
 
-	if (Cache::has('moduls_'.$modulepath)) {
-	    return Cache::get('moduls_'.$modulepath);
-	} else {
+    if (Cache::has('moduls_'.$modulepath)) {
+        return Cache::get('moduls_'.$modulepath);
+    } else {
 
-	    $module = DB::table('cms_moduls')->where('path', self::getModulePath())->first();
+        $module = DB::table('cms_moduls')->where('path', self::getModulePath())->first();
 	    
-	    //supply modulpath instead of $module incase where user decides to create form and custom url that does not exist in cms_moduls table.
-	    return ($module)?:$modulepath; 
-	}
+        //supply modulpath instead of $module incase where user decides to create form and custom url that does not exist in cms_moduls table.
+        return ($module)?:$modulepath; 
+    }
     }
 
     public static function getCurrentDashboardId()
@@ -526,22 +526,22 @@ 
 
     public static function getModulePath()
     {
-          // Check to position of admin_path
-          if(config("crudbooster.ADMIN_PATH")) {
-              $adminPathSegments = explode('/', Request::path());
-              $no = 1;
-              foreach($adminPathSegments as $path) {
-                  if($path == config("crudbooster.ADMIN_PATH")) {
-                      $segment = $no+1;
-                      break;
-                  }
-                  $no++;
-              }
-          } else {
-              $segment = 1;
-          }
-
-          return Request::segment($segment);
+            // Check to position of admin_path
+            if(config("crudbooster.ADMIN_PATH")) {
+                $adminPathSegments = explode('/', Request::path());
+                $no = 1;
+                foreach($adminPathSegments as $path) {
+                    if($path == config("crudbooster.ADMIN_PATH")) {
+                        $segment = $no+1;
+                        break;
+                    }
+                    $no++;
+                }
+            } else {
+                $segment = 1;
+            }
+
+            return Request::segment($segment);
     }	
 
     public static function mainpath($path = null)
@@ -937,19 +937,19 @@ 
 //         }
 //     }
 
-	public static function findPrimaryKey($table)
-	{
-		if(!$table)
-		{
-			return 'id';
-		}
+    public static function findPrimaryKey($table)
+    {
+        if(!$table)
+        {
+            return 'id';
+        }
 		
-		$pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-		if(!$pk) {
-		    return null;
-		}
-		return $pk->getColumns()[0];	
-	}
+        $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
+        if(!$pk) {
+            return null;
+        }
+        return $pk->getColumns()[0];	
+    }
 
     public static function newId($table)
     {

Spacing +27 added lines, -27 removed lines

@@ -26,7 +26,7 @@ 
     
     public static function uploadBase64($value, $id = null)
     {
-        if (! self::myId()) {
+        if (!self::myId()) {
             $userID = 0;
         } else {
             $userID = self::myId();
@@ -56,7 +56,7 @@ 
     public static function uploadFile($name, $encrypt = false, $resize_width = null, $resize_height = null, $id = null)
     {
         if (Request::hasFile($name)) {
-            if (! self::myId()) {
+            if (!self::myId()) {
                 $userID = 0;
             } else {
                 $userID = self::myId();
@@ -110,22 +110,22 @@ 
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
                 $img->fit($resize_width, $resize_height);
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
-            } elseif ($resize_width && ! $resize_height) {
+            } elseif ($resize_width && !$resize_height) {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
-                $img->resize($resize_width, null, function ($constraint) {
+                $img->resize($resize_width, null, function($constraint) {
                     $constraint->aspectRatio();
                 });
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
-            } elseif (! $resize_width && $resize_height) {
+            } elseif (!$resize_width && $resize_height) {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
-                $img->resize(null, $resize_height, function ($constraint) {
+                $img->resize(null, $resize_height, function($constraint) {
                     $constraint->aspectRatio();
                 });
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
             } else {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
                 if ($img->width() > 1300) {
-                    $img->resize(1300, null, function ($constraint) {
+                    $img->resize(1300, null, function($constraint) {
                         $constraint->aspectRatio();
                     });
                 }
@@ -153,7 +153,7 @@ 
     public static function insert($table, $data = [])
     {
         $data['id'] = DB::table($table)->max('id') + 1;
-        if (! $data['created_at']) {
+        if (!$data['created_at']) {
             if (Schema::hasColumn($table, 'created_at')) {
                 $data['created_at'] = date('Y-m-d H:i:s');
             }
@@ -383,7 +383,7 @@ 
 	    $module = DB::table('cms_moduls')->where('path', self::getModulePath())->first();
 	    
 	    //supply modulpath instead of $module incase where user decides to create form and custom url that does not exist in cms_moduls table.
-	    return ($module)?:$modulepath; 
+	    return ($module) ?: $modulepath; 
 	}
     }
 
@@ -527,12 +527,12 @@ 
     public static function getModulePath()
     {
           // Check to position of admin_path
-          if(config("crudbooster.ADMIN_PATH")) {
+          if (config("crudbooster.ADMIN_PATH")) {
               $adminPathSegments = explode('/', Request::path());
               $no = 1;
-              foreach($adminPathSegments as $path) {
-                  if($path == config("crudbooster.ADMIN_PATH")) {
-                      $segment = $no+1;
+              foreach ($adminPathSegments as $path) {
+                  if ($path == config("crudbooster.ADMIN_PATH")) {
+                      $segment = $no + 1;
                       break;
                   }
                   $no++;
@@ -570,7 +570,7 @@ 
     {
         $id = Session::get('current_row_id');
         $id = intval($id);
-        $id = (! $id) ? Request::segment(4) : $id;
+        $id = (!$id) ? Request::segment(4) : $id;
         $id = intval($id);
 
         return $id;
@@ -619,7 +619,7 @@ 
             return Cache::get('field_type_'.$table.'_'.$field);
         }
 
-        $typedata = Cache::rememberForever('field_type_'.$table.'_'.$field, function () use ($table, $field) {
+        $typedata = Cache::rememberForever('field_type_'.$table.'_'.$field, function() use ($table, $field) {
 
             try {
                 //MySQL & SQL Server
@@ -628,7 +628,7 @@ 
 
             }
 
-            if (! $typedata) {
+            if (!$typedata) {
                 $typedata = 'varchar';
             }
 
@@ -705,7 +705,7 @@ 
             }
         }
 
-        if (! $full) {
+        if (!$full) {
             $string = array_slice($string, 0, 1);
         }
 
@@ -728,7 +728,7 @@ 
         $cc_email = $queue->email_cc_email;
         $attachments = unserialize($queue->email_attachments);
 
-        \Mail::send("crudbooster::emails.blank", ['content' => $html], function ($message) use (
+        \Mail::send("crudbooster::emails.blank", ['content' => $html], function($message) use (
             $html,
             $to,
             $subject,
@@ -790,7 +790,7 @@ 
             return true;
         }
 
-        \Mail::send("crudbooster::emails.blank", ['content' => $html], function ($message) use ($to, $subject, $template, $attachments) {
+        \Mail::send("crudbooster::emails.blank", ['content' => $html], function($message) use ($to, $subject, $template, $attachments) {
             $message->priority(1);
             $message->to($to);
 
@@ -939,13 +939,13 @@ 
 
 	public static function findPrimaryKey($table)
 	{
-		if(!$table)
+		if (!$table)
 		{
 			return 'id';
 		}
 		
 		$pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-		if(!$pk) {
+		if (!$pk) {
 		    return null;
 		}
 		return $pk->getColumns()[0];	
@@ -962,10 +962,10 @@ 
     public static function isColumnExists($table, $field)
     {
 
-        if (! $table) {
+        if (!$table) {
             throw new Exception("\$table is empty !", 1);
         }
-        if (! $field) {
+        if (!$field) {
             throw new Exception("\$field is empty !", 1);
         }
 
@@ -1191,8 +1191,8 @@ 
 
             $sender_token = Request::header('X-Authorization-Token');
 
-            if (! Cache::has($sender_token)) {
-                if (! in_array($sender_token, $server_token)) {
+            if (!Cache::has($sender_token)) {
+                if (!in_array($sender_token, $server_token)) {
                     $result['api_status'] = false;
                     $result['api_message'] = "THE TOKEN IS NOT MATCH WITH SERVER TOKEN";
                     $res = response()->json($result, 200);
@@ -1239,7 +1239,7 @@ 
 
     public static function sendFCM($regID = [], $data)
     {
-        if (! $data['title'] || ! $data['content']) {
+        if (!$data['title'] || !$data['content']) {
             return 'title , content null !';
         }
 
@@ -1282,7 +1282,7 @@ 
         $cols = collect(DB::select('SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = :database AND TABLE_NAME = :table', [
             'database' => $table['database'],
             'table' => $table['table'],
-        ]))->map(function ($x) {
+        ]))->map(function($x) {
             return (array) $x;
         })->toArray();
 

src/middlewares/CBBackend.php

Spacing +3 added lines, -3 removed lines

@@ -29,14 +29,14 @@
 
             return redirect($url);
         }
-        if($request->url()==CRUDBooster::adminPath('')){
-            $menus=DB::table('cms_menus')->whereRaw("cms_menus.id IN (select id_cms_menus from cms_menus_privileges where id_cms_privileges = '".CRUDBooster::myPrivilegeId()."')")->where('is_dashboard', 1)->where('is_active', 1)->first();
+        if ($request->url() == CRUDBooster::adminPath('')) {
+            $menus = DB::table('cms_menus')->whereRaw("cms_menus.id IN (select id_cms_menus from cms_menus_privileges where id_cms_privileges = '".CRUDBooster::myPrivilegeId()."')")->where('is_dashboard', 1)->where('is_active', 1)->first();
             if ($menus) {
                 if ($menus->type == 'Statistic') {
                     return redirect()->action('\crocodicstudio\crudbooster\controllers\StatisticBuilderController@getDashboard');
                 } elseif ($menus->type == 'Module') {
                     $module = CRUDBooster::first('cms_moduls', ['path' => $menus->path]);
-                    return redirect()->action( $module->controller.'@getIndex');
+                    return redirect()->action($module->controller.'@getIndex');
                 } elseif ($menus->type == 'Route') {
                     $action = str_replace("Controller", "Controller@", $menus->path);
                     $action = str_replace(['Get', 'Post'], ['get', 'post'], $action);

src/routes.php

Spacing +7 added lines, -7 removed lines

@@ -3,7 +3,7 @@ 
 /* ROUTER FOR API GENERATOR */
 $namespace = '\crocodicstudio\crudbooster\controllers';
 
-Route::group(['middleware' => ['api', '\crocodicstudio\crudbooster\middlewares\CBAuthAPI'], 'namespace' => 'App\Http\Controllers'], function () {
+Route::group(['middleware' => ['api', '\crocodicstudio\crudbooster\middlewares\CBAuthAPI'], 'namespace' => 'App\Http\Controllers'], function() {
     //Router for custom api defeault
 
     $dir = scandir(base_path("app/Http/Controllers"));
@@ -20,14 +20,14 @@ 
 });
 
 /* ROUTER FOR UPLOADS */
-Route::group(['middleware' => ['web'], 'namespace' => $namespace], function () {
+Route::group(['middleware' => ['web'], 'namespace' => $namespace], function() {
     Route::get('api-documentation', ['uses' => 'ApiCustomController@apiDocumentation', 'as' => 'apiDocumentation']);
     Route::get('download-documentation-postman', ['uses' => 'ApiCustomController@getDownloadPostman', 'as' => 'downloadDocumentationPostman']);
     Route::get('uploads/{one?}/{two?}/{three?}/{four?}/{five?}', ['uses' => 'FileController@getPreview', 'as' => 'fileControllerPreview']);
 });
 
 /* ROUTER FOR WEB */
-Route::group(['middleware' => ['web'], 'prefix' => config('crudbooster.ADMIN_PATH'), 'namespace' => $namespace], function () {
+Route::group(['middleware' => ['web'], 'prefix' => config('crudbooster.ADMIN_PATH'), 'namespace' => $namespace], function() {
 
     Route::post('unlock-screen', ['uses' => 'AdminController@postUnlockScreen', 'as' => 'postUnlockScreen']);
     Route::get('lock-screen', ['uses' => 'AdminController@getLockscreen', 'as' => 'getLockScreen']);
@@ -45,9 +45,9 @@ 
     'middleware' => ['web', '\crocodicstudio\crudbooster\middlewares\CBBackend'],
     'prefix' => config('crudbooster.ADMIN_PATH'),
     'namespace' => 'App\Http\Controllers',
-], function () use ($namespace) {
+], function() use ($namespace) {
  
-    Route::get('/',function () {
+    Route::get('/', function() {
     });
     try {
         $moduls = DB::table('cms_moduls')->where('path', '!=', '')->where('controller', '!=', '')
@@ -65,12 +65,12 @@ 
     'middleware' => ['web', '\crocodicstudio\crudbooster\middlewares\CBBackend'],
     'prefix' => config('crudbooster.ADMIN_PATH'),
     'namespace' => $namespace,
-], function () {
+], function() {
 
     /* DO NOT EDIT THESE BELLOW LINES */
     if (Request::is(config('crudbooster.ADMIN_PATH'))) {
         $menus = DB::table('cms_menus')->where('is_dashboard', 1)->first();
-        if (! $menus) {
+        if (!$menus) {
             CRUDBooster::routeController('/', 'AdminController', $namespace = '\crocodicstudio\crudbooster\controllers');
         }
     }

src/controllers/MenusController.php

Spacing +2 added lines, -2 removed lines

@@ -240,7 +240,7 @@ 
         $this->cbLoader();
 
         $module = CRUDBooster::getCurrentModule();
-        if (! CRUDBooster::isView() && $this->global_privilege == false) {
+        if (!CRUDBooster::isView() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans('crudbooster.log_try_view', ['module' => $module->name]));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -277,7 +277,7 @@ 
 
     public function hook_before_add(&$postdata)
     {
-        if (! $postdata['id_cms_privileges']) {
+        if (!$postdata['id_cms_privileges']) {
             $postdata['id_cms_privileges'] = CRUDBooster::myPrivilegeId();
         }
         $postdata['parent_id'] = 0;

src/controllers/CBController.php

Spacing +47 added lines, -47 removed lines

@@ -213,7 +213,7 @@ 
 
         $module = CRUDBooster::getCurrentModule();
 
-        if (! CRUDBooster::isView() && $this->global_privilege == false) {
+        if (!CRUDBooster::isView() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans('crudbooster.log_try_view', ['module' => $module->name]));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -272,7 +272,7 @@ 
             $field = @$coltab['name'];
             $join_table_temp[] = $table;
 
-            if (! $field) {
+            if (!$field) {
                 continue;
             }
 
@@ -358,12 +358,12 @@ 
                 }
             } else {
 
-                if(isset($field_array[1])) {                    
+                if (isset($field_array[1])) {                    
                     $result->addselect($table.'.'.$field.' as '.$table.'_'.$field);
                     $columns_table[$index]['type_data'] = CRUDBooster::getFieldType($table, $field);
                     $columns_table[$index]['field'] = $table.'_'.$field;
                     $columns_table[$index]['field_raw'] = $table.'.'.$field;
-                }else{
+                } else {
                     $result->addselect($table.'.'.$field);
                     $columns_table[$index]['type_data'] = CRUDBooster::getFieldType($table, $field);
                     $columns_table[$index]['field'] = $field;
@@ -375,9 +375,9 @@ 
         }
 
         if (Request::get('q')) {
-            $result->where(function ($w) use ($columns_table, $request) {
+            $result->where(function($w) use ($columns_table, $request) {
                 foreach ($columns_table as $col) {
-                    if (! $col['field_with']) {
+                    if (!$col['field_with']) {
                         continue;
                     }
                     if ($col['is_subquery']) {
@@ -398,7 +398,7 @@ 
         if (Request::get('filter_column')) {
 
             $filter_column = Request::get('filter_column');
-            $result->where(function ($w) use ($filter_column, $fc) {
+            $result->where(function($w) use ($filter_column, $fc) {
                 foreach ($filter_column as $key => $fc) {
 
                     $value = @$fc['value'];
@@ -514,7 +514,7 @@ 
                 $addaction[] = [
                     'label' => $s['label'],
                     'icon' => $s['button_icon'],
-                    'url' => CRUDBooster::adminPath($s['path']).'?return_url='.urlencode(Request::fullUrl()).'&parent_table='.$table_parent.'&parent_columns='.$s['parent_columns'].'&parent_columns_alias='.$s['parent_columns_alias'].'&parent_id=['.(! isset($s['custom_parent_id']) ? "id" : $s['custom_parent_id']).']&foreign_key='.$s['foreign_key'].'&label='.urlencode($s['label']),
+                    'url' => CRUDBooster::adminPath($s['path']).'?return_url='.urlencode(Request::fullUrl()).'&parent_table='.$table_parent.'&parent_columns='.$s['parent_columns'].'&parent_columns_alias='.$s['parent_columns_alias'].'&parent_id=['.(!isset($s['custom_parent_id']) ? "id" : $s['custom_parent_id']).']&foreign_key='.$s['foreign_key'].'&label='.urlencode($s['label']),
                     'color' => $s['button_color'],
                     'showIf' => $s['showIf'],
                 ];
@@ -611,7 +611,7 @@ 
                 $button_action_style = $this->button_action_style;
                 $html_content[] = "<div class='button_action' style='text-align:right'>".view('crudbooster::components.action', compact('addaction', 'row', 'button_action_style', 'parent_field'))->render()."</div>";
 
-            endif;//button_table_action
+            endif; //button_table_action
 
             foreach ($html_content as $i => $v) {
                 $this->hook_row_index($i, $v);
@@ -661,18 +661,18 @@ 
                 return $pdf->stream($filename.'.pdf');
                 break;
             case 'xls':
-                Excel::create($filename, function ($excel) use ($response) {
+                Excel::create($filename, function($excel) use ($response) {
                     $excel->setTitle($filename)->setCreator("crudbooster.com")->setCompany(CRUDBooster::getSetting('appname'));
-                    $excel->sheet($filename, function ($sheet) use ($response) {
+                    $excel->sheet($filename, function($sheet) use ($response) {
                         $sheet->setOrientation($paperorientation);
                         $sheet->loadview('crudbooster::export', $response);
                     });
                 })->export('xls');
                 break;
             case 'csv':
-                Excel::create($filename, function ($excel) use ($response) {
+                Excel::create($filename, function($excel) use ($response) {
                     $excel->setTitle($filename)->setCreator("crudbooster.com")->setCompany(CRUDBooster::getSetting('appname'));
-                    $excel->sheet($filename, function ($sheet) use ($response) {
+                    $excel->sheet($filename, function($sheet) use ($response) {
                         $sheet->setOrientation($paperorientation);
                         $sheet->loadview('crudbooster::export', $response);
                     });
@@ -724,7 +724,7 @@ 
         $result = DB::table($table);
 
         if (Request::get('q')) {
-            $result->where(function ($where) use ($columns) {
+            $result->where(function($where) use ($columns) {
                 foreach ($columns as $c => $col) {
                     if ($c == 0) {
                         $where->where($col, 'like', '%'.Request::get('q').'%');
@@ -863,7 +863,7 @@ 
             $ai = [];
             $name = $di['name'];
 
-            if (! isset($request_all[$name])) {
+            if (!isset($request_all[$name])) {
                 continue;
             }
 
@@ -895,7 +895,7 @@ 
                 $ai[] = 'mimes:'.$di['mimes'];
             }
             $name = $di['name'];
-            if (! $name) {
+            if (!$name) {
                 continue;
             }
 
@@ -997,7 +997,7 @@ 
         foreach ($this->data_inputan as $ro) {
             $name = $ro['name'];
 
-            if (! $name) {
+            if (!$name) {
                 continue;
             }
 
@@ -1047,7 +1047,7 @@ 
 
             $password_candidate = explode(',', config('crudbooster.PASSWORD_FIELDS_CANDIDATE'));
             if (in_array($name, $password_candidate)) {
-                if (! empty($this->arr[$name])) {
+                if (!empty($this->arr[$name])) {
                     $this->arr[$name] = Hash::make($this->arr[$name]);
                 } else {
                     unset($this->arr[$name]);
@@ -1073,7 +1073,7 @@ 
             if ($ro['type'] == 'multitext') {
                 $name = $ro['name'];
                 $multitext = "";
-                $maxI = ($this->arr[$name])?count($this->arr[$name]):0;
+                $maxI = ($this->arr[$name]) ?count($this->arr[$name]) : 0;
                 for ($i = 0; $i <= $maxI - 1; $i++) {
                     $multitext .= $this->arr[$name][$i]."|";
                 }
@@ -1102,7 +1102,7 @@ 
 
                 $this->arr[$name] = CRUDBooster::uploadFile($name, $ro['encrypt'] || $ro['upload_encrypt'], $ro['resize_width'], $ro['resize_height'], CB::myId());
 
-                if (! $this->arr[$name]) {
+                if (!$this->arr[$name]) {
                     $this->arr[$name] = Request::get('_'.$name);
                 }
             }
@@ -1118,7 +1118,7 @@ 
     public function getAdd()
     {
         $this->cbLoader();
-        if (! CRUDBooster::isCreate() && $this->global_privilege == false || $this->button_add == false) {
+        if (!CRUDBooster::isCreate() && $this->global_privilege == false || $this->button_add == false) {
             CRUDBooster::insertLog(trans('crudbooster.log_try_add', ['module' => CRUDBooster::getCurrentModule()->name]));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans("crudbooster.denied_access"));
         }
@@ -1133,7 +1133,7 @@ 
     public function postAddSave()
     {
         $this->cbLoader();
-        if (! CRUDBooster::isCreate() && $this->global_privilege == false) {
+        if (!CRUDBooster::isCreate() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans('crudbooster.log_try_add_save', [
                 'name' => Request::input($this->title_field),
                 'module' => CRUDBooster::getCurrentModule()->name,
@@ -1154,13 +1154,13 @@ 
         $lastInsertId = $id = DB::table($this->table)->insertGetId($this->arr);
         
         //fix bug if primary key is uuid
-        if($this->arr[$this->primary_key]!=$id)
+        if ($this->arr[$this->primary_key] != $id)
             $id = $this->arr[$this->primary_key];
         
         //Looping Data Input Again After Insert
         foreach ($this->data_inputan as $ro) {
             $name = $ro['name'];
-            if (! $name) {
+            if (!$name) {
                 continue;
             }
 
@@ -1211,7 +1211,7 @@ 
                 $name = str_slug($ro['label'], '');
                 $columns = $ro['columns'];
                 $getColName = Request::get($name.'-'.$columns[0]['name']);
-                $count_input_data = ($getColName)?(count($getColName) - 1):0;
+                $count_input_data = ($getColName) ? (count($getColName) - 1) : 0;
                 $child_array = [];
                 $fk = $ro['foreign_key'];
 
@@ -1220,11 +1220,11 @@ 
                     foreach ($columns as $col) {
                         $colname = $col['name'];
                         $colvalue = Request::get($name.'-'.$colname)[$i];
-                        if(isset($colvalue) === TRUE) {
+                        if (isset($colvalue) === TRUE) {
                             $column_data[$colname] = $colvalue;
                         }
                     }
-                    if(isset($column_data) === TRUE) {
+                    if (isset($column_data) === TRUE) {
                         $column_data[$fk] = (!empty($id) ? $id : $lastInsertId);
                         $child_array[] = $column_data;
                     }
@@ -1262,7 +1262,7 @@ 
         $this->cbLoader();
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isRead() && $this->global_privilege == false || $this->button_edit == false) {
+        if (!CRUDBooster::isRead() && $this->global_privilege == false || $this->button_edit == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_edit", [
                 'name' => $row->{$this->title_field},
                 'module' => CRUDBooster::getCurrentModule()->name,
@@ -1283,7 +1283,7 @@ 
         $this->cbLoader();
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isUpdate() && $this->global_privilege == false) {
+        if (!CRUDBooster::isUpdate() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_add", ['name' => $row->{$this->title_field}, 'module' => CRUDBooster::getCurrentModule()->name]));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -1301,7 +1301,7 @@ 
         //Looping Data Input Again After Insert
         foreach ($this->data_inputan as $ro) {
             $name = $ro['name'];
-            if (! $name) {
+            if (!$name) {
                 continue;
             }
 
@@ -1350,8 +1350,8 @@ 
                 }
                 if ($ro['relationship_table'] && $ro["datatable_orig"] != "") {
                     $params = explode("|", $ro['datatable_orig']);
-                    if(!isset($params[2])) $params[2] = "id";
-                    DB::table($params[0])->where($params[2], $id)->update([$params[1] => implode(",",$inputdata)]);
+                    if (!isset($params[2])) $params[2] = "id";
+                    DB::table($params[0])->where($params[2], $id)->update([$params[1] => implode(",", $inputdata)]);
                 }
             }
 
@@ -1359,7 +1359,7 @@ 
                 $name = str_slug($ro['label'], '');
                 $columns = $ro['columns'];
                 $getColName = Request::get($name.'-'.$columns[0]['name']);
-                $count_input_data = ($getColName)?(count($getColName) - 1):0;
+                $count_input_data = ($getColName) ? (count($getColName) - 1) : 0;
                 $child_array = [];
                 $childtable = CRUDBooster::parseSqlTable($ro['table'])['table'];
                 $fk = $ro['foreign_key'];
@@ -1373,11 +1373,11 @@ 
                     foreach ($columns as $col) {
                         $colname = $col['name'];
                         $colvalue = Request::get($name.'-'.$colname)[$i];
-                        if(isset($colvalue) === TRUE) {
+                        if (isset($colvalue) === TRUE) {
                             $column_data[$colname] = $colvalue;
                         }
                     }
-                    if(isset($column_data) === TRUE){
+                    if (isset($column_data) === TRUE) {
                         $column_data[$childtablePK] = $lastId;
                         $column_data[$fk] = $id;
                         $child_array[] = $column_data;
@@ -1416,7 +1416,7 @@ 
         $this->cbLoader();
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isDelete() && $this->global_privilege == false || $this->button_delete == false) {
+        if (!CRUDBooster::isDelete() && $this->global_privilege == false || $this->button_delete == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_delete", [
                 'name' => $row->{$this->title_field},
                 'module' => CRUDBooster::getCurrentModule()->name,
@@ -1447,7 +1447,7 @@ 
         $this->cbLoader();
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isRead() && $this->global_privilege == false || $this->button_detail == false) {
+        if (!CRUDBooster::isRead() && $this->global_privilege == false || $this->button_detail == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_view", [
                 'name' => $row->{$this->title_field},
                 'module' => CRUDBooster::getCurrentModule()->name,
@@ -1472,13 +1472,13 @@ 
         $data['page_menu'] = Route::getCurrentRoute()->getActionName();
         $data['page_title'] = 'Import Data '.$module->name;
 
-        if (Request::get('file') && ! Request::get('import')) {
+        if (Request::get('file') && !Request::get('import')) {
             $file = base64_decode(Request::get('file'));
             $file = storage_path('app/'.$file);
-            $rows = Excel::load($file, function ($reader) {
+            $rows = Excel::load($file, function($reader) {
             })->get();
             
-            $countRows = ($rows)?count($rows):0;
+            $countRows = ($rows) ?count($rows) : 0;
             
             Session::put('total_data_import', $countRows);
 
@@ -1536,7 +1536,7 @@ 
         $file = base64_decode(Request::get('file'));
         $file = storage_path('app/'.$file);
 
-        $rows = Excel::load($file, function ($reader) {
+        $rows = Excel::load($file, function($reader) {
         })->get();
 
         $has_created_at = false;
@@ -1564,7 +1564,7 @@ 
                         $relation_moduls = DB::table('cms_moduls')->where('table_name', $relation_table)->first();
 
                         $relation_class = __NAMESPACE__.'\\'.$relation_moduls->controller;
-                        if (! class_exists($relation_class)) {
+                        if (!class_exists($relation_class)) {
                             $relation_class = '\App\Http\Controllers\\'.$relation_moduls->controller;
                         }
                         $relation_class = new $relation_class;
@@ -1671,12 +1671,12 @@ 
         $id_selected = Request::input('checkbox');
         $button_name = Request::input('button_name');
 
-        if (! $id_selected) {
+        if (!$id_selected) {
             CRUDBooster::redirect($_SERVER['HTTP_REFERER'], trans("crudbooster.alert_select_a_data"), 'warning');
         }
 
         if ($button_name == 'delete') {
-            if (! CRUDBooster::isDelete()) {
+            if (!CRUDBooster::isDelete()) {
                 CRUDBooster::insertLog(trans("crudbooster.log_try_delete_selected", ['module' => CRUDBooster::getCurrentModule()->name]));
                 CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
             }
@@ -1704,8 +1704,8 @@ 
         $message = trans("crudbooster.alert_action", ['action' => $action]);
 
         if ($this->actionButtonSelected($id_selected, $button_name) === false) {
-            $message = ! empty($this->alert['message']) ? $this->alert['message'] : 'Error';
-            $type = ! empty($this->alert['type']) ? $this->alert['type'] : 'danger';
+            $message = !empty($this->alert['message']) ? $this->alert['message'] : 'Error';
+            $type = !empty($this->alert['type']) ? $this->alert['type'] : 'danger';
         }
 
         return redirect()->back()->with(['message_type' => $type, 'message' => $message]);
@@ -1719,7 +1719,7 @@ 
 
         $row = DB::table($this->table)->where($this->primary_key, $id)->first();
 
-        if (! CRUDBooster::isDelete() && $this->global_privilege == false) {
+        if (!CRUDBooster::isDelete() && $this->global_privilege == false) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_delete_image", [
                 'name' => $row->{$this->title_field},
                 'module' => CRUDBooster::getCurrentModule()->name,

Braces +7 added lines, -4 removed lines

@@ -363,7 +363,7 @@ 
                     $columns_table[$index]['type_data'] = CRUDBooster::getFieldType($table, $field);
                     $columns_table[$index]['field'] = $table.'_'.$field;
                     $columns_table[$index]['field_raw'] = $table.'.'.$field;
-                }else{
+                } else{
                     $result->addselect($table.'.'.$field);
                     $columns_table[$index]['type_data'] = CRUDBooster::getFieldType($table, $field);
                     $columns_table[$index]['field'] = $field;
@@ -1154,8 +1154,9 @@ 
         $lastInsertId = $id = DB::table($this->table)->insertGetId($this->arr);
         
         //fix bug if primary key is uuid
-        if($this->arr[$this->primary_key]!=$id)
-            $id = $this->arr[$this->primary_key];
+        if($this->arr[$this->primary_key]!=$id) {
+                    $id = $this->arr[$this->primary_key];
+        }
         
         //Looping Data Input Again After Insert
         foreach ($this->data_inputan as $ro) {
@@ -1350,7 +1351,9 @@ 
                 }
                 if ($ro['relationship_table'] && $ro["datatable_orig"] != "") {
                     $params = explode("|", $ro['datatable_orig']);
-                    if(!isset($params[2])) $params[2] = "id";
+                    if(!isset($params[2])) {
+                        $params[2] = "id";
+                    }
                     DB::table($params[0])->where($params[2], $id)->update([$params[1] => implode(",",$inputdata)]);
                 }
             }

src/controllers/StatisticBuilderController.php

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
     {
         $this->cbLoader();
 
-        $menus= DB::table('cms_menus')->whereRaw("cms_menus.id IN (select id_cms_menus from cms_menus_privileges where id_cms_privileges = '".CRUDBooster::myPrivilegeId()."')")->where('is_dashboard', 1)->where('is_active', 1)->first();
+        $menus = DB::table('cms_menus')->whereRaw("cms_menus.id IN (select id_cms_menus from cms_menus_privileges where id_cms_privileges = '".CRUDBooster::myPrivilegeId()."')")->where('is_dashboard', 1)->where('is_active', 1)->first();
 
         $slug = str_replace("statistic_builder/show/", "", $menus->path);
 
@@ -90,7 +90,7 @@ 
     {
         $this->cbLoader();
 
-        if (! CRUDBooster::isSuperadmin()) {
+        if (!CRUDBooster::isSuperadmin()) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_view", ['name' => 'Builder', 'module' => 'Statistic']));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -170,7 +170,7 @@ 
     {
         $this->cbLoader();
 
-        if (! CRUDBooster::isSuperadmin()) {
+        if (!CRUDBooster::isSuperadmin()) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_view", ['name' => 'Edit Component', 'module' => 'Statistic']));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }
@@ -196,7 +196,7 @@ 
 
     public function getDeleteComponent($id)
     {
-        if (! CRUDBooster::isSuperadmin()) {
+        if (!CRUDBooster::isSuperadmin()) {
             CRUDBooster::insertLog(trans("crudbooster.log_try_view", ['name' => 'Delete Component', 'module' => 'Statistic']));
             CRUDBooster::redirect(CRUDBooster::adminPath(), trans('crudbooster.denied_access'));
         }

src/views/module_generator/step3.blade.php

Spacing +17 added lines, -17 removed lines

@@ -447,7 +447,7 @@ 
                     </tr>
                     </thead>
                     <tbody>
-                    <?php $index = 0;?>
+                    <?php $index = 0; ?>
                     @foreach($cb_form as $form)
                         <tr>
                             <td><input type='text' value='{{$form["label"]}}' placeholder="Input field label" onclick='showColumnSuggest(this)'
@@ -476,7 +476,7 @@ 
                                     $types = file_get_contents($types);
                                     $types = json_decode($types);
 
-                                    if($types):
+                                    if ($types):
                                     ?>
 
                                     @if($types->alert)
@@ -486,12 +486,12 @@ 
                                     @endif
 
                                     <?php
-                                    if($types->attribute->required):
-                                    foreach($types->attribute->required as $key=>$val):
+                                    if ($types->attribute->required):
+                                    foreach ($types->attribute->required as $key=>$val):
                                     @$value = $form[$key];
-                                    if(is_object($val)):
+                                    if (is_object($val)):
 
-                                    if($val->type && $val->type == 'radio'):
+                                    if ($val->type && $val->type == 'radio'):
                                     ?>
                                     <div class="form-group">
                                         <label>{{$key}}</label>
@@ -509,7 +509,7 @@ 
                                         <input type="text" name="option[{{$index}}][{{$key}}]" placeholder="{{$val->placeholder}}" value="{{$value}}"
                                                class="form-control">
                                     </div>
-                                    <?php endif;?>
+                                    <?php endif; ?>
                                     <?php else:?>
 
                                     <div class="form-group">
@@ -517,25 +517,25 @@ 
                                         <input type="text" name="option[{{$index}}][{{$key}}]" placeholder="{{$val}}" value="{{$value}}" class="form-control">
                                     </div>
 
-                                    <?php endif;?>
-                                    <?php endforeach; endif;?>
+                                    <?php endif; ?>
+                                    <?php endforeach; endif; ?>
 
 
 
                                     <?php
-                                    if($types->attribute->requiredOne):
-                                    foreach($types->attribute->requiredOne as $key=>$val):
+                                    if ($types->attribute->requiredOne):
+                                    foreach ($types->attribute->requiredOne as $key=>$val):
                                     @$value = $form[$key];
                                     ?>
                                     <div class="form-group">
                                         <label>{{$key}}</label>
                                         <input type="text" name="option[{{$index}}][{{$key}}]" placeholder="{{$val}}" value="{{$value}}" class="form-control">
                                     </div>
-                                    <?php endforeach; endif;?>
+                                    <?php endforeach; endif; ?>
 
                                     <?php
-                                    if($types->attribute->optional):
-                                    foreach($types->attribute->optional as $key=>$val):
+                                    if ($types->attribute->optional):
+                                    foreach ($types->attribute->optional as $key=>$val):
                                     @$value = $form[$key];
 
                                     ?>
@@ -549,10 +549,10 @@ 
                                                    class="form-control">
                                         @endif
                                     </div>
-                                    <?php endforeach; endif;?>
+                                    <?php endforeach; endif; ?>
 
 
-                                    <?php endif;?>
+                                    <?php endif; ?>
                                 </div>
                             </td>
                             <td>
@@ -562,7 +562,7 @@ 
                                 <a href="javascript:void(0)" class="btn btn-success btn-down"><i class='fa fa-arrow-down'></i></a>
                             </td>
                         </tr>
-                        <?php $index++;?>
+                        <?php $index++; ?>
                     @endforeach
 
                     <tr id='tr-sample' style="display: none">

Braces +10 added lines, -4 removed lines

@@ -502,22 +502,28 @@
 
                                     </div>
 
-                                    <?php else:?>
+                                    <?php else {
+    :?>
 
                                     <div class="form-group">
                                         <label>{{$key}}</label>
                                         <input type="text" name="option[{{$index}}][{{$key}}]" placeholder="{{$val->placeholder}}" value="{{$value}}"
                                                class="form-control">
                                     </div>
-                                    <?php endif;?>
-                                    <?php else:?>
+                                    <?php endif;
+}
+?>
+                                    <?php else {
+    :?>
 
                                     <div class="form-group">
                                         <label>{{$key}}</label>
                                         <input type="text" name="option[{{$index}}][{{$key}}]" placeholder="{{$val}}" value="{{$value}}" class="form-control">
                                     </div>
 
-                                    <?php endif;?>
+                                    <?php endif;
+}
+?>
                                     <?php endforeach; endif;?>