Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-07-17 08:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:BookStackApp/BookStack

Browse Source
This commit is contained in:
Dan Brown 2019-02-04 19:57:43 +00:00
commit df6f6e2d77
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
11 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Auth/Access/LdapService.php
View File

@ -176,8 +176,8 @@ class LdapService
* the LDAP_OPT_X_TLS_REQUIRE_CERT option. It can only be set globally and not * the LDAP_OPT_X_TLS_REQUIRE_CERT option. It can only be set globally and not
* per handle. * per handle.
*/ */
if($this->config['tls_insecure']) { if ($this->config['tls_insecure']) {
$this->ldap->setOption(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER); $this->ldap->setOption(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
} }
$ldapConnection = $this->ldap->connect($hostName, count($ldapServer) > 2 ? intval($ldapServer[2]) : $defaultPort); $ldapConnection = $this->ldap->connect($hostName, count($ldapServer) > 2 ? intval($ldapServer[2]) : $defaultPort);

22
app/Auth/Permissions/PermissionService.php
View File

@ -190,10 +190,10 @@ class PermissionService
{ {
return $this->entityProvider->book->newQuery() return $this->entityProvider->book->newQuery()
->select(['id', 'restricted', 'created_by'])->with(['chapters' => function ($query) { ->select(['id', 'restricted', 'created_by'])->with(['chapters' => function ($query) {
$query->select(['id', 'restricted', 'created_by', 'book_id']); $query->select(['id', 'restricted', 'created_by', 'book_id']);
}, 'pages' => function ($query) { }, 'pages' => function ($query) {
$query->select(['id', 'restricted', 'created_by', 'book_id', 'chapter_id']); $query->select(['id', 'restricted', 'created_by', 'book_id', 'chapter_id']);
}]); }]);
} }
/** /**
@ -612,13 +612,13 @@ class PermissionService
$entities = $this->entityProvider; $entities = $this->entityProvider;
$pageSelect = $this->db->table('pages')->selectRaw($entities->page->entityRawQuery($fetchPageContent)) $pageSelect = $this->db->table('pages')->selectRaw($entities->page->entityRawQuery($fetchPageContent))
->where('book_id', '=', $book_id)->where(function ($query) use ($filterDrafts) { ->where('book_id', '=', $book_id)->where(function ($query) use ($filterDrafts) {
$query->where('draft', '=', 0); $query->where('draft', '=', 0);
if (!$filterDrafts) { if (!$filterDrafts) {
$query->orWhere(function ($query) { $query->orWhere(function ($query) {
$query->where('draft', '=', 1)->where('created_by', '=', $this->currentUser()->id); $query->where('draft', '=', 1)->where('created_by', '=', $this->currentUser()->id);
}); });
} }
}); });
$chapterSelect = $this->db->table('chapters')->selectRaw($entities->chapter->entityRawQuery())->where('book_id', '=', $book_id); $chapterSelect = $this->db->table('chapters')->selectRaw($entities->chapter->entityRawQuery())->where('book_id', '=', $book_id);
$query = $this->db->query()->select('*')->from($this->db->raw("({$pageSelect->toSql()} UNION {$chapterSelect->toSql()}) AS U")) $query = $this->db->query()->select('*')->from($this->db->raw("({$pageSelect->toSql()} UNION {$chapterSelect->toSql()}) AS U"))
->mergeBindings($pageSelect)->mergeBindings($chapterSelect); ->mergeBindings($pageSelect)->mergeBindings($chapterSelect);

2
app/Entities/EntityProvider.php
View File

@ -84,6 +84,4 @@ class EntityProvider
$type = strtolower($type); $type = strtolower($type);
return $this->all()[$type]; return $this->all()[$type];
} }
} }

4
app/Exceptions/HttpFetchException.php
View File

@ -2,4 +2,6 @@
use Exception; use Exception;
class HttpFetchException extends Exception {} class HttpFetchException extends Exception
{
}

4
app/Exceptions/UserUpdateException.php
View File

@ -1,3 +1,5 @@
<?php namespace BookStack\Exceptions; <?php namespace BookStack\Exceptions;
class UserUpdateException extends NotifyException {} class UserUpdateException extends NotifyException
{
}

1
app/Notifications/MailNotification.php
View File

@ -31,5 +31,4 @@ class MailNotification extends Notification implements ShouldQueue
'text' => 'vendor.notifications.email-plain' 'text' => 'vendor.notifications.email-plain'
]); ]);
} }
} }

1
app/Notifications/ResetPassword.php
View File

@ -1,6 +1,5 @@
<?php namespace BookStack\Notifications; <?php namespace BookStack\Notifications;
class ResetPassword extends MailNotification class ResetPassword extends MailNotification
{ {
/** /**

1
app/Providers/TranslationServiceProvider.php
View File

@ -1,6 +1,5 @@
<?php namespace BookStack\Providers; <?php namespace BookStack\Providers;
use BookStack\Translation\Translator; use BookStack\Translation\Translator;
class TranslationServiceProvider extends \Illuminate\Translation\TranslationServiceProvider class TranslationServiceProvider extends \Illuminate\Translation\TranslationServiceProvider

2
app/Translation/Translator.php
View File

@ -1,6 +1,5 @@
<?php namespace BookStack\Translation; <?php namespace BookStack\Translation;
class Translator extends \Illuminate\Translation\Translator class Translator extends \Illuminate\Translation\Translator
{ {
@ -70,5 +69,4 @@ class Translator extends \Illuminate\Translation\Translator
{ {
return $this->baseLocaleMap[$locale] ?? null; return $this->baseLocaleMap[$locale] ?? null;
} }
} }

1
app/Uploads/HttpFetcher.php
View File

@ -30,5 +30,4 @@ class HttpFetcher
return $data; return $data;
} }
} }