Merge branch 'master' of ascarion.org:daniel/dumbo

This commit is contained in:
2013-12-03 21:56:08 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -146,7 +146,7 @@ Route::post('login', function() {
$userdata = array(
'name' => Input::get('user'),
'password' => Input::get('password'));
if(Auth::attempt($userdata)) {
if(Auth::attempt($userdata, true)) {
return Redirect::intended('/');
} else {
echo "Login gescheitert.";

View File

@@ -27,7 +27,7 @@
<div class="panel-body">
<img src="{{$nimage}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{is_object($nextfilm) ? $nextfilm->name : "Steht nicht fest"}}</h4>
@if(is_object($nextfilm)) <a href='{{ url('mark-read/' . $nextfilm->id) }}' class='btn btn-success btn-xs'>Gesehen</a>
@if(is_object($nextfilm) && !is_null(Auth::user()) && Auth::user()->admin) <a href='{{ url('mark-read/' . $nextfilm->id) }}' class='btn btn-success btn-xs'>Gesehen</a>
@endif
</div>