unwanted variables are removed

shunnmugam · Nov 24, 2021 · 4ea9750 · 4ea9750
1 parent b48ce53
commit 4ea9750
Show file tree

Hide file tree

Showing 79 changed files with 1,099 additions and 1,297 deletions.
diff --git a/src/CmsServiceProvider.php b/src/CmsServiceProvider.php
@@ -3,9 +3,7 @@
 namespace Ramesh\Cms;
 
 use Illuminate\Support\ServiceProvider;
-
 use Ramesh\Cms\Controller\CmsController;
-use Cms;
 use Ramesh\Cms\providers\ModuleServiceProvider;
 use Ramesh\Cms\providers\CommandProvider;
 use Illuminate\Support\Facades\Schema;
@@ -35,15 +33,14 @@ public function boot()
         ], 'config');
 
         $this->publishes([
-            __DIR__.'/stubs/skin' => public_path('skin'),
+            __DIR__ . '/stubs/skin' => public_path('skin'),
         ], 'public');
 
         $this->publishes([
-            __DIR__.'/stubs/cms' => base_path('cms'),
+            __DIR__ . '/stubs/cms' => base_path('cms'),
         ], 'public');
 
         Schema::defaultStringLength(191);
-
     }
 
     /**
@@ -57,15 +54,13 @@ public function register()
             return new CmsController();
         });
         $loader = require base_path() . '/vendor/autoload.php';
-        $loader->setPsr4('cms\\core\\',base_path('cms/core'));
+        $loader->setPsr4('cms\\core\\', base_path('cms/core'));
         //$loader->setPsr4('cms\\',base_path('cms/theme1'));
 
 
         $this->app->register(ModuleServiceProvider::class);
         $this->app->register(CommandProvider::class);
 
         include_once('Helper.php');
-
     }
-
 }
diff --git a/src/Commands/CmsPublish.php b/src/Commands/CmsPublish.php
@@ -3,9 +3,7 @@
 namespace Ramesh\Cms\Commands;
 
 use Illuminate\Console\Command;
-use Ramesh\Cms\CmsServiceProvider;
-use Cms;
-use App;
+
 class CmsPublish extends Command
 {
     /**

diff --git a/src/Commands/Seed.php b/src/Commands/Seed.php
@@ -4,7 +4,8 @@
 
 use Illuminate\Console\Command;
 use Cms;
-use File;
+use Illuminate\Support\Facades\File;
+
 class Seed extends Command
 {
     /**
@@ -47,40 +48,33 @@ public function handle()
 
         $class =  $this->option('class');
 
-        if($module)
-        {
-            if($class) {
+        if ($module) {
+            if ($class) {
                 $this->call('db:seed', [
-                    '--class' =>  Cms::getPath() . '\\' . $module . '\\Database\\seeds\\'.$class
+                    '--class' =>  Cms::getPath() . '\\' . $module . '\\Database\\seeds\\' . $class
                 ]);
-            }
-            else
-            {
-                 $module_path = base_path().'/' . Cms::getPath() . '/' . Cms::getModulesPath() . '/'.Cms::getCurrentTheme().'/' . $module . '/Database/seeds';
+            } else {
+                $module_path = base_path() . '/' . Cms::getPath() . '/' . Cms::getModulesPath() . '/' . Cms::getCurrentTheme() . '/' . $module . '/Database/seeds';
                 $files = $this->getAllFileInFolder($module_path);
                 foreach ($files as $file) {
                     $class_name = preg_replace('/\..+$/', '', $file);
                     $this->call('db:seed', [
-                        '--class' =>  Cms::getPath() . '\\' .  $module . '\\Database\\seeds\\'.$class_name
+                        '--class' =>  Cms::getPath() . '\\' .  $module . '\\Database\\seeds\\' . $class_name
                     ]);
                 }
-
             }
-        }else
-        {
+        } else {
             $cms = Cms::allModulesPath(false);
-            foreach ($cms as $module)
-            {
+            foreach ($cms as $module) {
 
 
-                if($class) {
-                    if (File::exists(base_path().'/' . $module . '/Database/seeds/'.$class.'.php')) {
+                if ($class) {
+                    if (File::exists(base_path() . '/' . $module . '/Database/seeds/' . $class . '.php')) {
                         $this->call('db:seed', [
                             '--class' => $module . '\\Database\\seeds\\' . $class
                         ]);
                     }
-                }
-                else {
+                } else {
 
                     $files = $this->getAllFileInFolder(base_path() . '/' . $module . '/Database/seeds');
                     //print_r($files);
@@ -94,10 +88,9 @@ public function handle()
                         //echo 'hai';
                     }
                 }
-
             }
         }
-          //echo 'success';
+        //echo 'success';
     }
 
     protected function getAllFileInFolder($folder)
@@ -108,7 +101,6 @@ protected function getAllFileInFolder($folder)
             foreach ($files as $file) {
                 $path[] = $file->getfileName();
             }
-
         }
         return $path;
     }

diff --git a/src/Controller/ModuleController.php b/src/Controller/ModuleController.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ramesh\Cms\Controller;
 
+namespace Ramesh\Cms\Controller;
 
 class ModuleController extends CmsController
 {
@@ -26,28 +26,26 @@ public function getName()
      */
     public function getJson()
     {
-
     }
     /*
      * get module id
      */
     public function getId()
     {
-
     }
     /*
      * get module path
      */
     public function getPath()
     {
-        return base_path().DIRECTORY_SEPARATOR.parent::getPath().DIRECTORY_SEPARATOR.parent::getModulesLocalPath().parent::getCurrentTheme().DIRECTORY_SEPARATOR.$this->name;
+        return base_path() . DIRECTORY_SEPARATOR . parent::getPath() . DIRECTORY_SEPARATOR . parent::getModulesLocalPath() . parent::getCurrentTheme() . DIRECTORY_SEPARATOR . $this->name;
     }
     /*
      * get module core path
      */
     public function getCorePath()
     {
-        return base_path().DIRECTORY_SEPARATOR.parent::getPath().DIRECTORY_SEPARATOR.parent::getModulesCorePath().DIRECTORY_SEPARATOR.$this->name;
+        return base_path() . DIRECTORY_SEPARATOR . parent::getPath() . DIRECTORY_SEPARATOR . parent::getModulesCorePath() . DIRECTORY_SEPARATOR . $this->name;
     }
 
     /**********get configuration values*****************/
