Merge branch 'master' into release

@@ -49,6 +49,7 @@ class RegeneratePermissions extends Command
         $connection = \DB::getDefaultConnection();
         $connection = \DB::getDefaultConnection();
         if ($this->option('database') !== null) {
         if ($this->option('database') !== null) {
             \DB::setDefaultConnection($this->option('database'));
             \DB::setDefaultConnection($this->option('database'));
+            $this->permissionService->setConnection(\DB::connection($this->option('database')));
         }
         }
 
 
         $this->permissionService->buildJointPermissions();
         $this->permissionService->buildJointPermissions();

@@ -44,6 +44,7 @@ class RegenerateSearch extends Command
         $connection = \DB::getDefaultConnection();
         $connection = \DB::getDefaultConnection();
         if ($this->option('database') !== null) {
         if ($this->option('database') !== null) {
             \DB::setDefaultConnection($this->option('database'));
             \DB::setDefaultConnection($this->option('database'));
+            $this->searchService->setConnection(\DB::connection($this->option('database')));
         }
         }
 
 
         $this->searchService->indexAllEntities();
         $this->searchService->indexAllEntities();

@@ -95,17 +95,6 @@ class Entity extends Ownable
     }
     }
 
 
     /**
     /**
-     * Check if this entity has live (active) restrictions in place.
-     * @param $role_id
-     * @param $action
-     * @return bool
-     */
-    public function hasActiveRestriction($role_id, $action)
-    {
-        return $this->getRawAttribute('restricted') && $this->hasRestriction($role_id, $action);
-    }
-
-    /**
      * Get the entity jointPermissions this is connected to.
      * Get the entity jointPermissions this is connected to.
      * @return \Illuminate\Database\Eloquent\Relations\MorphMany
      * @return \Illuminate\Database\Eloquent\Relations\MorphMany
      */
      */
@@ -176,5 +165,11 @@ class Entity extends Ownable
      */
      */
     public function entityRawQuery(){return '';}
     public function entityRawQuery(){return '';}
 
 
+    /**
+     * Get the url of this entity
+     * @param $path
+     * @return string
+     */
+    public function getUrl($path){return '/';}
 
 
 }
 }

 <?php namespace BookStack\Http\Controllers;
 <?php namespace BookStack\Http\Controllers;
 
 
 use Activity;
 use Activity;
+use BookStack\Book;
 use BookStack\Repos\EntityRepo;
 use BookStack\Repos\EntityRepo;
 use BookStack\Repos\UserRepo;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\ExportService;
 use BookStack\Services\ExportService;
@@ -207,13 +208,12 @@ class BookController extends Controller
 
 
         // Add activity for books
         // Add activity for books
         foreach ($sortedBooks as $bookId) {
         foreach ($sortedBooks as $bookId) {
+            /** @var Book $updatedBook */
             $updatedBook = $this->entityRepo->getById('book', $bookId);
             $updatedBook = $this->entityRepo->getById('book', $bookId);
+            $this->entityRepo->buildJointPermissionsForBook($updatedBook);
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
             Activity::add($updatedBook, 'book_sort', $updatedBook->id);
         }
         }
 
 
-        // Update permissions on changed models
-        if (count($updatedModels) === 0) $this->entityRepo->buildJointPermissions($updatedModels);
-
         return redirect($book->getUrl());
         return redirect($book->getUrl());
     }
     }
 
 

