daniel/dumbo
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel
2013-12-03 21:56:08 +01:00
parent 85b60ffbda a66ad460e8
commit 978ab8d2c3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/routes.php
View File

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

2
app/views/index.blade.php
View File

@@ -27,7 +27,7 @@
<div class="panel-body"> <div class="panel-body">
<img src="{{$nimage}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;"> <img src="{{$nimage}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{is_object($nextfilm) ? $nextfilm->name : "Steht nicht fest"}}</h4> <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 @endif
</div> </div>