fixed folder bug

Author: ddnetters

src/LanguageSwitcher/Command/RenderLanguageSwitcher.php

@@ -6,6 +6,7 @@
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\File;
+use Illuminate\Filesystem\Filesystem;
 
 class RenderLanguageSwitcher
 {
@@ -50,22 +51,25 @@ public function handle(
         $prefered_url     = url()->locale($current_path,$prefered_locale); // Get the current url with the prefered locale
         $toggle_title     = $this->toggle_title ? $this->toggle_title : $current_locale . " <span class='caret'></span>"; // If the user has passed a button title set it, else default to the currently enabled locale.
         $custom_title     = $this->toggle_title != false; // Check if the user has set a custom title. Used in building the ul of locales
-        $composer_folder  = '../core/wirelab/language_switcher-plugin/resources/views'; // The location of the views if the user installed the plugin using composer
-        $manual_folder    = File::directories('../addons')[0] . '/wirelab/language_switcher-plugin/resources/views'; // The location of the views if the user installed the plugin manually
+        $filesystem        = new Filesystem;
+        $composer_folder   = base_path() . '/core/wirelab/language_switcher-plugin/resources/views'; // The location of the views if the user installed the plugin using composer
+        $manual_folder     = base_path() . '/addons/' . env('APPLICATION_REFERENCE') . '/wirelab/language_switcher-plugin/resources/views'; // The location of the views if the user installed the plugin manually
+        $published_folder  = base_path() . '/resources' . env('APPLICATION_REFERENCE') . 'addons/wirelab/language_switcher-plugin/views'; // The locations of the views if the user published the views
 
         // Try to find the views folder
-        if (file_exists($manual_folder)) {
+       if ($filesystem->exists($published_folder)) {
+            $views_dir = published_folder;
+       } elseif ($filesystem->exists($manual_folder)) {
             $views_dir = $manual_folder;
-        } elseif(file_exists($composer_folder )) {
+        } elseif($filesystem->exists($composer_folder )) {
             $views_dir = $composer_folder;
         } else {
             // If we can't find it throw a new exception
-            throw new Exception("Couldn't find view folder.");
+            throw new Exception("[language_switcher-plugin] Couldn't find view folder.");
         }
-
-        foreach (File::allFiles($views_dir) as $file){
-            // Use the names of the views as types
-            $types[] = $file->getBaseName('.' . $file->getExtension());
+        foreach ($filesystem->allFiles($views_dir) as $file){
+            // Use the names of the views as networks
+            types[] = $file->getBaseName('.' . $file->getExtension());
         }
 
         if (!in_array($type, $types)) {