From 2d4a16aef350a2e1a1b27ebc96c50706f22ff183 Mon Sep 17 00:00:00 2001 From: shunmugam Date: Tue, 21 Jul 2020 12:09:59 +0530 Subject: [PATCH] Input facade removed --- .../core/blog/Controllers/BlogController.php | 2 +- .../configurations/helpers/Configurations.php | 17 ++++-- .../Controllers/FeedBackController.php | 1 - .../core/menu/Controllers/MenuController.php | 1 - .../core/menu/Controllers/WmenuController.php | 55 +++++++++---------- .../menu/resources/views/admin/menu.blade.php | 16 ++---- .../menu/resources/views/wmenuindex.blade.php | 15 ++--- .../core/page/Controllers/PageController.php | 1 - .../plugins/Controllers/PluginsController.php | 1 - .../core/user/Controllers/UserController.php | 1 - 10 files changed, 51 insertions(+), 59 deletions(-) diff --git a/src/stubs/cms/core/blog/Controllers/BlogController.php b/src/stubs/cms/core/blog/Controllers/BlogController.php index 7311db3..10f9eb2 100644 --- a/src/stubs/cms/core/blog/Controllers/BlogController.php +++ b/src/stubs/cms/core/blog/Controllers/BlogController.php @@ -5,7 +5,7 @@ use Illuminate\Http\Request; use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Input; + use Yajra\DataTables\Facades\DataTables; diff --git a/src/stubs/cms/core/configurations/helpers/Configurations.php b/src/stubs/cms/core/configurations/helpers/Configurations.php index f716911..fa1c4b6 100644 --- a/src/stubs/cms/core/configurations/helpers/Configurations.php +++ b/src/stubs/cms/core/configurations/helpers/Configurations.php @@ -6,6 +6,7 @@ use cms\core\module\Models\ModuleModel; use Session; use Cms; +use Schema; //models use cms\core\user\Models\UserModel; use cms\core\configurations\Models\ConfigurationModel; @@ -55,15 +56,19 @@ public static function getAllConfig() public static function getCurrentTheme() { - $data = ConfigurationModel::where('name','=','site')->first(); + if(Schema::hasTable('configurations')) { + $data = ConfigurationModel::where('name','=','site')->first(); - if(count((array) $data)>0 && isset($data->parm)) { - $data = json_decode($data->parm); + if(count((array) $data)>0 && isset($data->parm)) { + $data = json_decode($data->parm); - if(isset($data->active_theme)) - return $data->active_theme; - } + if(isset($data->active_theme)) + return $data->active_theme; + } + + } + return Cms::getThemeConfig()['active']; } diff --git a/src/stubs/cms/core/feedback/Controllers/FeedBackController.php b/src/stubs/cms/core/feedback/Controllers/FeedBackController.php index 495dc00..b6b2660 100644 --- a/src/stubs/cms/core/feedback/Controllers/FeedBackController.php +++ b/src/stubs/cms/core/feedback/Controllers/FeedBackController.php @@ -5,7 +5,6 @@ use Illuminate\Http\Request; use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Input; use Yajra\DataTables\Facades\DataTables; diff --git a/src/stubs/cms/core/menu/Controllers/MenuController.php b/src/stubs/cms/core/menu/Controllers/MenuController.php index 0d2ef33..a868b16 100644 --- a/src/stubs/cms/core/menu/Controllers/MenuController.php +++ b/src/stubs/cms/core/menu/Controllers/MenuController.php @@ -5,7 +5,6 @@ use Illuminate\Http\Request; use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Input; use Yajra\DataTables\Facades\DataTables; diff --git a/src/stubs/cms/core/menu/Controllers/WmenuController.php b/src/stubs/cms/core/menu/Controllers/WmenuController.php index 9de88c0..7ad8a19 100644 --- a/src/stubs/cms/core/menu/Controllers/WmenuController.php +++ b/src/stubs/cms/core/menu/Controllers/WmenuController.php @@ -2,8 +2,7 @@ namespace cms\core\menu\Controllers; use cms\core\menu\Models\MenuItem; use cms\core\menu\Models\Menu; - -use Illuminate\Support\Facades\Input; +use Illuminate\Http\Request; use View; use CGate; @@ -12,7 +11,7 @@ class WmenuController extends BaseController { - public function wmenuindex() { + public function wmenuindex(Request $request) { CGate::authorize('view-menu'); $menuitems = new MenuItem(); @@ -25,72 +24,72 @@ public function wmenuindex() { //print_r($routes[0]->middleware());exit; $pages = PageModel::where('status','=',1)->select('url','title','id')->get(); - if (Input::has("action")) { + if ($request->has("action")) { return View::make('wmenu::admin.menu') -> with("menulist", $menulist)->with('pages',$pages)->with('routes',$routes); } else { - $menu = Menu::find(Input::get("menu")); - $menus = $menuitems -> getall(Input::get("menu")); + $menu = Menu::find($request->input("menu")); + $menus = $menuitems -> getall($request->input("menu")); return View::make('wmenu::admin.menu') -> with("menus", $menus) -> with("indmenu", $menu) -> with("menulist", $menulist)->with('pages',$pages)->with('routes',$routes); } } - public function createnewmenu() { + public function createnewmenu(Request $request) { CGate::authorize('create-menu'); $menu = new Menu(); - $menu -> name = Input::get("menuname"); + $menu -> name = $request->input("menuname"); $menu -> save(); return json_encode(array("resp" => $menu -> id)); } - public function deleteitemmenu() { + public function deleteitemmenu(Request $request) { CGate::authorize('delete-menu'); - $menuitem = MenuItem::find(Input::get("id")); + $menuitem = MenuItem::find($request->input("id")); $menuitem -> delete(); } - public function deletemenug() { + public function deletemenug(Request $request) { CGate::authorize('delete-menu'); $menus = new MenuItem(); - $getall = $menus -> getall(Input::get("id")); + $getall = $menus -> getall($request->input("id")); if (count((array) $getall) == 0) { - $menudelete = Menu::find(Input::get("id")); + $menudelete = Menu::find($request->input("id")); $menudelete -> delete(); return json_encode(array("resp" => "you delete this item")); } else { return json_encode(array("resp" => "You have to delete all items first", "error" => 1)); } } - public function updateitem() { + public function updateitem(Request $request) { CGate::authorize('edit-menu'); - $menuitem = MenuItem::find(Input::get("id")); - $menuitem -> label = Input::get("label"); - $menuitem -> link = Input::get("url"); - $menuitem ->class = Input::get("clases"); + $menuitem = MenuItem::find($request->input("id")); + $menuitem -> label = $request->input("label"); + $menuitem -> link = $request->input("url"); + $menuitem ->class = $request->input("clases"); $menuitem -> save(); } - public function addcustommenu() { + public function addcustommenu(Request $request) { CGate::authorize('create-menu'); $menuitem = new MenuItem(); - $menuitem -> label = Input::get("labelmenu"); - $menuitem -> link = Input::get("linkmenu"); - $menuitem -> menu = Input::get("idmenu"); + $menuitem -> label = $request->input("labelmenu"); + $menuitem -> link = $request->input("linkmenu"); + $menuitem -> menu = $request->input("idmenu"); $menuitem -> save(); } public function addcustompagemenu() { CGate::authorize('create-menu'); - $obj = Input::get("obj"); + $obj = $request->input("obj"); foreach ($obj as $ob) { $menuitem = new MenuItem(); $menuitem->label = $ob['title']; $menuitem->link = url('/').'/'.$ob['url']; - $menuitem->menu = Input::get("idmenu"); + $menuitem->menu = $request->input("idmenu"); $menuitem->save(); } } @@ -98,14 +97,14 @@ public function generatemenucontrol() { CGate::authorize('create-menu'); - if(Input::get("idmenu")) { - $menu = Menu::find(Input::get("idmenu")); + if($request->input("idmenu")) { + $menu = Menu::find($request->input("idmenu")); } else $menu = new Menu; - $menu -> name = Input::get("menuname"); + $menu -> name = $request->input("menuname"); $menu -> save(); - foreach (Input::get("arraydata") as $value) { + foreach ($request->input("arraydata") as $value) { $menuitem = MenuItem::find($value["id"]); $menuitem -> parent = $value["parent"]; $menuitem -> sort = $value["sort"]; diff --git a/src/stubs/cms/core/menu/resources/views/admin/menu.blade.php b/src/stubs/cms/core/menu/resources/views/admin/menu.blade.php index 99fdec6..ef87a1a 100644 --- a/src/stubs/cms/core/menu/resources/views/admin/menu.blade.php +++ b/src/stubs/cms/core/menu/resources/views/admin/menu.blade.php @@ -1,7 +1,3 @@ -@php -use Illuminate\Support\Facades\Input; -@endphp - @extends('layout::admin.master') @section('title','user') @@ -45,7 +41,7 @@