@@ -8,7 +8,7 @@ |
||
8 | 8 | <option value="">** Select a {{ $column->getLabel() }}</option> |
9 | 9 | @if(!$column->getForeignKey()) |
10 | 10 | <?php |
11 | - $columnValue = old($column->getName())?:($column->getDefaultValue())?:$column->getValue(); |
|
11 | + $columnValue = old($column->getName()) ?: ($column->getDefaultValue()) ?: $column->getValue(); |
|
12 | 12 | ?> |
13 | 13 | @foreach($column->getOptions() as $key=>$value) |
14 | 14 | <option {{ $columnValue==$key?'selected':'' }} value="{{ $key }}">{{ $value }}</option> |
@@ -41,13 +41,13 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function optionsFromTable($table, $value_option, $display_option, $SQLCondition = null) { |
43 | 43 | |
44 | - if(strpos($table,"App\Models")!==false) { |
|
44 | + if (strpos($table, "App\Models") !== false) { |
|
45 | 45 | $table = new $table(); |
46 | 46 | $table = $table::$tableName; |
47 | 47 | } |
48 | 48 | |
49 | 49 | $data = DB::table($table); |
50 | - if($SQLCondition && is_callable($SQLCondition)) { |
|
50 | + if ($SQLCondition && is_callable($SQLCondition)) { |
|
51 | 51 | $data = call_user_func($SQLCondition, $data); |
52 | 52 | }elseif ($SQLCondition && is_string($SQLCondition)) { |
53 | 53 | $data->whereRaw($SQLCondition); |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | $data = $data->get(); |
56 | 56 | $options = []; |
57 | 57 | foreach ($data as $d) { |
58 | - $options[ $d->$value_option ] = $d->$display_option; |
|
58 | + $options[$d->$value_option] = $d->$display_option; |
|
59 | 59 | } |
60 | 60 | $data = columnSingleton()->getColumn($this->index); |
61 | 61 | /** @var $data SelectTableModel */ |
62 | - $data->setOptionsFromTable(["table"=>$table,"key_field"=>$value_option,"display_field"=>$display_option,"sql_condition"=>$SQLCondition]); |
|
62 | + $data->setOptionsFromTable(["table"=>$table, "key_field"=>$value_option, "display_field"=>$display_option, "sql_condition"=>$SQLCondition]); |
|
63 | 63 | columnSingleton()->setColumn($this->index, $data); |
64 | 64 | |
65 | 65 | $this->options($options); |
@@ -19,9 +19,9 @@ discard block |
||
19 | 19 | */ |
20 | 20 | public function query($query, $column) |
21 | 21 | { |
22 | - if($column->getOptionsFromTable()) { |
|
22 | + if ($column->getOptionsFromTable()) { |
|
23 | 23 | $option = $column->getOptionsFromTable(); |
24 | - $query->leftjoin($option["table"],$option["table"].'.'.$option["key_field"],"=", $column->getName()); |
|
24 | + $query->leftjoin($option["table"], $option["table"].'.'.$option["key_field"], "=", $column->getName()); |
|
25 | 25 | $query->addSelect($option['table'].'.'.$option['display_field'].' as '.$option['table'].'_'.$option['display_field']); |
26 | 26 | } |
27 | 27 | return $query; |
@@ -33,13 +33,13 @@ discard block |
||
33 | 33 | */ |
34 | 34 | public function indexRender($row, $column) |
35 | 35 | { |
36 | - if($column->getOptionsFromTable()) { |
|
36 | + if ($column->getOptionsFromTable()) { |
|
37 | 37 | $option = $column->getOptionsFromTable(); |
38 | 38 | return $row->{ $option['table'].'_'.$option['display_field'] }; |
39 | - }else{ |
|
39 | + } else { |
|
40 | 40 | $option = $column->getOptions(); |
41 | 41 | $key = $row->{ $column->getField() }; |
42 | - return @$option[ $key ]; |
|
42 | + return @$option[$key]; |
|
43 | 43 | } |
44 | 44 | } |
45 | 45 |
@@ -18,11 +18,11 @@ discard block |
||
18 | 18 | $foreignValue = request('foreign_value'); |
19 | 19 | $table = decrypt(request('table')); |
20 | 20 | $sqlCondition = decrypt(request('sql_condition')); |
21 | - if($foreignKey && $foreignValue && $table) { |
|
21 | + if ($foreignKey && $foreignValue && $table) { |
|
22 | 22 | |
23 | 23 | $data = DB::table($table) |
24 | 24 | ->where($foreignKey, $foreignValue); |
25 | - if($sqlCondition) { |
|
25 | + if ($sqlCondition) { |
|
26 | 26 | $data->whereRaw($sqlCondition); |
27 | 27 | } |
28 | 28 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | return response()->json(['status'=>true, 'data'=>$data], 200, ["X-Frame-Options"=>"SAMEORIGIN"]); |
32 | 32 | |
33 | - }else{ |
|
33 | + } else { |
|
34 | 34 | return response()->json(['status'=>false]); |
35 | 35 | } |
36 | 36 | } |
@@ -7,7 +7,7 @@ |
||
7 | 7 | name="{{ $column->getName() }}" id="{{ $column->getName() }}"> |
8 | 8 | <option value="">** Select a {{ $column->getLabel() }}</option> |
9 | 9 | <?php |
10 | - $columnValue = old($column->getName())?:($column->getDefaultValue())?:$column->getValue(); |
|
10 | + $columnValue = old($column->getName()) ?: ($column->getDefaultValue()) ?: $column->getValue(); |
|
11 | 11 | ?> |
12 | 12 | @foreach($column->getOptions() as $key=>$value) |
13 | 13 | <option {{ $columnValue==$key?'selected':'' }} value="{{ $key }}">{{ $value }}</option> |
@@ -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 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | { |
33 | 33 | $option = $column->getOptions(); |
34 | 34 | $key = $row->{ $column->getField() }; |
35 | - return @$option[ $key ]; |
|
35 | + return @$option[$key]; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function detailRender($row, $column) |
@@ -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); |
@@ -1,39 +1,39 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Developer Backend Middleware |
4 | -Route::group(['middleware' => ['web',\crocodicstudio\crudbooster\middlewares\CBDeveloper::class], |
|
4 | +Route::group(['middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBDeveloper::class], |
|
5 | 5 | 'prefix'=>"developer/".getSetting('developer_path'), |
6 | - 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () { |
|
6 | + 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() { |
|
7 | 7 | cb()->routeController("modules", "\crocodicstudio\crudbooster\controllers\DeveloperModulesController"); |
8 | 8 | cb()->routeController("menus", "\crocodicstudio\crudbooster\controllers\DeveloperMenusController"); |
9 | - cb()->routeController("roles","\crocodicstudio\crudbooster\controllers\DeveloperRolesController"); |
|
10 | - cb()->routeController("users","\crocodicstudio\crudbooster\controllers\DeveloperUsersController"); |
|
11 | - cb()->routeGet("/","DeveloperDashboardController@getIndex"); |
|
9 | + cb()->routeController("roles", "\crocodicstudio\crudbooster\controllers\DeveloperRolesController"); |
|
10 | + cb()->routeController("users", "\crocodicstudio\crudbooster\controllers\DeveloperUsersController"); |
|
11 | + cb()->routeGet("/", "DeveloperDashboardController@getIndex"); |
|
12 | 12 | }); |
13 | 13 | |
14 | 14 | // Developer Auth Middleware |
15 | 15 | Route::group(['middleware' => ['web'], |
16 | 16 | 'prefix'=>"developer/".getSetting('developer_path'), |
17 | - 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () { |
|
18 | - cb()->routePost("login","AdminAuthController@postLoginDeveloper"); |
|
19 | - cb()->routeGet("login","AdminAuthController@getLoginDeveloper"); |
|
20 | - cb()->routeGet("logout","AdminAuthController@getLogoutDeveloper"); |
|
17 | + 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() { |
|
18 | + cb()->routePost("login", "AdminAuthController@postLoginDeveloper"); |
|
19 | + cb()->routeGet("login", "AdminAuthController@getLoginDeveloper"); |
|
20 | + cb()->routeGet("logout", "AdminAuthController@getLogoutDeveloper"); |
|
21 | 21 | }); |
22 | 22 | |
23 | 23 | // Routing without any middleware |
24 | -Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function () { |
|
24 | +Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function() { |
|
25 | 25 | cb()->routeGet('uploads/{one?}/{two?}/{three?}/{four?}/{five?}', "FileController@getPreview"); |
26 | 26 | }); |
27 | 27 | |
28 | 28 | // Routing without any middleware with admin prefix |
29 | -Route::group(['middleware' => ['web'], 'prefix' => cbConfig('ADMIN_PATH'), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () { |
|
29 | +Route::group(['middleware' => ['web'], 'prefix' => cbConfig('ADMIN_PATH'), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() { |
|
30 | 30 | cb()->routeGet('logout', "AdminAuthController@getLogout"); |
31 | 31 | cb()->routePost('login', "AdminAuthController@postLogin"); |
32 | 32 | cb()->routeGet('login', "AdminAuthController@getLogin"); |
33 | 33 | }); |
34 | 34 | |
35 | 35 | // Routing package controllers |
36 | -cb()->routeGroupBackend(function () { |
|
36 | +cb()->routeGroupBackend(function() { |
|
37 | 37 | cb()->routeController('profile', '\crocodicstudio\crudbooster\controllers\AdminProfileController'); |
38 | 38 | }); |
39 | 39 | |
@@ -42,24 +42,24 @@ discard block |
||
42 | 42 | 'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBBackend::class], |
43 | 43 | 'prefix' => cbConfig('ADMIN_PATH'), |
44 | 44 | 'namespace' => 'App\Http\Controllers', |
45 | -], function () { |
|
45 | +], function() { |
|
46 | 46 | |
47 | 47 | if (Request::is(cbConfig('ADMIN_PATH'))) { |
48 | - if($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) { |
|
48 | + if ($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) { |
|
49 | 49 | cb()->routeGet("/", $dashboard); |
50 | - }else{ |
|
50 | + } else { |
|
51 | 51 | cb()->routeGet("/", "\crocodicstudio\crudbooster\controllers\AdminDashboardController@getIndex"); |
52 | 52 | } |
53 | 53 | } |
54 | 54 | |
55 | 55 | $controllers = glob(app_path('Http/Controllers/Admin*Controller.php')); |
56 | 56 | |
57 | - foreach($controllers as $controller) { |
|
57 | + foreach ($controllers as $controller) { |
|
58 | 58 | $controllerName = basename($controller); |
59 | - $controllerName = rtrim($controllerName,".php"); |
|
59 | + $controllerName = rtrim($controllerName, ".php"); |
|
60 | 60 | $className = '\App\Http\Controllers\\'.$controllerName; |
61 | 61 | $controllerClass = new $className(); |
62 | - if(method_exists($controllerClass, 'cbInit')) { |
|
62 | + if (method_exists($controllerClass, 'cbInit')) { |
|
63 | 63 | cb()->routeController($controllerClass->getData('permalink'), $controllerName); |
64 | 64 | } |
65 | 65 | } |