@@ -29,16 +29,16 @@ |
||
29 | 29 | |
30 | 30 | columnSingleton()->setColumn($this->index, $data); |
31 | 31 | |
32 | - if(is_callable($query)) { |
|
32 | + if (is_callable($query)) { |
|
33 | 33 | $result = call_user_func($query); |
34 | - }else{ |
|
34 | + } else { |
|
35 | 35 | $result = DB::select(DB::raw($query)); |
36 | 36 | } |
37 | 37 | |
38 | - if($result) { |
|
38 | + if ($result) { |
|
39 | 39 | $options = []; |
40 | - foreach($result as $r) { |
|
41 | - $options[ $r->key ] = $r->label; |
|
40 | + foreach ($result as $r) { |
|
41 | + $options[$r->key] = $r->label; |
|
42 | 42 | } |
43 | 43 | $this->options($options); |
44 | 44 | } |
@@ -18,8 +18,8 @@ |
||
18 | 18 | */ |
19 | 19 | public function handle($request, Closure $next) |
20 | 20 | { |
21 | - if(auth()->guest()) { |
|
22 | - return cb()->redirect(cb()->getLoginUrl("login"),trans('cb::cb.please_login_for_first'),'warning'); |
|
21 | + if (auth()->guest()) { |
|
22 | + return cb()->redirect(cb()->getLoginUrl("login"), trans('cb::cb.please_login_for_first'), 'warning'); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | (new CBHook())->beforeBackendMiddleware($request); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | |
40 | 40 | if ($this->confirm('Do you have setting the database configuration at .env ?')) { |
41 | 41 | |
42 | - if (! file_exists(public_path('vendor')) ) { |
|
42 | + if (!file_exists(public_path('vendor'))) { |
|
43 | 43 | mkdir(public_path('vendor')); |
44 | 44 | } |
45 | 45 | |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | * We need it to change default laravel local filesystem from storage to public |
55 | 55 | * We won't use symlink because of a security issue in many server |
56 | 56 | */ |
57 | - if(!file_exists(public_path("storage"))) { |
|
57 | + if (!file_exists(public_path("storage"))) { |
|
58 | 58 | $this->info("Create storage directory on /public"); |
59 | 59 | mkdir(public_path("storage")); |
60 | - file_put_contents(public_path("storage/.gitignore"),"!.gitignore"); |
|
61 | - file_put_contents(public_path("storage/index.html")," "); |
|
60 | + file_put_contents(public_path("storage/.gitignore"), "!.gitignore"); |
|
61 | + file_put_contents(public_path("storage/index.html"), " "); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /* |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | * Disable php execution on /vendor/* |
68 | 68 | */ |
69 | 69 | $this->info("Tweak some security for your laravel"); |
70 | - file_put_contents(base_path(".htaccess"), "\n\n# Generated by CRUDBooster\nServerSignature Off\nIndexIgnore *\nRewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]\nRewriteRule ^vendor/.*\.(php|rb|py)$ - [F,L,NC]\n<FilesMatch \"^\.\">\nOrder allow,deny\nDeny from all\n</FilesMatch>",FILE_APPEND); |
|
71 | - file_put_contents(public_path(".htaccess"), "\n\n# Generated by CRUDBooster\nServerSignature Off\nIndexIgnore *\nRewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]\nRewriteRule ^vendor/.*\.(php|rb|py)$ - [F,L,NC]\n<FilesMatch \"^\.\">\nOrder allow,deny\nDeny from all\n</FilesMatch>",FILE_APPEND); |
|
70 | + file_put_contents(base_path(".htaccess"), "\n\n# Generated by CRUDBooster\nServerSignature Off\nIndexIgnore *\nRewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]\nRewriteRule ^vendor/.*\.(php|rb|py)$ - [F,L,NC]\n<FilesMatch \"^\.\">\nOrder allow,deny\nDeny from all\n</FilesMatch>", FILE_APPEND); |
|
71 | + file_put_contents(public_path(".htaccess"), "\n\n# Generated by CRUDBooster\nServerSignature Off\nIndexIgnore *\nRewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]\nRewriteRule ^vendor/.*\.(php|rb|py)$ - [F,L,NC]\n<FilesMatch \"^\.\">\nOrder allow,deny\nDeny from all\n</FilesMatch>", FILE_APPEND); |
|
72 | 72 | |
73 | 73 | |
74 | 74 | $this->info('Dumping the autoloaded files and reloading all new files...'); |
@@ -21,7 +21,7 @@ |
||
21 | 21 | { |
22 | 22 | $option = $column->getOptions(); |
23 | 23 | $key = $row->{ $column->getField() }; |
24 | - return @$option[ $key ]; |
|
24 | + return @$option[$key]; |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function detailRender($row, $column) |
@@ -14,21 +14,21 @@ |
||
14 | 14 | { |
15 | 15 | public function postUploadFile() |
16 | 16 | { |
17 | - if(auth()->guest()) return redirect(cb()->getLoginUrl()); |
|
17 | + if (auth()->guest()) return redirect(cb()->getLoginUrl()); |
|
18 | 18 | |
19 | 19 | $file = null; |
20 | 20 | try { |
21 | 21 | |
22 | 22 | cb()->validation([ |
23 | - 'userfile' => 'required|mimes:' . implode(",",config('crudbooster.UPLOAD_FILE_EXTENSION_ALLOWED')) |
|
23 | + 'userfile' => 'required|mimes:'.implode(",", config('crudbooster.UPLOAD_FILE_EXTENSION_ALLOWED')) |
|
24 | 24 | ]); |
25 | 25 | |
26 | 26 | $file = cb()->uploadFile('userfile', request("encrypt")); |
27 | 27 | |
28 | 28 | } catch (CBValidationException $e) { |
29 | - return response()->json(['status'=>false,'message'=>$e->getMessage()]); |
|
29 | + return response()->json(['status'=>false, 'message'=>$e->getMessage()]); |
|
30 | 30 | } catch (\Exception $e) { |
31 | - return response()->json(['status'=>false,'message'=>$e->getMessage()]); |
|
31 | + return response()->json(['status'=>false, 'message'=>$e->getMessage()]); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | return response()->json([ |
@@ -37,15 +37,15 @@ discard block |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | public function make() { |
40 | - $name = trim(($this->name)?:ucwords(str_replace("_"," ",$this->table))); |
|
40 | + $name = trim(($this->name) ?: ucwords(str_replace("_", " ", $this->table))); |
|
41 | 41 | |
42 | 42 | $template = file_get_contents(__DIR__."/../templates/FooBarController.stub"); |
43 | 43 | |
44 | 44 | //Replace table |
45 | - $template = str_replace("{table}",'"'.$this->table.'"', $template); |
|
45 | + $template = str_replace("{table}", '"'.$this->table.'"', $template); |
|
46 | 46 | |
47 | 47 | //Replace permalink |
48 | - $permalink = strtolower(Str::slug($name,"_")); |
|
48 | + $permalink = strtolower(Str::slug($name, "_")); |
|
49 | 49 | $template = str_replace("{permalink}", '"'.$permalink.'"', $template); |
50 | 50 | |
51 | 51 | //Replace Page title |
@@ -53,20 +53,20 @@ discard block |
||
53 | 53 | |
54 | 54 | //Replace scaffolding |
55 | 55 | $scaffold = ""; |
56 | - foreach($this->columns as $field) { |
|
56 | + foreach ($this->columns as $field) { |
|
57 | 57 | $label = $field['column_label']; |
58 | 58 | $column = $field['column_field']; |
59 | - $help = isset($field['column_help'])?"->help(\"".$field['column_help']."\")":""; |
|
60 | - $required = ($field['column_mandatory']=="on")?"":"->required(false)"; |
|
61 | - $indexShow = ($field['column_browse']=="on")?"":"->showIndex(false)"; |
|
62 | - $detailShow = ($field['column_detail']=="on")?"":"->showDetail(false)"; |
|
63 | - $editShow = ($field['column_edit']=="on")?"":"->showEdit(false)"; |
|
64 | - $addShow = ($field['column_add']=="on")?"":"->showAdd(false)"; |
|
59 | + $help = isset($field['column_help']) ? "->help(\"".$field['column_help']."\")" : ""; |
|
60 | + $required = ($field['column_mandatory'] == "on") ? "" : "->required(false)"; |
|
61 | + $indexShow = ($field['column_browse'] == "on") ? "" : "->showIndex(false)"; |
|
62 | + $detailShow = ($field['column_detail'] == "on") ? "" : "->showDetail(false)"; |
|
63 | + $editShow = ($field['column_edit'] == "on") ? "" : "->showEdit(false)"; |
|
64 | + $addShow = ($field['column_add'] == "on") ? "" : "->showAdd(false)"; |
|
65 | 65 | $optionTable = $field['column_option_table']; |
66 | 66 | $optionValue = $field['column_option_value']; |
67 | 67 | $optionDisplay = $field['column_option_display']; |
68 | 68 | $optionSqlCondition = $field['column_option_sql_condition']; |
69 | - $optionSqlCondition = str_replace('"',"'", $optionSqlCondition); |
|
69 | + $optionSqlCondition = str_replace('"', "'", $optionSqlCondition); |
|
70 | 70 | $sqlRawQuery = $field['column_sql_query']; |
71 | 71 | $options = $field['column_options']; |
72 | 72 | $imageResizeWidth = $field['column_image_width']; |
@@ -82,45 +82,45 @@ discard block |
||
82 | 82 | $moneyDecimalSeparator = $field['column_money_decimal_separator']; |
83 | 83 | |
84 | 84 | // Additional Attributes |
85 | - $additional = $required . $indexShow . $detailShow . $addShow . $editShow . $help ; |
|
85 | + $additional = $required.$indexShow.$detailShow.$addShow.$editShow.$help; |
|
86 | 86 | |
87 | 87 | // Additional money |
88 | - $additional .= ($moneyPrefix && $field['column_type']=='money')?"->prefix('".$moneyPrefix."')":""; |
|
89 | - $additional .= ($moneyPrecision && $field['column_type']=='money')?"->precision('".$moneyPrecision."')":""; |
|
90 | - $additional .= ($moneyThousandSeparator && $field['column_type']=='money')?"->thousandSeparator('".$moneyThousandSeparator."')":""; |
|
91 | - $additional .= ($moneyDecimalSeparator && $field['column_type']=='money')?"->decimalSeparator('".$moneyDecimalSeparator."')":""; |
|
88 | + $additional .= ($moneyPrefix && $field['column_type'] == 'money') ? "->prefix('".$moneyPrefix."')" : ""; |
|
89 | + $additional .= ($moneyPrecision && $field['column_type'] == 'money') ? "->precision('".$moneyPrecision."')" : ""; |
|
90 | + $additional .= ($moneyThousandSeparator && $field['column_type'] == 'money') ? "->thousandSeparator('".$moneyThousandSeparator."')" : ""; |
|
91 | + $additional .= ($moneyDecimalSeparator && $field['column_type'] == 'money') ? "->decimalSeparator('".$moneyDecimalSeparator."')" : ""; |
|
92 | 92 | |
93 | 93 | // Additional for image & file type |
94 | - $additional .= ($fileEncrypt && in_array($field['column_type'],['file','image']))?"->encrypt(true)":""; |
|
95 | - $additional .= ($imageResizeWidth && in_array($field['column_type'],['file','image']))?"->resize(".$imageResizeWidth.",".$imageResizeHeight.")":""; |
|
94 | + $additional .= ($fileEncrypt && in_array($field['column_type'], ['file', 'image'])) ? "->encrypt(true)" : ""; |
|
95 | + $additional .= ($imageResizeWidth && in_array($field['column_type'], ['file', 'image'])) ? "->resize(".$imageResizeWidth.",".$imageResizeHeight.")" : ""; |
|
96 | 96 | |
97 | 97 | // Additional for date & datetime |
98 | - $additional .= ($dateFormat && in_array($field['column_type'],['date','datetime']))?"->format('".$dateFormat."')":""; |
|
98 | + $additional .= ($dateFormat && in_array($field['column_type'], ['date', 'datetime'])) ? "->format('".$dateFormat."')" : ""; |
|
99 | 99 | |
100 | 100 | // Additional for text |
101 | - $additional .= ($textDisplayLimit!="" && in_array($field['column_type'],['text','text_area','wysiwyg']))?"->strLimit(".$textDisplayLimit.")":""; |
|
102 | - $additional .= ($maxCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->maxLength(".$maxCharacter.")":""; |
|
103 | - $additional .= ($minCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->minLength(".$minCharacter.")":""; |
|
101 | + $additional .= ($textDisplayLimit != "" && in_array($field['column_type'], ['text', 'text_area', 'wysiwyg'])) ? "->strLimit(".$textDisplayLimit.")" : ""; |
|
102 | + $additional .= ($maxCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->maxLength(".$maxCharacter.")" : ""; |
|
103 | + $additional .= ($minCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->minLength(".$minCharacter.")" : ""; |
|
104 | 104 | |
105 | 105 | $methodName = Str::studly($field['column_type']); |
106 | - if($label && $column) { |
|
107 | - if(in_array($field['column_type'],['radio','select_option','checkbox'])) { |
|
108 | - if($options) { |
|
106 | + if ($label && $column) { |
|
107 | + if (in_array($field['column_type'], ['radio', 'select_option', 'checkbox'])) { |
|
108 | + if ($options) { |
|
109 | 109 | $optResult = []; |
110 | - foreach($options as $opt) { |
|
110 | + foreach ($options as $opt) { |
|
111 | 111 | $optResult[$opt['key']] = $opt['label']; |
112 | 112 | } |
113 | - $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $additional . ';' . "\n\t\t"; |
|
113 | + $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")->options('.min_var_export($optResult).')'.$additional.';'."\n\t\t"; |
|
114 | 114 | } |
115 | - }elseif (in_array($field['column_type'],['radio_table','select_table'])) { |
|
115 | + }elseif (in_array($field['column_type'], ['radio_table', 'select_table'])) { |
|
116 | 116 | if ($optionTable && $optionValue && $optionDisplay) { |
117 | - $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $additional . ';' . "\n\t\t"; |
|
117 | + $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'",["table"=>"'.$optionTable.'","value_option"=>"'.$optionValue.'","display_option"=>"'.$optionDisplay.'","sql_condition"=>"'.$optionSqlCondition.'"])'.$additional.';'."\n\t\t"; |
|
118 | 118 | } |
119 | 119 | }elseif ($field['column_type'] == "select_query") { |
120 | - if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) { |
|
121 | - $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $additional . ';' . "\n\t\t"; |
|
120 | + if ($sqlRawQuery && Str::contains($sqlRawQuery, ["as `key`", "as `label`"])) { |
|
121 | + $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'","'.$sqlRawQuery.'")'.$additional.';'."\n\t\t"; |
|
122 | 122 | } |
123 | - }else{ |
|
123 | + } else { |
|
124 | 124 | $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$additional.';'."\n\t\t"; |
125 | 125 | } |
126 | 126 | } |
@@ -143,10 +143,10 @@ discard block |
||
143 | 143 | $module['controller'] = $filename; |
144 | 144 | $module['last_column_build'] = json_encode($this->columns); |
145 | 145 | |
146 | - if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) { |
|
147 | - DB::table("cb_modules")->where("id",$moduleData->id)->update($module); |
|
146 | + if ($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name", $this->table)->first()) { |
|
147 | + DB::table("cb_modules")->where("id", $moduleData->id)->update($module); |
|
148 | 148 | $id_modules = $moduleData->id; |
149 | - }else{ |
|
149 | + } else { |
|
150 | 150 | $id_modules = DB::table('cb_modules')->insertGetId($module); |
151 | 151 | } |
152 | 152 | |
@@ -155,9 +155,9 @@ discard block |
||
155 | 155 | $menu['name'] = $module['name']; |
156 | 156 | $menu['type'] = 'module'; |
157 | 157 | $menu['cb_modules_id'] = $id_modules; |
158 | - if(isset($moduleData)) { |
|
159 | - DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu); |
|
160 | - }else{ |
|
158 | + if (isset($moduleData)) { |
|
159 | + DB::table("cb_menus")->where("cb_modules_id", $moduleData->id)->update($menu); |
|
160 | + } else { |
|
161 | 161 | DB::table('cb_menus')->insertGetId($menu); |
162 | 162 | } |
163 | 163 |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | /* |
32 | 32 | * For security reason we have limit the upload file formats bellow |
33 | 33 | */ |
34 | - 'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif','pdf','xls','xlsx','doc','docx','txt','zip','rar','rtf'], |
|
34 | + 'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'txt', 'zip', 'rar', 'rtf'], |
|
35 | 35 | |
36 | - 'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif'], |
|
36 | + 'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif'], |
|
37 | 37 | |
38 | 38 | /* |
39 | 39 | * Override Local FileSystem From Storage To Another |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * You can define in this array what the tables you want to include in "php artisan crudbooster:data_migration" |
70 | 70 | * The default is all cb_ prefix will be include in data migration |
71 | 71 | */ |
72 | - 'ADDITIONAL_DATA_MIGRATION'=>['users','migrations'], |
|
72 | + 'ADDITIONAL_DATA_MIGRATION'=>['users', 'migrations'], |
|
73 | 73 | |
74 | 74 | |
75 | 75 | /* |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | { |
21 | 21 | |
22 | 22 | public function getRoleByName($roleName) { |
23 | - return $this->find("cb_roles",['name'=>$roleName]); |
|
23 | + return $this->find("cb_roles", ['name'=>$roleName]); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function fcm() { |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | public function getDeveloperUrl($path = null) { |
39 | - $path = ($path)?"/".trim($path,"/"):null; |
|
39 | + $path = ($path) ? "/".trim($path, "/") : null; |
|
40 | 40 | return url("developer/".getSetting("developer_path")).$path; |
41 | 41 | } |
42 | 42 | |
@@ -53,12 +53,12 @@ discard block |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | public function getAdminUrl($path = null) { |
56 | - $path = ($path)?"/".trim($path,"/"):null; |
|
56 | + $path = ($path) ? "/".trim($path, "/") : null; |
|
57 | 57 | return url(cbConfig("ADMIN_PATH")).$path; |
58 | 58 | } |
59 | 59 | |
60 | 60 | public function getAppName() { |
61 | - return env("APP_NAME","CRUDBOOSTER"); |
|
61 | + return env("APP_NAME", "CRUDBOOSTER"); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -72,16 +72,16 @@ discard block |
||
72 | 72 | */ |
73 | 73 | private function uploadFileProcess($filename, $extension, $file, $encrypt = true, $resize_width = null, $resize_height = null) |
74 | 74 | { |
75 | - if(in_array($extension,cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) { |
|
75 | + if (in_array($extension, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) { |
|
76 | 76 | $file_path = cbConfig("UPLOAD_PATH_FORMAT"); |
77 | - $file_path = str_replace("{Y}",date('Y'), $file_path); |
|
77 | + $file_path = str_replace("{Y}", date('Y'), $file_path); |
|
78 | 78 | $file_path = str_replace("{m}", date('m'), $file_path); |
79 | 79 | $file_path = str_replace("{d}", date("d"), $file_path); |
80 | 80 | |
81 | 81 | //Create Directory Base On Template |
82 | 82 | Storage::makeDirectory($file_path); |
83 | - Storage::put($file_path."/index.html"," ","public"); |
|
84 | - Storage::put($file_path."/.gitignore","!.gitignore","public"); |
|
83 | + Storage::put($file_path."/index.html", " ", "public"); |
|
84 | + Storage::put($file_path."/.gitignore", "!.gitignore", "public"); |
|
85 | 85 | |
86 | 86 | if ($encrypt == true) { |
87 | 87 | $filename = md5(strRandom(5)).'.'.$extension; |
@@ -89,17 +89,17 @@ discard block |
||
89 | 89 | $filename = slug($filename, '_').'.'.$extension; |
90 | 90 | } |
91 | 91 | |
92 | - if($resize_width || $resize_height) { |
|
92 | + if ($resize_width || $resize_height) { |
|
93 | 93 | $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height); |
94 | 94 | return $file_path.'/'.$filename; |
95 | - }else{ |
|
95 | + } else { |
|
96 | 96 | if (Storage::put($file_path.'/'.$filename, $file, 'public')) { |
97 | 97 | return $file_path.'/'.$filename; |
98 | 98 | } else { |
99 | 99 | throw new \Exception("Something went wrong, file can't upload!"); |
100 | 100 | } |
101 | 101 | } |
102 | - }else{ |
|
102 | + } else { |
|
103 | 103 | throw new \Exception("The file format is not allowed!"); |
104 | 104 | } |
105 | 105 | } |
@@ -115,16 +115,16 @@ discard block |
||
115 | 115 | { |
116 | 116 | $fileData = base64_decode($base64_value); |
117 | 117 | $mime_type = finfo_buffer(finfo_open(), $fileData, FILEINFO_MIME_TYPE); |
118 | - if($mime_type) { |
|
119 | - if($mime_type = explode('/', $mime_type)) { |
|
118 | + if ($mime_type) { |
|
119 | + if ($mime_type = explode('/', $mime_type)) { |
|
120 | 120 | $ext = $mime_type[1]; |
121 | - if($filename && $ext) { |
|
121 | + if ($filename && $ext) { |
|
122 | 122 | return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height); |
123 | 123 | } |
124 | - }else { |
|
124 | + } else { |
|
125 | 125 | throw new \Exception("Mime type not found"); |
126 | 126 | } |
127 | - }else{ |
|
127 | + } else { |
|
128 | 128 | throw new \Exception("Mime type not found"); |
129 | 129 | } |
130 | 130 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $filename = $file->getClientOriginalName(); |
145 | 145 | $ext = strtolower($file->getClientOriginalExtension()); |
146 | 146 | |
147 | - if($filename && $ext) { |
|
147 | + if ($filename && $ext) { |
|
148 | 148 | return $this->uploadFileProcess($filename, $ext, $file, $encrypt, $resize_width, $resize_height); |
149 | 149 | } |
150 | 150 | |
@@ -179,29 +179,29 @@ discard block |
||
179 | 179 | if ($resize_width && $resize_height) { |
180 | 180 | $img->fit($resize_width, $resize_height); |
181 | 181 | |
182 | - } elseif ($resize_width && ! $resize_height) { |
|
182 | + } elseif ($resize_width && !$resize_height) { |
|
183 | 183 | |
184 | - $img->resize($resize_width, null, function ($constraint) { |
|
184 | + $img->resize($resize_width, null, function($constraint) { |
|
185 | 185 | $constraint->aspectRatio(); |
186 | 186 | }); |
187 | 187 | |
188 | - } elseif (! $resize_width && $resize_height) { |
|
188 | + } elseif (!$resize_width && $resize_height) { |
|
189 | 189 | |
190 | - $img->resize(null, $resize_height, function ($constraint) { |
|
190 | + $img->resize(null, $resize_height, function($constraint) { |
|
191 | 191 | $constraint->aspectRatio(); |
192 | 192 | }); |
193 | 193 | |
194 | 194 | } else { |
195 | 195 | |
196 | 196 | if ($img->width() > cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES")) { |
197 | - $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function ($constraint) { |
|
197 | + $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function($constraint) { |
|
198 | 198 | $constraint->aspectRatio(); |
199 | 199 | }); |
200 | 200 | } |
201 | 201 | } |
202 | 202 | |
203 | 203 | Storage::put($fullFilePath, $img, 'public'); |
204 | - }else{ |
|
204 | + } else { |
|
205 | 205 | throw new \Exception("The file format is not allowed!"); |
206 | 206 | } |
207 | 207 | } |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | $validator = Validator::make($input_arr, $rules, $messages); |
315 | 315 | if ($validator->fails()) { |
316 | 316 | $message = $validator->errors()->all(); |
317 | - throw new CBValidationException(implode("; ",$message)); |
|
317 | + throw new CBValidationException(implode("; ", $message)); |
|
318 | 318 | } |
319 | 319 | } |
320 | 320 | |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | public function findPrimaryKey($table) |
327 | 327 | { |
328 | 328 | $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey(); |
329 | - if(!$pk) { |
|
329 | + if (!$pk) { |
|
330 | 330 | return null; |
331 | 331 | } |
332 | 332 | return $pk->getColumns()[0]; |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | $string_parameters_array = explode('&', $string_parameters); |
376 | 376 | foreach ($string_parameters_array as $s) { |
377 | 377 | $part = explode('=', $s); |
378 | - if(isset($part[0]) && isset($part[1])) { |
|
378 | + if (isset($part[0]) && isset($part[1])) { |
|
379 | 379 | $name = htmlspecialchars(urldecode($part[0])); |
380 | 380 | $name = strip_tags($name); |
381 | 381 | $value = htmlspecialchars(urldecode($part[1])); |
@@ -392,16 +392,16 @@ discard block |
||
392 | 392 | |
393 | 393 | |
394 | 394 | public function routeGet($prefix, $controller) { |
395 | - $alias = str_replace("@"," ", $controller); |
|
395 | + $alias = str_replace("@", " ", $controller); |
|
396 | 396 | $alias = ucwords($alias); |
397 | - $alias = str_replace(" ","",$alias); |
|
397 | + $alias = str_replace(" ", "", $alias); |
|
398 | 398 | Route::get($prefix, ['uses' => $controller, 'as' => $alias]); |
399 | 399 | } |
400 | 400 | |
401 | 401 | public function routePost($prefix, $controller) { |
402 | - $alias = str_replace("@"," ", $controller); |
|
402 | + $alias = str_replace("@", " ", $controller); |
|
403 | 403 | $alias = ucwords($alias); |
404 | - $alias = str_replace(" ","",$alias); |
|
404 | + $alias = str_replace(" ", "", $alias); |
|
405 | 405 | Route::post($prefix, ['uses' => $controller, 'as' => $alias]); |
406 | 406 | } |
407 | 407 | |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | |
427 | 427 | $prefix = trim($prefix, '/').'/'; |
428 | 428 | |
429 | - if(substr($controller,0,1) != "\\") { |
|
429 | + if (substr($controller, 0, 1) != "\\") { |
|
430 | 430 | $controller = "\App\Http\Controllers\\".$controller; |
431 | 431 | } |
432 | 432 |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | | |
10 | 10 | */ |
11 | 11 | |
12 | -if(!function_exists("cbLang")) { |
|
12 | +if (!function_exists("cbLang")) { |
|
13 | 13 | /** |
14 | 14 | * @param string $key |
15 | 15 | * @param array $replace |
@@ -21,17 +21,17 @@ discard block |
||
21 | 21 | } |
22 | 22 | } |
23 | 23 | |
24 | -if(!function_exists('rglob')) { |
|
24 | +if (!function_exists('rglob')) { |
|
25 | 25 | function rglob($pattern, $flags = 0) { |
26 | 26 | $files = glob($pattern, $flags); |
27 | - foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) { |
|
27 | + foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) { |
|
28 | 28 | $files = array_merge($files, rglob($dir.'/'.basename($pattern), $flags)); |
29 | 29 | } |
30 | 30 | return $files; |
31 | 31 | } |
32 | 32 | } |
33 | 33 | |
34 | -if(!function_exists('convertPHPToMomentFormat')) { |
|
34 | +if (!function_exists('convertPHPToMomentFormat')) { |
|
35 | 35 | function convertPHPToMomentFormat($format) |
36 | 36 | { |
37 | 37 | $replacements = [ |
@@ -78,13 +78,13 @@ discard block |
||
78 | 78 | } |
79 | 79 | } |
80 | 80 | |
81 | -if(!function_exists('slug')) { |
|
81 | +if (!function_exists('slug')) { |
|
82 | 82 | function slug($string, $separator = '-') { |
83 | 83 | return \Illuminate\Support\Str::slug($string, $separator); |
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
87 | -if(!function_exists('columnSingleton')) { |
|
87 | +if (!function_exists('columnSingleton')) { |
|
88 | 88 | /** |
89 | 89 | * @return \crocodicstudio\crudbooster\controllers\scaffolding\singletons\ColumnSingleton |
90 | 90 | */ |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } |
94 | 94 | } |
95 | 95 | |
96 | -if(!function_exists('cbHook')) |
|
96 | +if (!function_exists('cbHook')) |
|
97 | 97 | { |
98 | 98 | /** |
99 | 99 | * @return crocodicstudio\crudbooster\hooks\CBHook |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
108 | -if(!function_exists('getTypeHook')) |
|
108 | +if (!function_exists('getTypeHook')) |
|
109 | 109 | { |
110 | 110 | /** |
111 | 111 | * @param string $type |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | } |
119 | 119 | } |
120 | 120 | |
121 | -if(!function_exists('getPrimaryKey')) |
|
121 | +if (!function_exists('getPrimaryKey')) |
|
122 | 122 | { |
123 | 123 | function getPrimaryKey($table_name) |
124 | 124 | { |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | } |
127 | 127 | } |
128 | 128 | |
129 | -if(!function_exists('cb')) |
|
129 | +if (!function_exists('cb')) |
|
130 | 130 | { |
131 | 131 | function cb() |
132 | 132 | { |
@@ -134,25 +134,25 @@ discard block |
||
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
137 | -if(!function_exists('cbAsset')) { |
|
137 | +if (!function_exists('cbAsset')) { |
|
138 | 138 | function cbAsset($path) { |
139 | 139 | return asset("cb_asset/".$path); |
140 | 140 | } |
141 | 141 | } |
142 | 142 | |
143 | -if(!function_exists("cbConfig")) { |
|
143 | +if (!function_exists("cbConfig")) { |
|
144 | 144 | function cbConfig($name) { |
145 | 145 | return config("crudbooster.".$name); |
146 | 146 | } |
147 | 147 | } |
148 | 148 | |
149 | -if(!function_exists("strRandom")) { |
|
149 | +if (!function_exists("strRandom")) { |
|
150 | 150 | function strRandom($length = 5) { |
151 | 151 | return \Illuminate\Support\Str::random($length); |
152 | 152 | } |
153 | 153 | } |
154 | 154 | |
155 | -if(!function_exists('module')) { |
|
155 | +if (!function_exists('module')) { |
|
156 | 156 | function module() |
157 | 157 | { |
158 | 158 | $module = new \crocodicstudio\crudbooster\helpers\Module(); |
@@ -160,43 +160,43 @@ discard block |
||
160 | 160 | } |
161 | 161 | } |
162 | 162 | |
163 | -if(!function_exists('getAdminLoginURL')) { |
|
163 | +if (!function_exists('getAdminLoginURL')) { |
|
164 | 164 | function getAdminLoginURL() |
165 | 165 | { |
166 | 166 | return url(config('crudbooster.ADMIN_LOGIN_PATH')); |
167 | 167 | } |
168 | 168 | } |
169 | 169 | |
170 | -if(!function_exists('dummyPhoto')) { |
|
170 | +if (!function_exists('dummyPhoto')) { |
|
171 | 171 | function dummyPhoto() |
172 | 172 | { |
173 | 173 | return cbConfig("DUMMY_PHOTO"); |
174 | 174 | } |
175 | 175 | } |
176 | 176 | |
177 | -if(!function_exists('assetThumbnail')) { |
|
177 | +if (!function_exists('assetThumbnail')) { |
|
178 | 178 | function assetThumbnail($path) { |
179 | - $path = str_replace('uploads/','uploads_thumbnail/',$path); |
|
179 | + $path = str_replace('uploads/', 'uploads_thumbnail/', $path); |
|
180 | 180 | return asset($path); |
181 | 181 | } |
182 | 182 | } |
183 | 183 | |
184 | -if(!function_exists('assetResize')) { |
|
185 | - function assetResize($path,$width,$height=null,$quality=70) { |
|
184 | +if (!function_exists('assetResize')) { |
|
185 | + function assetResize($path, $width, $height = null, $quality = 70) { |
|
186 | 186 | $basename = basename($path); |
187 | 187 | $pathWithoutName = str_replace($basename, '', $path); |
188 | 188 | $newLocation = $pathWithoutName.'/w_'.$width.'_h_'.$height.'_'.$basename; |
189 | - if(Storage::exists($newLocation)) { |
|
189 | + if (Storage::exists($newLocation)) { |
|
190 | 190 | return asset($newLocation); |
191 | - }else{ |
|
192 | - $img = Image::make(storage_path($path))->fit($width,$height); |
|
193 | - $img->save(storage_path($newLocation),$quality); |
|
191 | + } else { |
|
192 | + $img = Image::make(storage_path($path))->fit($width, $height); |
|
193 | + $img->save(storage_path($newLocation), $quality); |
|
194 | 194 | return asset($newLocation); |
195 | 195 | } |
196 | 196 | } |
197 | 197 | } |
198 | 198 | |
199 | -if(!function_exists('extract_unit')) { |
|
199 | +if (!function_exists('extract_unit')) { |
|
200 | 200 | /* |
201 | 201 | Credits: Bit Repository |
202 | 202 | URL: http://www.bitrepository.com/extract-content-between-two-delimiters-with-php.html |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | } |
215 | 215 | |
216 | 216 | |
217 | -if(!function_exists('now')) { |
|
217 | +if (!function_exists('now')) { |
|
218 | 218 | function now() { |
219 | 219 | return date('Y-m-d H:i:s'); |
220 | 220 | } |
@@ -228,14 +228,14 @@ discard block |
||
228 | 228 | | |
229 | 229 | */ |
230 | 230 | |
231 | -if(!function_exists('putSetting')) { |
|
231 | +if (!function_exists('putSetting')) { |
|
232 | 232 | function putSetting($key, $value) |
233 | 233 | { |
234 | - if(file_exists(storage_path('.cbconfig'))) { |
|
234 | + if (file_exists(storage_path('.cbconfig'))) { |
|
235 | 235 | $settings = file_get_contents(storage_path('.cbconfig')); |
236 | 236 | $settings = decrypt($settings); |
237 | 237 | $settings = unserialize($settings); |
238 | - }else{ |
|
238 | + } else { |
|
239 | 239 | $settings = []; |
240 | 240 | } |
241 | 241 | |
@@ -249,31 +249,31 @@ discard block |
||
249 | 249 | } |
250 | 250 | } |
251 | 251 | |
252 | -if(!function_exists('getSetting')) { |
|
252 | +if (!function_exists('getSetting')) { |
|
253 | 253 | function getSetting($key, $default = null) |
254 | 254 | { |
255 | - if($cache = \Illuminate\Support\Facades\Cache::get("setting_".$key)) { |
|
255 | + if ($cache = \Illuminate\Support\Facades\Cache::get("setting_".$key)) { |
|
256 | 256 | return $cache; |
257 | 257 | } |
258 | 258 | |
259 | - if(file_exists(storage_path('.cbconfig'))) { |
|
259 | + if (file_exists(storage_path('.cbconfig'))) { |
|
260 | 260 | $settings = file_get_contents(storage_path('.cbconfig')); |
261 | 261 | $settings = decrypt($settings); |
262 | 262 | $settings = unserialize($settings); |
263 | - }else{ |
|
263 | + } else { |
|
264 | 264 | $settings = []; |
265 | 265 | } |
266 | 266 | |
267 | - if(isset($settings[$key])) { |
|
267 | + if (isset($settings[$key])) { |
|
268 | 268 | \Illuminate\Support\Facades\Cache::put("setting_".$key, $settings[$key], 180); |
269 | - return $settings[$key]?:$default; |
|
270 | - }else{ |
|
269 | + return $settings[$key] ?: $default; |
|
270 | + } else { |
|
271 | 271 | return $default; |
272 | 272 | } |
273 | 273 | } |
274 | 274 | } |
275 | 275 | |
276 | -if(!function_exists('timeAgo')) { |
|
276 | +if (!function_exists('timeAgo')) { |
|
277 | 277 | function timeAgo($datetime_to, $datetime_from = null, $full = false) |
278 | 278 | { |
279 | 279 | $datetime_from = ($datetime_from) ?: date('Y-m-d H:i:s'); |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | } |
305 | 305 | } |
306 | 306 | |
307 | - if (! $full) { |
|
307 | + if (!$full) { |
|
308 | 308 | $string = array_slice($string, 0, 1); |
309 | 309 | } |
310 | 310 | |
@@ -312,22 +312,22 @@ discard block |
||
312 | 312 | } |
313 | 313 | } |
314 | 314 | |
315 | -if(!function_exists("array_map_r")) { |
|
316 | - function array_map_r( $func, $arr ) |
|
315 | +if (!function_exists("array_map_r")) { |
|
316 | + function array_map_r($func, $arr) |
|
317 | 317 | { |
318 | 318 | $newArr = array(); |
319 | 319 | |
320 | - foreach( $arr as $key => $value ) |
|
320 | + foreach ($arr as $key => $value) |
|
321 | 321 | { |
322 | 322 | $key = $func($key); |
323 | - $newArr[ $key ] = ( is_array( $value ) ? array_map_r( $func, $value ) : ( is_array($func) ? call_user_func_array($func, $value) : $func( $value ) ) ); |
|
323 | + $newArr[$key] = (is_array($value) ? array_map_r($func, $value) : (is_array($func) ? call_user_func_array($func, $value) : $func($value))); |
|
324 | 324 | } |
325 | 325 | |
326 | 326 | return $newArr; |
327 | 327 | } |
328 | 328 | } |
329 | 329 | |
330 | -if(!function_exists("sanitizeXSS")) |
|
330 | +if (!function_exists("sanitizeXSS")) |
|
331 | 331 | { |
332 | 332 | function sanitizeXSS($value) |
333 | 333 | { |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | } |
340 | 340 | } |
341 | 341 | |
342 | -if(!function_exists("requestAll")) { |
|
342 | +if (!function_exists("requestAll")) { |
|
343 | 343 | function requestAll() { |
344 | 344 | $all = array_map_r("sanitizeXSS", request()->all()); |
345 | 345 | return $all; |
@@ -348,22 +348,22 @@ discard block |
||
348 | 348 | |
349 | 349 | |
350 | 350 | |
351 | -if(!function_exists('getURLFormat')) { |
|
351 | +if (!function_exists('getURLFormat')) { |
|
352 | 352 | function getURLFormat($name) { |
353 | 353 | $url = request($name); |
354 | - if(filter_var($url, FILTER_VALIDATE_URL)) { |
|
354 | + if (filter_var($url, FILTER_VALIDATE_URL)) { |
|
355 | 355 | return $url; |
356 | - }else{ |
|
356 | + } else { |
|
357 | 357 | return request()->url(); |
358 | 358 | } |
359 | 359 | } |
360 | 360 | } |
361 | 361 | |
362 | -if(!function_exists('g')) { |
|
362 | +if (!function_exists('g')) { |
|
363 | 363 | function g($name, $safe = true) { |
364 | - if($safe == true) { |
|
364 | + if ($safe == true) { |
|
365 | 365 | $response = request($name); |
366 | - if(is_string($response)) { |
|
366 | + if (is_string($response)) { |
|
367 | 367 | $response = sanitizeXSS($response); |
368 | 368 | }elseif (is_array($response)) { |
369 | 369 | array_walk_recursive($response, function(&$response) { |
@@ -372,25 +372,25 @@ discard block |
||
372 | 372 | } |
373 | 373 | |
374 | 374 | return $response; |
375 | - }else{ |
|
375 | + } else { |
|
376 | 376 | return Request::get($name); |
377 | 377 | } |
378 | 378 | } |
379 | 379 | } |
380 | 380 | |
381 | -if(!function_exists('min_var_export')) { |
|
381 | +if (!function_exists('min_var_export')) { |
|
382 | 382 | function min_var_export($input) { |
383 | - if(is_array($input)) { |
|
383 | + if (is_array($input)) { |
|
384 | 384 | $buffer = []; |
385 | - foreach($input as $key => $value) |
|
385 | + foreach ($input as $key => $value) |
|
386 | 386 | $buffer[] = var_export($key, true)."=>".min_var_export($value); |
387 | - return "[".implode(",",$buffer)."]"; |
|
387 | + return "[".implode(",", $buffer)."]"; |
|
388 | 388 | } else |
389 | 389 | return var_export($input, true); |
390 | 390 | } |
391 | 391 | } |
392 | 392 | |
393 | -if(!function_exists('rrmdir')) { |
|
393 | +if (!function_exists('rrmdir')) { |
|
394 | 394 | /* |
395 | 395 | * http://stackoverflow.com/questions/3338123/how-do-i-recursively-delete-a-directory-and-its-entire-contents-files-sub-dir |
396 | 396 | */ |