@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | $key = $parameters[0]; |
| 32 | 32 | if(isset($this->data[$key])) { |
| 33 | 33 | return $this->data[$key]; |
| 34 | - }else{ |
|
| 34 | + } else{ |
|
| 35 | 35 | return null; |
| 36 | 36 | } |
| 37 | - }else{ |
|
| 37 | + } else{ |
|
| 38 | 38 | return null; |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if(Schema::hasColumn($this->data['table'], $column->getField())) { |
| 72 | 72 | $query->addSelect($this->data['table'].'.'.$column->getField()); |
| 73 | 73 | } |
| 74 | - }else{ |
|
| 74 | + } else{ |
|
| 75 | 75 | $query->addSelect($column->getField()); |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | { |
| 84 | 84 | if(isset($this->data['hook_search_query'])) { |
| 85 | 85 | $query = call_user_func($this->data['hook_search_query'], $query); |
| 86 | - }else{ |
|
| 86 | + } else{ |
|
| 87 | 87 | $query->where(function ($where) use ($columns) { |
| 88 | 88 | /** |
| 89 | 89 | * @var $where Builder |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | { |
| 93 | 93 | if(strpos($column->getField(),".") === false) { |
| 94 | 94 | $field = $this->data['table'].'.'.$column->getField(); |
| 95 | - }else{ |
|
| 95 | + } else{ |
|
| 96 | 96 | $field = $column->getField(); |
| 97 | 97 | } |
| 98 | 98 | $where->orWhere($field, 'like', '%'.request('q').'%'); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) { |
| 118 | 118 | $query->orderBy(request('order_by'), request('order_sort')); |
| 119 | 119 | } |
| 120 | - }else{ |
|
| 120 | + } else{ |
|
| 121 | 121 | $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc"); |
| 122 | 122 | } |
| 123 | 123 | |
@@ -126,7 +126,9 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | public function getIndex() |
| 128 | 128 | { |
| 129 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 129 | + if(!module()->canBrowse()) { |
|
| 130 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 131 | + } |
|
| 130 | 132 | |
| 131 | 133 | $query = $this->repository(); |
| 132 | 134 | $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") ); |
@@ -136,9 +138,13 @@ discard block |
||
| 136 | 138 | } |
| 137 | 139 | |
| 138 | 140 | public function getFilterBy($field, $value, $parentPath) { |
| 139 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 141 | + if(!module()->canBrowse()) { |
|
| 142 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 143 | + } |
|
| 140 | 144 | |
| 141 | - if(!verifyReferalUrl()) return cb()->redirect(cb()->getAdminUrl($parentPath),"The url you are trying visit is incorrect"); |
|
| 145 | + if(!verifyReferalUrl()) { |
|
| 146 | + return cb()->redirect(cb()->getAdminUrl($parentPath),"The url you are trying visit is incorrect"); |
|
| 147 | + } |
|
| 142 | 148 | |
| 143 | 149 | $query = $this->repository(); |
| 144 | 150 | |
@@ -173,7 +179,9 @@ discard block |
||
| 173 | 179 | |
| 174 | 180 | public function getAdd() |
| 175 | 181 | { |
| 176 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 182 | + if(!module()->canCreate()) { |
|
| 183 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 184 | + } |
|
| 177 | 185 | |
| 178 | 186 | $data = []; |
| 179 | 187 | $data['page_title'] = $this->data['page_title'].' : '.cbLang('add'); |
@@ -183,7 +191,9 @@ discard block |
||
| 183 | 191 | |
| 184 | 192 | public function postAddSave() |
| 185 | 193 | { |
| 186 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 194 | + if(!module()->canCreate()) { |
|
| 195 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 196 | + } |
|
| 187 | 197 | |
| 188 | 198 | try { |
| 189 | 199 | $this->validation(); |
@@ -232,7 +242,9 @@ discard block |
||
| 232 | 242 | |
| 233 | 243 | public function getEdit($id) |
| 234 | 244 | { |
| 235 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 245 | + if(!module()->canUpdate()) { |
|
| 246 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 247 | + } |
|
| 236 | 248 | |
| 237 | 249 | $data = []; |
| 238 | 250 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |
@@ -243,7 +255,9 @@ discard block |
||
| 243 | 255 | |
| 244 | 256 | public function postEditSave($id) |
| 245 | 257 | { |
| 246 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 258 | + if(!module()->canUpdate()) { |
|
| 259 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 260 | + } |
|
| 247 | 261 | |
| 248 | 262 | try { |
| 249 | 263 | $this->validation(); |
@@ -292,7 +306,9 @@ discard block |
||
| 292 | 306 | |
| 293 | 307 | public function getDelete($id) |
| 294 | 308 | { |
| 295 | - if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 309 | + if(!module()->canDelete()) { |
|
| 310 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 311 | + } |
|
| 296 | 312 | |
| 297 | 313 | if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
| 298 | 314 | call_user_func($this->data['hook_before_delete'], $id); |
@@ -319,7 +335,9 @@ discard block |
||
| 319 | 335 | |
| 320 | 336 | public function getDetail($id) |
| 321 | 337 | { |
| 322 | - if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 338 | + if(!module()->canRead()) { |
|
| 339 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
| 340 | + } |
|
| 323 | 341 | |
| 324 | 342 | $data = []; |
| 325 | 343 | $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first(); |
@@ -199,11 +199,11 @@ |
||
| 199 | 199 | $parentPath = $this->getData("permalink"); |
| 200 | 200 | $parentTitle = $this->getData("page_title"); |
| 201 | 201 | $this->addActionButton($label,function($row) use ($controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) { |
| 202 | - return action(class_basename($controllerName)."@getFilterBy",[ |
|
| 203 | - "field"=>$foreignKey, |
|
| 204 | - "value"=>$row->primary_key, |
|
| 205 | - "parentPath"=>$parentPath |
|
| 206 | - ])."?ref=".makeReferalUrl($parentTitle, (isset($additionalInfo)&&is_callable($additionalInfo))?call_user_func($additionalInfo,$row):[] ); |
|
| 202 | + return action(class_basename($controllerName)."@getFilterBy",[ |
|
| 203 | + "field"=>$foreignKey, |
|
| 204 | + "value"=>$row->primary_key, |
|
| 205 | + "parentPath"=>$parentPath |
|
| 206 | + ])."?ref=".makeReferalUrl($parentTitle, (isset($additionalInfo)&&is_callable($additionalInfo))?call_user_func($additionalInfo,$row):[] ); |
|
| 207 | 207 | }, $condition, $font, $color); |
| 208 | 208 | } |
| 209 | 209 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | - }catch (\Exception $e) { |
|
| 72 | + } catch (\Exception $e) { |
|
| 73 | 73 | |
| 74 | 74 | } |
| 75 | 75 | return null; |
@@ -124,7 +124,9 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $str = substr($str, 0, -1); |
| 127 | - if (!file_put_contents($envFile, $str)) return false; |
|
| 127 | + if (!file_put_contents($envFile, $str)) { |
|
| 128 | + return false; |
|
| 129 | + } |
|
| 128 | 130 | return true; |
| 129 | 131 | } |
| 130 | 132 | } |
@@ -327,7 +329,7 @@ discard block |
||
| 327 | 329 | $settings = file_get_contents(storage_path('.cbconfig')); |
| 328 | 330 | $settings = decrypt($settings); |
| 329 | 331 | $settings = unserialize($settings); |
| 330 | - }else{ |
|
| 332 | + } else{ |
|
| 331 | 333 | $settings = []; |
| 332 | 334 | } |
| 333 | 335 | |
@@ -352,14 +354,14 @@ discard block |
||
| 352 | 354 | $settings = file_get_contents(storage_path('.cbconfig')); |
| 353 | 355 | $settings = decrypt($settings); |
| 354 | 356 | $settings = unserialize($settings); |
| 355 | - }else{ |
|
| 357 | + } else{ |
|
| 356 | 358 | $settings = []; |
| 357 | 359 | } |
| 358 | 360 | |
| 359 | 361 | if(isset($settings[$key])) { |
| 360 | 362 | \Illuminate\Support\Facades\Cache::forever("setting_".$key, $settings[$key]); |
| 361 | 363 | return $settings[$key]?:$default; |
| 362 | - }else{ |
|
| 364 | + } else{ |
|
| 363 | 365 | return $default; |
| 364 | 366 | } |
| 365 | 367 | } |
@@ -445,7 +447,7 @@ discard block |
||
| 445 | 447 | $url = request($name); |
| 446 | 448 | if(filter_var($url, FILTER_VALIDATE_URL)) { |
| 447 | 449 | return $url; |
| 448 | - }else{ |
|
| 450 | + } else{ |
|
| 449 | 451 | return request()->url(); |
| 450 | 452 | } |
| 451 | 453 | } |
@@ -457,14 +459,14 @@ discard block |
||
| 457 | 459 | $response = request($name); |
| 458 | 460 | if(is_string($response)) { |
| 459 | 461 | $response = sanitizeXSS($response); |
| 460 | - }elseif (is_array($response)) { |
|
| 462 | + } elseif (is_array($response)) { |
|
| 461 | 463 | array_walk_recursive($response, function(&$response) { |
| 462 | 464 | $response = sanitizeXSS($response); |
| 463 | 465 | }); |
| 464 | 466 | } |
| 465 | 467 | |
| 466 | 468 | return $response; |
| 467 | - }else{ |
|
| 469 | + } else{ |
|
| 468 | 470 | return Request::get($name); |
| 469 | 471 | } |
| 470 | 472 | } |
@@ -474,11 +476,13 @@ discard block |
||
| 474 | 476 | function min_var_export($input) { |
| 475 | 477 | if(is_array($input)) { |
| 476 | 478 | $buffer = []; |
| 477 | - foreach($input as $key => $value) |
|
| 478 | - $buffer[] = var_export($key, true)."=>".min_var_export($value); |
|
| 479 | + foreach($input as $key => $value) { |
|
| 480 | + $buffer[] = var_export($key, true)."=>".min_var_export($value); |
|
| 481 | + } |
|
| 479 | 482 | return "[".implode(",",$buffer)."]"; |
| 480 | - } else |
|
| 481 | - return var_export($input, true); |
|
| 483 | + } else { |
|
| 484 | + return var_export($input, true); |
|
| 485 | + } |
|
| 482 | 486 | } |
| 483 | 487 | } |
| 484 | 488 | |
@@ -491,10 +495,11 @@ discard block |
||
| 491 | 495 | $objects = scandir($dir); |
| 492 | 496 | foreach ($objects as $object) { |
| 493 | 497 | if ($object != "." && $object != "..") { |
| 494 | - if (is_dir($dir."/".$object)) |
|
| 495 | - rrmdir($dir."/".$object); |
|
| 496 | - else |
|
| 497 | - unlink($dir."/".$object); |
|
| 498 | + if (is_dir($dir."/".$object)) { |
|
| 499 | + rrmdir($dir."/".$object); |
|
| 500 | + } else { |
|
| 501 | + unlink($dir."/".$object); |
|
| 502 | + } |
|
| 498 | 503 | } |
| 499 | 504 | } |
| 500 | 505 | rmdir($dir); |