diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 8b84343cae..5b6a54904f 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -27,6 +27,7 @@ namespace App\Http\Controllers; use App\Http\Requests\StoreUserRequest; use App\Http\Requests\UpdateUserRequest; +use App\Models\AuthLog; use App\Models\Dashboard; use App\Models\User; use App\Models\UserPref; @@ -212,4 +213,13 @@ class UserController extends Controller return false; } + + public function authlog() + { + $this->authorize('manage', User::class); + + return view('user.authlog', [ + 'authlog' => AuthLog::orderBy('datetime', 'DESC')->get(), + ]); + } } diff --git a/app/Models/AuthLog.php b/app/Models/AuthLog.php new file mode 100644 index 0000000000..261679ec69 --- /dev/null +++ b/app/Models/AuthLog.php @@ -0,0 +1,35 @@ +. + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2018 Tony Murray + * @author Tony Murray + */ + +namespace App\Models; + +use Illuminate\Database\Eloquent\Model; + +class AuthLog extends Model +{ + public $timestamps = false; + protected $table = 'authlog'; + protected $dates = ['datetime']; +} diff --git a/includes/html/pages/authlog.inc.php b/includes/html/pages/authlog.inc.php deleted file mode 100644 index fc0231f570..0000000000 --- a/includes/html/pages/authlog.inc.php +++ /dev/null @@ -1,42 +0,0 @@ -Authlog"; -if (Auth::user()->hasGlobalAdmin()) { - echo ''; - echo ""; - foreach (dbFetchRows("SELECT *,DATE_FORMAT(datetime, '" . \LibreNMS\Config::get('dateformat.mysql.compact') . "') as humandate FROM `authlog` ORDER BY `datetime` DESC LIMIT 0,250") as $entry) { - if ($bg == \LibreNMS\Config::get('list_colour.even')) { - $bg = \LibreNMS\Config::get('list_colour.odd'); - } else { - $bg = \LibreNMS\Config::get('list_colour.even'); - } - - echo " - - - - - '; - }//end foreach - - $pagetitle[] = 'Authlog'; - - echo '
TimestampUserIP AddressResult
- ".$entry['datetime'].' - - '.$entry['user'].' - - '.$entry['address'].' - - '.$entry['result'].' -
'; -} else { - include 'includes/html/error-no-perm.inc.php'; -}//end if -?> - diff --git a/resources/views/user/authlog.blade.php b/resources/views/user/authlog.blade.php new file mode 100644 index 0000000000..56cb0b9eae --- /dev/null +++ b/resources/views/user/authlog.blade.php @@ -0,0 +1,51 @@ +@extends('layouts.librenmsv1') + +@section('title', __('Authlog')) + +@section('content') +
+
+
+

@lang('Authlog')

+
+
+
+ + + + + + + + + + + @foreach($authlog as $log) + + + + + + + @endforeach + + +
+
+
+
+@endsection + +@section('scripts') + +@endsection + +@section('css') + +@endsection diff --git a/routes/web.php b/routes/web.php index 82cff1bee5..c2e072fe5f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -27,6 +27,7 @@ Route::group(['middleware' => ['auth', '2fa'], 'guard' => 'auth'], function () { Route::resource('preferences', 'UserPreferencesController', ['only' => ['index', 'store']]); Route::resource('users', 'UserController'); Route::get('about', 'AboutController@index'); + Route::get('authlog', 'UserController@authlog'); // old route redirects Route::permanentRedirect('poll-log', 'pollers/tab=log/');