@@ -46,7 +46,7 @@ class HomeController extends Controller
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
      */
      */
     public function getTranslations() {
     public function getTranslations() {
-        $locale = trans()->getLocale();
+        $locale = app()->getLocale();
         $cacheKey = 'GLOBAL_TRANSLATIONS_' . $locale;
         $cacheKey = 'GLOBAL_TRANSLATIONS_' . $locale;
         if (cache()->has($cacheKey) && config('app.env') !== 'development') {
         if (cache()->has($cacheKey) && config('app.env') !== 'development') {
             $resp = cache($cacheKey);
             $resp = cache($cacheKey);

@@ -15,7 +15,17 @@ class Localization
     public function handle($request, Closure $next)
     public function handle($request, Closure $next)
     {
     {
         $defaultLang = config('app.locale');
         $defaultLang = config('app.locale');
-        $locale = setting()->getUser(user(), 'language', $defaultLang);
+        if (user()->isDefault()) {
+            $locale = $defaultLang;
+            $availableLocales = config('app.locales');
+            foreach ($request->getLanguages() as $lang) {
+                if (!in_array($lang, $availableLocales)) continue;
+                $locale = $lang;
+                break;
+            }
+        } else {
+            $locale = setting()->getUser(user(), 'language', $defaultLang);
+        }
         app()->setLocale($locale);
         app()->setLocale($locale);
         Carbon::setLocale($locale);
         Carbon::setLocale($locale);
         return $next($request);
         return $next($request);

@@ -533,11 +533,11 @@ class EntityRepo
 
 
     /**
     /**
      * Alias method to update the book jointPermissions in the PermissionService.
      * Alias method to update the book jointPermissions in the PermissionService.
-     * @param Collection $collection collection on entities
+     * @param Book $book
      */
      */
-    public function buildJointPermissions(Collection $collection)
+    public function buildJointPermissionsForBook(Book $book)
     {
     {
-        $this->permissionService->buildJointPermissionsForEntities($collection);
+        $this->permissionService->buildJointPermissionsForEntity($book);
     }
     }
 
 
     /**
     /**
@@ -730,6 +730,7 @@ class EntityRepo
         if ($chapter) $page->chapter_id = $chapter->id;
         if ($chapter) $page->chapter_id = $chapter->id;
 
 
         $book->pages()->save($page);
         $book->pages()->save($page);
+        $page = $this->page->find($page->id);
         $this->permissionService->buildJointPermissionsForEntity($page);
         $this->permissionService->buildJointPermissionsForEntity($page);
         return $page;
         return $page;
     }
     }

@@ -51,6 +51,15 @@ class SearchService
     }
     }
 
 
     /**
     /**
+     * Set the database connection
+     * @param Connection $connection
+     */
+    public function setConnection(Connection $connection)
+    {
+        $this->db = $connection;
+    }
+
+    /**
      * Search all entities in the system.
      * Search all entities in the system.
      * @param string $searchString
      * @param string $searchString
      * @param string $entityType
      * @param string $entityType

@@ -58,6 +58,7 @@ return [
     */
     */
 
 
     'locale' => env('APP_LANG', 'en'),
     'locale' => env('APP_LANG', 'en'),
+    'locales' => ['en', 'de', 'es', 'fr', 'nl', 'pt_BR', 'sk'],
 
 
     /*
     /*
     |--------------------------------------------------------------------------
     |--------------------------------------------------------------------------

@@ -28,6 +28,12 @@ class DummyContentSeeder extends Seeder
                 $book->pages()->saveMany($pages);
                 $book->pages()->saveMany($pages);
             });
             });
 
 
+        $largeBook = factory(\BookStack\Book::class)->create(['name' => 'Large book' . str_random(10), 'created_by' => $user->id, 'updated_by' => $user->id]);
+        $pages = factory(\BookStack\Page::class, 200)->make(['created_by' => $user->id, 'updated_by' => $user->id]);
+        $chapters = factory(\BookStack\Chapter::class, 50)->make(['created_by' => $user->id, 'updated_by' => $user->id]);
+        $largeBook->pages()->saveMany($pages);
+        $largeBook->chapters()->saveMany($chapters);
+
         app(\BookStack\Services\PermissionService::class)->buildJointPermissions();
         app(\BookStack\Services\PermissionService::class)->buildJointPermissions();
         app(\BookStack\Services\SearchService::class)->indexAllEntities();
         app(\BookStack\Services\SearchService::class)->indexAllEntities();
     }
     }

@@ -43,6 +43,8 @@ Once done you can run `phpunit` in the application root directory to run all tes
 ## Translations
 ## Translations
 
 
 As part of BookStack v0.14 support for translations has been built in. All text strings can be found in the `resources/lang` folder where each language option has its own folder. To add a new language you should copy the `en` folder to an new folder (eg. `fr` for french) then go through and translate all text strings in those files, leaving the keys and file-names intact. If a language string is missing then the `en` translation will be used. To show the language option in the user preferences language drop-down you will need to add your language to the options found at the bottom of the `resources/lang/en/settings.php` file. A system-wide language can also be set in the `.env` file like so: `APP_LANG=en`.
 As part of BookStack v0.14 support for translations has been built in. All text strings can be found in the `resources/lang` folder where each language option has its own folder. To add a new language you should copy the `en` folder to an new folder (eg. `fr` for french) then go through and translate all text strings in those files, leaving the keys and file-names intact. If a language string is missing then the `en` translation will be used. To show the language option in the user preferences language drop-down you will need to add your language to the options found at the bottom of the `resources/lang/en/settings.php` file. A system-wide language can also be set in the `.env` file like so: `APP_LANG=en`.
+
+You will also need to add the language to the `locales` array in the `config/app.php` file.
  
  
  Some strings have colon-prefixed variables in such as `:userName`. Leave these values as they are as they will be replaced at run-time.
  Some strings have colon-prefixed variables in such as `:userName`. Leave these values as they are as they will be replaced at run-time.
  
  

@@ -215,7 +215,7 @@ module.exports = function (ngApp, events) {
         }
         }
     }]);
     }]);
 
 
-    const md = new MarkdownIt();
+    const md = new MarkdownIt({html: true});
     md.use(mdTasksLists, {label: true});
     md.use(mdTasksLists, {label: true});
 
 
     /**
     /**

@@ -166,7 +166,7 @@ return [
         'start_a' => ':count usuarios han comenzado a editar esta página',
         'start_a' => ':count usuarios han comenzado a editar esta página',
         'start_b' => ':userName ha comenzado a editar esta página',
         'start_b' => ':userName ha comenzado a editar esta página',
         'time_a' => 'desde que las página fue actualizada',
         'time_a' => 'desde que las página fue actualizada',
-        'time_b' => 'en los Ãltimos :minCount minutos',
+        'time_b' => 'en los últimos :minCount minutos',
         'message' => ':start :time. Ten cuidado de no sobreescribir los cambios del otro usuario',
         'message' => ':start :time. Ten cuidado de no sobreescribir los cambios del otro usuario',
     ],
     ],
     'pages_draft_discarded' => 'Borrador descartado, el editor ha sido actualizado con el contenido de la página actual',
     'pages_draft_discarded' => 'Borrador descartado, el editor ha sido actualizado con el contenido de la página actual',
@@ -189,7 +189,7 @@ return [
     'attachments_set_link' => 'Setear Link',
     'attachments_set_link' => 'Setear Link',
     'attachments_delete_confirm' => 'Haga click en borrar nuevamente para confirmar que quiere borrar este adjunto.',
     'attachments_delete_confirm' => 'Haga click en borrar nuevamente para confirmar que quiere borrar este adjunto.',
     'attachments_dropzone' => 'Arrastre ficheros aquío haga click aquípara adjuntar un fichero',
     'attachments_dropzone' => 'Arrastre ficheros aquío haga click aquípara adjuntar un fichero',
-    'attachments_no_files' => 'NingÃn fichero ha sido adjuntado',
+    'attachments_no_files' => 'Ningún fichero ha sido adjuntado',
     'attachments_explain_link' => 'Ud. puede agregar un link o si lo prefiere puede agregar un fichero. Esto puede ser un link a otra página o un link a un fichero en la nube.',
     'attachments_explain_link' => 'Ud. puede agregar un link o si lo prefiere puede agregar un fichero. Esto puede ser un link a otra página o un link a un fichero en la nube.',
     'attachments_link_name' => 'Nombre de Link',
     'attachments_link_name' => 'Nombre de Link',
     'attachment_link' => 'Link adjunto',
     'attachment_link' => 'Link adjunto',

 <?php namespace Tests;
 <?php namespace Tests;
 
 
 use BookStack\Role;
 use BookStack\Role;
+use BookStack\Services\PermissionService;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Laravel\BrowserKitTesting\TestCase;
 use Laravel\BrowserKitTesting\TestCase;
@@ -105,11 +106,9 @@ abstract class BrowserKitTest extends TestCase
     {
     {
         if ($updaterUser === false) $updaterUser = $creatorUser;
         if ($updaterUser === false) $updaterUser = $creatorUser;
         $book = factory(\BookStack\Book::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
         $book = factory(\BookStack\Book::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
-        $chapter = factory(\BookStack\Chapter::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
-        $page = factory(\BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
-        $book->chapters()->saveMany([$chapter]);
-        $chapter->pages()->saveMany([$page]);
-        $restrictionService = $this->app[\BookStack\Services\PermissionService::class];
+        $chapter = factory(\BookStack\Chapter::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
+        $page = factory(\BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id, 'chapter_id' => $chapter->id]);
+        $restrictionService = $this->app[PermissionService::class];
         $restrictionService->buildJointPermissionsForEntity($book);
         $restrictionService->buildJointPermissionsForEntity($book);
         return [
         return [
             'book' => $book,
             'book' => $book,

@@ -42,7 +42,7 @@ class EntitySearchTest extends TestCase
 
 
     public function test_book_search()
     public function test_book_search()
     {
     {
-        $book = \BookStack\Book::all()->first();
+        $book = \BookStack\Book::first();
         $page = $book->pages->last();
         $page = $book->pages->last();
         $chapter = $book->chapters->last();
         $chapter = $book->chapters->last();
 
 

 <?php namespace Tests;
 <?php namespace Tests;
 
 
+use BookStack\Role;
 use BookStack\Tag;
 use BookStack\Tag;
 use BookStack\Page;
 use BookStack\Page;
 use BookStack\Services\PermissionService;
 use BookStack\Services\PermissionService;

@@ -14,6 +14,23 @@ class LanguageTest extends TestCase
         $this->langs = array_diff(scandir(resource_path('lang')), ['..', '.']);
         $this->langs = array_diff(scandir(resource_path('lang')), ['..', '.']);
     }
     }
 
 
+    public function test_locales_config_key_set_properly()
+    {
+        $configLocales = config('app.locales');
+        sort($configLocales);
+        sort($this->langs);
+        $this->assertTrue(implode(':', $this->langs) === implode(':', $configLocales), 'app.locales configuration variable matches found lang files');
+    }
+
+    public function test_correct_language_if_not_logged_in()
+    {
+        $loginReq = $this->get('/login');
+        $loginReq->assertSee('Log In');
+
+        $loginPageFrenchReq = $this->get('/login', ['Accept-Language' => 'fr']);
+        $loginPageFrenchReq->assertSee('Se Connecter');
+    }
+
     public function test_js_endpoint_for_each_language()
     public function test_js_endpoint_for_each_language()
     {
     {
 
 

@@ -226,6 +226,7 @@ class RestrictionsTest extends BrowserKitTest
             ->type('test content', 'html')
             ->type('test content', 'html')
             ->press('Save Page')
             ->press('Save Page')
             ->seePageIs($chapter->book->getUrl() . '/page/test-page');
             ->seePageIs($chapter->book->getUrl() . '/page/test-page');
+
         $this->visit($chapterUrl)->seeInElement('.action-buttons', 'New Page');
         $this->visit($chapterUrl)->seeInElement('.action-buttons', 'New Page');
     }
     }
 
 

 <?php namespace Tests;
 <?php namespace Tests;
 
 
+use BookStack\Repos\PermissionsRepo;
+use BookStack\Role;
+
 class RolesTest extends BrowserKitTest
 class RolesTest extends BrowserKitTest
 {
 {
     protected $user;
     protected $user;
@@ -34,11 +37,11 @@ class RolesTest extends BrowserKitTest
     /**
     /**
      * Create a new basic role for testing purposes.
      * Create a new basic role for testing purposes.
      * @param array $permissions
      * @param array $permissions
-     * @return static
+     * @return Role
      */
      */
     protected function createNewRole($permissions = [])
     protected function createNewRole($permissions = [])
     {
     {
-        $permissionRepo = app('BookStack\Repos\PermissionsRepo');
+        $permissionRepo = app(PermissionsRepo::class);
         $roleData = factory(\BookStack\Role::class)->make()->toArray();
         $roleData = factory(\BookStack\Role::class)->make()->toArray();
         $roleData['permissions'] = array_flip($permissions);
         $roleData['permissions'] = array_flip($permissions);
         return $permissionRepo->saveNewRole($roleData);
         return $permissionRepo->saveNewRole($roleData);
@@ -107,16 +110,16 @@ class RolesTest extends BrowserKitTest
 
 
     public function test_manage_user_permission()
     public function test_manage_user_permission()
     {
     {
-        $this->actingAs($this->user)->visit('/')->visit('/settings/users')
+        $this->actingAs($this->user)->visit('/settings/users')
             ->seePageIs('/');
             ->seePageIs('/');
         $this->giveUserPermissions($this->user, ['users-manage']);
         $this->giveUserPermissions($this->user, ['users-manage']);
-        $this->actingAs($this->user)->visit('/')->visit('/settings/users')
+        $this->actingAs($this->user)->visit('/settings/users')
             ->seePageIs('/settings/users');
             ->seePageIs('/settings/users');
     }
     }
 
 
     public function test_user_roles_manage_permission()
     public function test_user_roles_manage_permission()
     {
     {
-        $this->actingAs($this->user)->visit('/')->visit('/settings/roles')
+        $this->actingAs($this->user)->visit('/settings/roles')
             ->seePageIs('/')->visit('/settings/roles/1')->seePageIs('/');
             ->seePageIs('/')->visit('/settings/roles/1')->seePageIs('/');
         $this->giveUserPermissions($this->user, ['user-roles-manage']);
         $this->giveUserPermissions($this->user, ['user-roles-manage']);
         $this->actingAs($this->user)->visit('/settings/roles')
         $this->actingAs($this->user)->visit('/settings/roles')
@@ -126,10 +129,10 @@ class RolesTest extends BrowserKitTest
 
 
     public function test_settings_manage_permission()
     public function test_settings_manage_permission()
     {
     {
-        $this->actingAs($this->user)->visit('/')->visit('/settings')
+        $this->actingAs($this->user)->visit('/settings')
             ->seePageIs('/');
             ->seePageIs('/');
         $this->giveUserPermissions($this->user, ['settings-manage']);
         $this->giveUserPermissions($this->user, ['settings-manage']);
-        $this->actingAs($this->user)->visit('/')->visit('/settings')
+        $this->actingAs($this->user)->visit('/settings')
             ->seePageIs('/settings')->press('Save Settings')->see('Settings Saved');
             ->seePageIs('/settings')->press('Save Settings')->see('Settings Saved');
     }
     }
 
 
@@ -181,27 +184,26 @@ class RolesTest extends BrowserKitTest
      * @param string $permission
      * @param string $permission
      * @param array $accessUrls Urls that are only accessible after having the permission
      * @param array $accessUrls Urls that are only accessible after having the permission
      * @param array $visibles Check this text, In the buttons toolbar, is only visible with the permission
      * @param array $visibles Check this text, In the buttons toolbar, is only visible with the permission
-     * @param null $callback
      */
      */
     private function checkAccessPermission($permission, $accessUrls = [], $visibles = [])
     private function checkAccessPermission($permission, $accessUrls = [], $visibles = [])
     {
     {
         foreach ($accessUrls as $url) {
         foreach ($accessUrls as $url) {
-            $this->actingAs($this->user)->visit('/')->visit($url)
+            $this->actingAs($this->user)->visit($url)
                 ->seePageIs('/');
                 ->seePageIs('/');
         }
         }
         foreach ($visibles as $url => $text) {
         foreach ($visibles as $url => $text) {
-            $this->actingAs($this->user)->visit('/')->visit($url)
+            $this->actingAs($this->user)->visit($url)
                 ->dontSeeInElement('.action-buttons',$text);
                 ->dontSeeInElement('.action-buttons',$text);
         }
         }
 
 
         $this->giveUserPermissions($this->user, [$permission]);
         $this->giveUserPermissions($this->user, [$permission]);
 
 
         foreach ($accessUrls as $url) {
         foreach ($accessUrls as $url) {
-            $this->actingAs($this->user)->visit('/')->visit($url)
+            $this->actingAs($this->user)->visit($url)
                 ->seePageIs($url);
                 ->seePageIs($url);
         }
         }
         foreach ($visibles as $url => $text) {
         foreach ($visibles as $url => $text) {
-            $this->actingAs($this->user)->visit('/')->visit($url)
+            $this->actingAs($this->user)->visit($url)
                 ->see($text);
                 ->see($text);
         }
         }
     }
     }
@@ -391,8 +393,8 @@ class RolesTest extends BrowserKitTest
 
 
     public function test_page_create_own_permissions()
     public function test_page_create_own_permissions()
     {
     {
-        $book = \BookStack\Book::take(1)->get()->first();
-        $chapter = \BookStack\Chapter::take(1)->get()->first();
+        $book = \BookStack\Book::first();
+        $chapter = \BookStack\Chapter::first();
 
 
         $entities = $this->createEntityChainBelongingToUser($this->user);
         $entities = $this->createEntityChainBelongingToUser($this->user);
         $ownBook = $entities['book'];
         $ownBook = $entities['book'];
@@ -405,7 +407,7 @@ class RolesTest extends BrowserKitTest
         $accessUrls = [$createUrl, $createUrlChapter];
         $accessUrls = [$createUrl, $createUrlChapter];
 
 
         foreach ($accessUrls as $url) {
         foreach ($accessUrls as $url) {
-            $this->actingAs($this->user)->visit('/')->visit($url)
+            $this->actingAs($this->user)->visit($url)
                 ->seePageIs('/');
                 ->seePageIs('/');
         }
         }
 
 
@@ -417,7 +419,7 @@ class RolesTest extends BrowserKitTest
         $this->giveUserPermissions($this->user, ['page-create-own']);
         $this->giveUserPermissions($this->user, ['page-create-own']);
 
 
         foreach ($accessUrls as $index => $url) {
         foreach ($accessUrls as $index => $url) {
-            $this->actingAs($this->user)->visit('/')->visit($url);
+            $this->actingAs($this->user)->visit($url);
             $expectedUrl = \BookStack\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();
             $expectedUrl = \BookStack\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();
             $this->seePageIs($expectedUrl);
             $this->seePageIs($expectedUrl);
         }
         }
@@ -449,7 +451,7 @@ class RolesTest extends BrowserKitTest
         $accessUrls = [$createUrl, $createUrlChapter];
         $accessUrls = [$createUrl, $createUrlChapter];
 
 
         foreach ($accessUrls as $url) {
         foreach ($accessUrls as $url) {
-            $this->actingAs($this->user)->visit('/')->visit($url)
+            $this->actingAs($this->user)->visit($url)
                 ->seePageIs('/');
                 ->seePageIs('/');
         }
         }
 
 
@@ -461,7 +463,7 @@ class RolesTest extends BrowserKitTest
         $this->giveUserPermissions($this->user, ['page-create-all']);
         $this->giveUserPermissions($this->user, ['page-create-all']);
 
 
         foreach ($accessUrls as $index => $url) {
         foreach ($accessUrls as $index => $url) {
-            $this->actingAs($this->user)->visit('/')->visit($url);
+            $this->actingAs($this->user)->visit($url);
             $expectedUrl = \BookStack\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();
             $expectedUrl = \BookStack\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();
             $this->seePageIs($expectedUrl);
             $this->seePageIs($expectedUrl);
         }
         }