Fix sessions for editora

Author: Christian Bohollo

src/Omatech/Editora/Connector/ConnectorServiceProvider.php

@@ -26,11 +26,6 @@ class ConnectorServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-
-        if((!isset($_SESSION) || empty($_SESSION)) && !in_array(env('APP_ENV'), array('testing', 'test')) ){
-            session_start(); //Editora Admin Session
-        }
-
         //Publicamos el archivo de configuración
         $this->publishes([
             __DIR__.'/Configuration.php' => config_path('editora.php'),
@@ -76,36 +71,39 @@ public function boot()
     public function register()
     {
         $this->mergeConfigFrom(
-            __DIR__.'/Configuration.php', 'editora'
+            __DIR__.'/Configuration.php',
+            'editora'
         );
 
 /*        $db = [
-					'dbname' => env('DB_DATABASE'),
-					'user' => env('DB_USERNAME'),
-					'password' => env('DB_PASSWORD'),
-					'host' => env('DB_HOST'),
-					'driver' => 'pdo_mysql',
-					'charset' => 'utf8'
-        ]; 
+                    'dbname' => env('DB_DATABASE'),
+                    'user' => env('DB_USERNAME'),
+                    'password' => env('DB_PASSWORD'),
+                    'host' => env('DB_HOST'),
+                    'driver' => 'pdo_mysql',
+                    'charset' => 'utf8'
+        ];
 */
-				$db=DB::connection()->getDoctrineConnection();
-        $this->app->bind('Extractor', function() use($db) {
+                $db=DB::connection()->getDoctrineConnection();
+        $this->app->bind('Extractor', function () use ($db) {
             return new Extractor($db);
         });
 
-        $this->app->bind('Utils', function() use ($db) {
+        $this->app->bind('Utils', function () use ($db) {
             return new Utils($db);
         });
-				
-				$this->app->bind('Loader', function() use ($db) {
-            return new Loader($db);
-        });
+                
+                $this->app->bind('Loader', function () use ($db) {
+                    return new Loader($db);
+                });
 
         $laravelVersion = explode('.', $this->app->version());
         $laravelRelease = (int) $laravelVersion[1];
 
         $middlewareMethod = "middleware";
-        if($laravelRelease >= 4) $middlewareMethod = "aliasMiddleware";
+        if ($laravelRelease >= 4) {
+            $middlewareMethod = "aliasMiddleware";
+        }
 
         $this->app['router']->$middlewareMethod('setLocale', 'Omatech\Editora\Connector\Middlewares\SetLocaleMiddleware');
 
@@ -120,14 +118,11 @@ public function register()
     public function registerHelpers()
     {
         // Load the helpers in app/Http/helpers.php
-        if (file_exists($file =  __DIR__.'/Helper/EditoraHelper.php'))
-        {
+        if (file_exists($file =  __DIR__.'/Helper/EditoraHelper.php')) {
             require $file;
         }
-        if (file_exists($file =  __DIR__.'/Helper/StaticTextHelper.php'))
-        {
+        if (file_exists($file =  __DIR__.'/Helper/StaticTextHelper.php')) {
             require $file;
         }
     }
-
 }

src/Omatech/Editora/Connector/Directives/GenerateEditLinkDirective.php

@@ -1,16 +1,13 @@
 <?php
-    Blade::directive('generate_edit_link', function($instance)
-    {
+    Blade::directive('generate_edit_link', function ($instance) {
         $instanceId = $instance."['metadata']['id']";
         $classId = $instance."['metadata']['class_id']";
 
         $php = "<?php
-            if(isset(\$_SESSION['user_id']) && \$_SESSION['user_id'] !== '') {
+            if(session()->has('user_id') && session()->get('user_id') !== '') {
                 echo '<a href=\"/'.config('editora.adminAlias').'/view_instance?p_class_id='.{$classId}.'&p_inst_id='.{$instanceId}.'\" class=\"front-edit\" title=\"Editar\" target=\"_blank\"  style=\"display: none;\"><img class=\"edit_img\" src=\"/images/editar.png\" alt=\"Editar\"/></a>';
             }
         ?>";
 
         return $php;
     });
-
-

src/Omatech/Editora/Connector/Directives/GenerateEditoraEditScriptsDirective.php

@@ -1,8 +1,7 @@
 <?php
-    Blade::directive('editora_scripts', function()
-    {
+    Blade::directive('editora_scripts', function () {
         return "<?php
-            if(isset(\$_SESSION[\"rol_id\"]) && \$_SESSION['rol_id'] !== '')
+            if(session()->has('rol_id') && session()->get('rol_id') !== '')
             {
                 echo \Omatech\Editora\Utils\Strings::get_headerEM();
                 echo \Omatech\Editora\Utils\Strings::get_linkEM();

src/Omatech/Editora/Connector/EditoraController.php

@@ -44,7 +44,7 @@ public function __construct(Request $request)
         $currentLang = (config('editora.forcedLanguage') !== '') ? config('editora.forcedLanguage') : $currentLang;
 
         session(['locale' => $currentLang]);
-        $_SESSION['u_lang'] = $currentLang;
+        session(['u_lang' => $currentLang]);
         App::setLocale(session('locale'));
 
         /**
@@ -130,7 +130,7 @@ private function editMode($req_info)
         $preview = false;
 
         if ($req_info !== null && $req_info == 1) {
-            if (isset($_SESSION['user_id']) && $_SESSION['user_id'] != '') {
+            if (session()->has('user_id') && session()->get('user_id') != '') {
                 $preview = true;
             } else {
                 die('Not connected to CMS!');