colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added options to allow whole site to be made public. Fixes #3.

This commit is contained in:
Dan Brown 2015-08-31 12:29:48 +01:00
parent a5807097e2
commit ee8795dcda
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Middleware/Authenticate.php
View File

@ -4,6 +4,7 @@ namespace Oxbow\Http\Middleware;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
use Setting;
class Authenticate class Authenticate
{ {
@ -33,7 +34,8 @@ class Authenticate
*/ */
public function handle($request, Closure $next) public function handle($request, Closure $next)
{ {
if ($this->auth->guest()) { $sitePublic = Setting::get('app-public', false) === 'true';
if ($this->auth->guest() && !$sitePublic) {
if ($request->ajax()) { if ($request->ajax()) {
return response('Unauthorized.', 401); return response('Unauthorized.', 401);
} else { } else {

3
app/User.php
View File

@ -68,6 +68,9 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*/ */
public function can($permissionName) public function can($permissionName)
{ {
if($this->email == 'guest') {
return false;
}
$permissions = $this->role->permissions()->get(); $permissions = $this->role->permissions()->get();
$permissionSearch = $permissions->search(function ($item, $key) use ($permissionName) { $permissionSearch = $permissions->search(function ($item, $key) use ($permissionName) {
return $item->name == $permissionName; return $item->name == $permissionName;

2
resources/views/base.blade.php
View File

@ -64,6 +64,7 @@
<a href="/settings"><i class="zmdi zmdi-settings"></i>Settings</a> <a href="/settings"><i class="zmdi zmdi-settings"></i>Settings</a>
@endif @endif
</div> </div>
@if($signedIn)
<img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}"> <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
<div class="dropdown-container" data-dropdown> <div class="dropdown-container" data-dropdown>
<span class="user-name" data-dropdown-toggle> <span class="user-name" data-dropdown-toggle>
@ -78,6 +79,7 @@
</li> </li>
</ul> </ul>
</div> </div>
@endif
</div> </div>
</div> </div>

5
resources/views/settings/index.blade.php
View File

@ -13,6 +13,11 @@
<label for="setting-app-name">Application Name</label> <label for="setting-app-name">Application Name</label>
<input type="text" value="{{ Setting::get('app-name') }}" name="setting-app-name" id="setting-app-name"> <input type="text" value="{{ Setting::get('app-name') }}" name="setting-app-name" id="setting-app-name">
</div> </div>
<div class="form-group">
<label for="setting-app-public">Allow public viewing?</label>
<label><input type="radio" name="setting-app-public" @if(Setting::get('app-public') == 'true') checked @endif value="true"> Yes</label>
<label><input type="radio" name="setting-app-public" @if(Setting::get('app-public') == 'false') checked @endif value="false"> No</label>
</div>
<div class="form-group"> <div class="form-group">
<button type="submit" class="button pos">Update Settings</button> <button type="submit" class="button pos">Update Settings</button>
</div> </div>