Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

[bookstack] / config / app.php

diff --git a/config/app.php b/config/app.php
index 9780558b9ad715246b5450566e26c062cf9def84..54cdca21bb25893d8c5b85aa4bc78a5eb10aa891 100644 (file)
--- a/config/app.php
+++ b/config/app.php
@@ -2,6 +2,11 @@
 
 return [
 
 
 return [
 

+
+    'env' => env('APP_ENV', 'production'),
+
+    'editor' => env('APP_EDITOR', 'html'),
+

     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode
     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode


@@ -13,7 +18,7 @@ return [
     |
     */
 
     |
     */
 

-    'debug'           => env('APP_DEBUG', false),
+    'debug' => env('APP_DEBUG', false),

 
     /*
     |--------------------------------------------------------------------------
 
     /*
     |--------------------------------------------------------------------------


@@ -26,7 +31,7 @@ return [
     |
     */
 
     |
     */
 

-    'url'             => env('APP_URL', 'http://localhost'),
+    'url' => env('APP_URL', '') === 'http://bookstack.dev' ? '' : env('APP_URL', ''),

 
     /*
     |--------------------------------------------------------------------------
 
     /*
     |--------------------------------------------------------------------------


@@ -39,7 +44,7 @@ return [
     |
     */
 
     |
     */
 

-    'timezone'        => 'UTC',
+    'timezone' => 'UTC',

 
     /*
     |--------------------------------------------------------------------------
 
     /*
     |--------------------------------------------------------------------------


@@ -52,7 +57,8 @@ return [
     |
     */
 
     |
     */
 

-    'locale'          => 'en',
+    'locale' => env('APP_LANG', 'en'),
+    'locales' => ['en', 'de', 'es', 'fr', 'nl', 'pt_BR', 'sk'],

 
     /*
     |--------------------------------------------------------------------------
 
     /*
     |--------------------------------------------------------------------------


@@ -78,9 +84,9 @@ return [
     |
     */
 
     |
     */
 

-    'key'             => env('APP_KEY', 'AbAZchsay4uBTU33RubBzLKw203yqSqr'),
+    'key' => env('APP_KEY', 'AbAZchsay4uBTU33RubBzLKw203yqSqr'),

 
 

-    'cipher'          => 'AES-256-CBC',
+    'cipher' => 'AES-256-CBC',

 
     /*
     |--------------------------------------------------------------------------
 
     /*
     |--------------------------------------------------------------------------


@@ -95,7 +101,7 @@ return [
     |
     */
 
     |
     */
 

-    'log'             => 'single',
+    'log' => env('APP_LOGGING', 'single'),

 
     /*
     |--------------------------------------------------------------------------
 
     /*
     |--------------------------------------------------------------------------


@@ -108,18 +114,16 @@ return [
     |
     */
 
     |
     */
 

-    'providers'       => [
+    'providers' => [

 
         /*
          * Laravel Framework Service Providers...
          */
 
         /*
          * Laravel Framework Service Providers...
          */

-        Illuminate\Foundation\Providers\ArtisanServiceProvider::class,

         Illuminate\Auth\AuthServiceProvider::class,
         Illuminate\Broadcasting\BroadcastServiceProvider::class,
         Illuminate\Bus\BusServiceProvider::class,
         Illuminate\Cache\CacheServiceProvider::class,
         Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
         Illuminate\Auth\AuthServiceProvider::class,
         Illuminate\Broadcasting\BroadcastServiceProvider::class,
         Illuminate\Bus\BusServiceProvider::class,
         Illuminate\Cache\CacheServiceProvider::class,
         Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,

-        Illuminate\Routing\ControllerServiceProvider::class,

         Illuminate\Cookie\CookieServiceProvider::class,
         Illuminate\Database\DatabaseServiceProvider::class,
         Illuminate\Encryption\EncryptionServiceProvider::class,
         Illuminate\Cookie\CookieServiceProvider::class,
         Illuminate\Database\DatabaseServiceProvider::class,
         Illuminate\Encryption\EncryptionServiceProvider::class,


@@ -127,7 +131,6 @@ return [
         Illuminate\Foundation\Providers\FoundationServiceProvider::class,
         Illuminate\Hashing\HashServiceProvider::class,
         Illuminate\Mail\MailServiceProvider::class,
         Illuminate\Foundation\Providers\FoundationServiceProvider::class,
         Illuminate\Hashing\HashServiceProvider::class,
         Illuminate\Mail\MailServiceProvider::class,

-        Illuminate\Pagination\PaginationServiceProvider::class,

         Illuminate\Pipeline\PipelineServiceProvider::class,
         Illuminate\Queue\QueueServiceProvider::class,
         Illuminate\Redis\RedisServiceProvider::class,
         Illuminate\Pipeline\PipelineServiceProvider::class,
         Illuminate\Queue\QueueServiceProvider::class,
         Illuminate\Redis\RedisServiceProvider::class,


@@ -136,22 +139,30 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,

-        Laravel\Socialite\SocialiteServiceProvider::class,
+        Illuminate\Notifications\NotificationServiceProvider::class,
+        SocialiteProviders\Manager\ServiceProvider::class,

 
         /**
          * Third Party
          */
         Intervention\Image\ImageServiceProvider::class,
 
         /**
          * Third Party
          */
         Intervention\Image\ImageServiceProvider::class,

+        Barryvdh\DomPDF\ServiceProvider::class,

         Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
         Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,

+        Barryvdh\Debugbar\ServiceProvider::class,
+        Barryvdh\Snappy\ServiceProvider::class,

 
 
         /*
          * Application Service Providers...
          */
 
 
         /*
          * Application Service Providers...
          */

-        Oxbow\Providers\AppServiceProvider::class,
-        Oxbow\Providers\EventServiceProvider::class,
-        Oxbow\Providers\RouteServiceProvider::class,
-        Oxbow\Providers\CustomFacadeProvider::class,
+        BookStack\Providers\PaginationServiceProvider::class,
+
+        BookStack\Providers\AuthServiceProvider::class,
+        BookStack\Providers\AppServiceProvider::class,
+        BookStack\Providers\BroadcastServiceProvider::class,
+        BookStack\Providers\EventServiceProvider::class,
+        BookStack\Providers\RouteServiceProvider::class,
+        BookStack\Providers\CustomFacadeProvider::class,

 
     ],
 
 
     ],
 


@@ -166,7 +177,7 @@ return [
     |
     */
 
     |
     */
 

-    'aliases'         => [
+    'aliases' => [

 
         'App'       => Illuminate\Support\Facades\App::class,
         'Artisan'   => Illuminate\Support\Facades\Artisan::class,
 
         'App'       => Illuminate\Support\Facades\App::class,
         'Artisan'   => Illuminate\Support\Facades\Artisan::class,


@@ -187,6 +198,7 @@ return [
         'Lang'      => Illuminate\Support\Facades\Lang::class,
         'Log'       => Illuminate\Support\Facades\Log::class,
         'Mail'      => Illuminate\Support\Facades\Mail::class,
         'Lang'      => Illuminate\Support\Facades\Lang::class,
         'Log'       => Illuminate\Support\Facades\Log::class,
         'Mail'      => Illuminate\Support\Facades\Mail::class,

+        'Notification' => Illuminate\Support\Facades\Notification::class,

         'Password'  => Illuminate\Support\Facades\Password::class,
         'Queue'     => Illuminate\Support\Facades\Queue::class,
         'Redirect'  => Illuminate\Support\Facades\Redirect::class,
         'Password'  => Illuminate\Support\Facades\Password::class,
         'Queue'     => Illuminate\Support\Facades\Queue::class,
         'Redirect'  => Illuminate\Support\Facades\Redirect::class,


@@ -207,13 +219,18 @@ return [
          */
 
         'ImageTool' => Intervention\Image\Facades\Image::class,
          */
 
         'ImageTool' => Intervention\Image\Facades\Image::class,

+        'PDF' => Barryvdh\DomPDF\Facade::class,
+        'SnappyPDF' => Barryvdh\Snappy\Facades\SnappyPdf::class,
+        'Debugbar'  => Barryvdh\Debugbar\Facade::class,

 
         /**
          * Custom
          */
 
 
         /**
          * Custom
          */
 

-        'Activity'  => Oxbow\Services\Facades\Activity::class,
-        'Setting'   => Oxbow\Services\Facades\Setting::class,
+        'Activity' => BookStack\Services\Facades\Activity::class,
+        'Setting'  => BookStack\Services\Facades\Setting::class,
+        'Views'    => BookStack\Services\Facades\Views::class,
+        'Images'   => \BookStack\Services\Facades\Images::class,

 
     ],
 
 
     ],