@@ -61,7 +59,4 @@ public function getModuleConfig()
     {
         return parent::getConfig()['module'];
     }
-
-
-
 }
diff --git a/src/Controller/ModulesController.php b/src/Controller/ModulesController.php
@@ -1,14 +1,13 @@
 <?php
-namespace Ramesh\Cms\Controller;
 
+namespace Ramesh\Cms\Controller;
 
 class ModulesController extends CmsController
 {
 
 
     public function __construct()
     {
-
     }
 
     /*
@@ -18,8 +17,4 @@ public function getName()
     {
         return $this->name;
     }
-
-
-
-
 }
diff --git a/src/providers/ModuleServiceProvider.php b/src/providers/ModuleServiceProvider.php
@@ -4,11 +4,6 @@
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Foundation\AliasLoader;
-
-
-use Unisharp\Laravelfilemanager\LaravelFilemanagerServiceProvider;
-use Intervention\Image\ImageServiceProvider;
-
 use Cms;
 
 class ModuleServiceProvider extends ServiceProvider
@@ -20,7 +15,6 @@ class ModuleServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-
     }
 
     /**
@@ -32,17 +26,14 @@ public function register()
     {
         $this->registerLibrary();
 
-        if(!config('cms') || config('cms')=='')
-        {
+        if (!config('cms') || config('cms') == '') {
             //first time
-        }
-        else{
+        } else {
             $this->registerNamespace();
 
             $this->registerComposerAutoload();
             $this->registerHelpers();
         }
-
     }
     /*
      * register module providers
@@ -51,7 +42,7 @@ protected function registerProviders()
     {
         $res = Cms::allModuleProvider();
         //print_r($res);exit;
-        
+
         foreach ($res as $key => $provider) {
             $this->app->register($provider);
         }
@@ -65,37 +56,33 @@ protected function registerComposerAutoload()
         $loader = require base_path() . '/vendor/autoload.php';
         $composers = Cms::allModulesComposer();
         foreach ($composers as $composer) {
-            foreach($composer['autoload'] as $autoload) {
+            foreach ($composer['autoload'] as $autoload) {
                 foreach ($autoload as $key => $value)
-                    $loader->setPsr4($key,base_path().DIRECTORY_SEPARATOR.$value);
+                    $loader->setPsr4($key, base_path() . DIRECTORY_SEPARATOR . $value);
             }
         }
-
-
     }
     protected function registerNamespace()
     {
         $modules = Cms::allModules();
         $loader = require base_path() . '/vendor/autoload.php';
-        foreach($modules as $module)
-        {
-            if($module['type']=='local')
-            {
-                $loader->setPsr4('cms\\'.$module['name'].'\\',$module['path']);
+        foreach ($modules as $module) {
+            if ($module['type'] == 'local') {
+                $loader->setPsr4('cms\\' . $module['name'] . '\\', $module['path']);
             }
         }
 
         $this->registerProviders();
-       // exit;
+        // exit;
     }
     /*
      * Register Helpers
      */
     protected function registerHelpers()
     {
 
-        foreach(Cms::allModulesHelpers() as $aliaas => $value) {
-            $this->app->booting(function () use($aliaas,$value) {
+        foreach (Cms::allModulesHelpers() as $aliaas => $value) {
+            $this->app->booting(function () use ($aliaas, $value) {
                 $loader = AliasLoader::getInstance();
                 $loader->alias($aliaas, $value);
             });
@@ -112,6 +99,5 @@ protected function registerLibrary()
 
         $loader = AliasLoader::getInstance();
         $loader->alias('Image', \Intervention\Image\Facades\Image::class);
-
     }
 }
diff --git a/src/stubs/cms/core/admin/Controllers/AdminAuth.php b/src/stubs/cms/core/admin/Controllers/AdminAuth.php
@@ -2,9 +2,7 @@
 
 namespace cms\core\admin\Controllers;
 
-use User;
-use Hash;
-use Session;
+use cms\core\user\helpers\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 
@@ -32,24 +30,24 @@ public function dologin(Request $request)
             'password' => 'required',
         ]);
 
-        $user = User::check(['username'=>$request->username,'password'=>$request->password]);
+        $user = User::check(['username' => $request->username, 'password' => $request->password]);
 
-        if($user) {
-            $users = UserModel::where('username','=',$request->username)->first();
-            Session::put(['ACTIVE_USER' => strval($users->id)
-                ,'ACTIVE_USERNAME' => $users->username,
+        if ($user) {
+            $users = UserModel::where('username', '=', $request->username)->first();
+            $request->session()->put([
+                'ACTIVE_USER' => strval($users->id), 'ACTIVE_USERNAME' => $users->username,
                 'ACTIVE_GROUP' => 'Super Admin',
                 'ACTIVE_EMAIL' => $users->email,
                 'ACTIVE_MOBILE' => $users->mobile,
-                'ACTIVE_USERIMAGE' => $users->images]);
+                'ACTIVE_USERIMAGE' => $users->images
+            ]);
             //change offline to online
             $users->online = 1;
             $users->ip = request()->ip();
             $users->lastactive = Carbon::now();
             $users->save();
             return redirect()->route('backenddashboard');
-        }
-        else
+        } else
             return redirect()->back()
                 ->withInput($request->input())
                 ->withErrors(['Wrong Information']);
@@ -78,8 +76,7 @@ public function logout(Request $request)
 
         $request->session()->flush();
 
-        Session::flash("success","Logout Successfull");
+        $request->session()->flash("success", "Logout Successfull");
         return redirect('administrator/login');
     }
-
 }
diff --git a/src/stubs/cms/core/admin/Middleware/AdminAuth.php b/src/stubs/cms/core/admin/Middleware/AdminAuth.php
@@ -3,9 +3,8 @@
 namespace cms\core\admin\Middleware;
 
 use Closure;
-use Session;
-use User;
-use CGate;
+use cms\core\gate\helpers\CGate;
+
 class AdminAuth
 {
     /**
@@ -17,18 +16,15 @@ class AdminAuth
      */
     public function handle($request, Closure $next)
     {
-        if(!ctype_digit(Session::get('ACTIVE_USER')) || !filter_var(Session::get('ACTIVE_EMAIL'), FILTER_VALIDATE_EMAIL)){
+        if (!ctype_digit($request->session()->get('ACTIVE_USER')) || !filter_var($request->session()->get('ACTIVE_EMAIL'), FILTER_VALIDATE_EMAIL)) {
             return redirect('administrator/login');
-
         }
-        if(CGate::allows('Backend Access')!=true)
-        {
+        if (CGate::allows('Backend Access') != true) {
             $request->session()->flush();
-            Session::flash("error","Access Denied");
+            $request->session()->flash("error", "Access Denied");
             return redirect('administrator/login');
         }
 
         return $next($request);
     }
-
 }