From 2777fd61fe7573e3f5e34214f8616ebbb943642f Mon Sep 17 00:00:00 2001 From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com> Date: Fri, 16 Jun 2023 21:34:16 +0200 Subject: [PATCH] Updated rest of admin pages Deleted unused files --- resources/lang/en/messages.php | 108 +++++++++++++++++++++ resources/views/panel/backups.blade.php | 46 --------- resources/views/panel/config.blade.php | 50 ---------- resources/views/panel/diagnose.blade.php | 110 ---------------------- resources/views/panel/edit-user.blade.php | 8 +- resources/views/panel/links.blade.php | 4 +- resources/views/panel/phpinfo.blade.php | 4 +- resources/views/panel/site.blade.php | 10 +- resources/views/panel/users.blade.php | 58 ++++++------ 9 files changed, 150 insertions(+), 248 deletions(-) delete mode 100644 resources/views/panel/backups.blade.php delete mode 100644 resources/views/panel/config.blade.php delete mode 100644 resources/views/panel/diagnose.blade.php diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index 50b9ee2..f428dde 100644 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -451,6 +451,114 @@ return [ 'Title' => 'Title+', + /* + |-------------------------------------------------------------------------- + | Edit User Page (Admin) + |-------------------------------------------------------------------------- + | + | resources/views/panel/edit-user.blade.php + | + */ + + 'Edit User' => 'Edit User+', + 'Email' => 'Email+', + 'Password' => 'Password+', + 'Logo' => 'Logo+', + 'Delete' => 'Delete+', + 'Custom background' => 'Custom background+', + 'No image selected' => 'No image selected+', + 'Page URL' => 'Page URL+', + 'Page description' => 'Page description+', + 'Role' => 'Role+', + 'Save' => 'Save+', + + + /* + |-------------------------------------------------------------------------- + | Links Page (Admin) + |-------------------------------------------------------------------------- + | + | resources/views/panel/links.blade.php + | + */ + + 'Links' => 'Links+', + 'Link' => 'Link+', + 'Title' => 'Title+', + 'Clicks' => 'Clicks+', + 'Back' => 'Back+', + + + /* + |-------------------------------------------------------------------------- + | PHP info Page + |-------------------------------------------------------------------------- + | + | resources/views/panel/phpinfo.blade.php + | + */ + + 'Information about PHP’s configuration' => 'Information about PHP’s configuration+', + 'Outputs information about the current state of PHP' => 'Outputs information about the current state of PHP+', + + + /* + |-------------------------------------------------------------------------- + | Delete themes page + |-------------------------------------------------------------------------- + | + | resources/views/panel/theme.blade.php + | + */ + + 'Delete a theme' => 'Delete a theme+', + 'Delete theme' => 'Delete theme+', + + + /* + |-------------------------------------------------------------------------- + | Manage Users Page + |-------------------------------------------------------------------------- + | + | resources/views/panel/users.blade.php + | + */ + + 'Manage Users' => 'Manage Users+', + 'Search user' => 'Search user+', + 'ID' => 'ID+', + 'Name' => 'Name+', + 'E-Mail' => 'E-Mail+', + 'Page' => 'Page+', + 'Links' => 'Links+', + 'Clicks' => 'Clicks+', + 'Created at' => 'Created at+', + 'Last seen' => 'Last seen+', + 'Status' => 'Status+', + 'Action' => 'Action+', + 'N/A' => 'N/A+', + 'Pending' => 'Pending+', + 'Verified' => 'Verified+', + 'Approved' => 'Approved+', + 'Add new user' => 'Add new user+', + + # Tooltips + 'tt.Delete' => 'Delete+', + 'tt.Edit' => 'Edit+', + 'tt.All links' => 'All links+', + + 'confirm.delete.user' => 'Are you sure you want to delete this user? \nThis action cannot be undone!+', + + # Date Format + 'date.format' => 'd/m/Y', + + 'days ago' => 'days ago+', + '1 day ago' => '1 day ago+', + 'Today' => 'Today+', + '1 year ago' => '1 year ago+', + 'years ago' => 'years ago+', + + /* |-------------------------------------------------------------------------- | Config Page diff --git a/resources/views/panel/backups.blade.php b/resources/views/panel/backups.blade.php deleted file mode 100644 index 07a8927..0000000 --- a/resources/views/panel/backups.blade.php +++ /dev/null @@ -1,46 +0,0 @@ -@extends('layouts.sidebar') - -@section('content') - - - - @if (file_exists(base_path('backups/updater-backups/')) and is_dir(base_path('backups/updater-backups/'))) - @if($_SERVER['QUERY_STRING'] != '') - - @endif - -
-

{{__('messages.Download your updater backups')}}

-{{__('messages.The server will never store more that two backups at a time')}}


-   '; print_r($entry); echo '

'; - }}} ?> - - - @else -
-

{{__('messages.No backups found')}}

- @endif -
-@endsection \ No newline at end of file diff --git a/resources/views/panel/config.blade.php b/resources/views/panel/config.blade.php deleted file mode 100644 index d4b2897..0000000 --- a/resources/views/panel/config.blade.php +++ /dev/null @@ -1,50 +0,0 @@ -@extends( ($_SERVER['QUERY_STRING'] === 'restore-defaults') ? 'layouts.lang' : 'layouts.sidebar') - -@if($_SERVER['QUERY_STRING'] === 'restore-defaults') -current() . "/../../admin/config#2\" />"; -?> -@else - -@section('content') - - -@if(str_ends_with($_SERVER['REQUEST_URI'], 'advanced-config')) -

{{__('messages.Advanced config')}}

-

{{__('messages.AC.description')}}

-
- @csrf -
- -
-
- - {{__('messages.Restore defaults')}} - -
-@elseif(str_ends_with($_SERVER['REQUEST_URI'], 'env')) -

.ENV

- -
- @csrf -
- -
-
- -
-@endif - - - -@endsection -@endif \ No newline at end of file diff --git a/resources/views/panel/diagnose.blade.php b/resources/views/panel/diagnose.blade.php deleted file mode 100644 index 71f3f45..0000000 --- a/resources/views/panel/diagnose.blade.php +++ /dev/null @@ -1,110 +0,0 @@ -@extends('layouts.sidebar') - -@section('content') - -✔️"; -$wfalse = "❌"; - -$utrue = "❗"; -$ufalse = "✔️"; -$unull = "➖"; - - -$server = $_SERVER['SERVER_NAME']; -$uri = $_SERVER['REQUEST_URI']; - -// Tests if a URL has a valid SSL certificate -function has_ssl( $domain ) { - $ssl_check = @fsockopen( 'ssl://' . $domain, 443, $errno, $errstr, 30 ); - $res = !! $ssl_check; - if ( $ssl_check ) { fclose( $ssl_check ); } - return $res; -} - -// Changes probed URL to HTTP if no valid SSL certificate is present, otherwise an error would be thrown -if (has_ssl($server)) { - $actual_link = "https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; -} else { - $actual_link = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; -} - -function getUrlSatusCode($url, $timeout = 3) - { - $ch = curl_init(); - $opts = array(CURLOPT_RETURNTRANSFER => true, // do not output to browser - CURLOPT_URL => $url, - CURLOPT_NOBODY => true, // do a HEAD request only - CURLOPT_TIMEOUT => $timeout); - curl_setopt_array($ch, $opts); - curl_exec($ch); - $status = curl_getinfo($ch, CURLINFO_HTTP_CODE); - curl_close($ch); - return $status; - } - -//Files or directories to test if writable -$wrt1 = is_writable('.env'); -$wrt2 = is_writable('database/database.sqlite'); - -//Files or directories to test if accessible externally -$url1 = getUrlSatusCode($actual_link . '/../../.env'); -$url2 = getUrlSatusCode($actual_link . '/../../database/database.sqlite'); - -?> - -

{{__('messages.Debugging information')}}

- - @if($url1 == '200' or $url2 == '200') -

{{__('messages.security.risk')}}

- @endif - -

Write access

-

{{__('messages.Write access.description.1-3')}} '✔️' {{__('messages.Write access.description.2-3')}} '❌' {{__('messages.Write access.description.3-3')}}

- - - - - - - - - - - - 0) {echo "$wtrue";} else {echo "$wfalse";} ?> - - - - 0) {echo "$wtrue";} else {echo "$wfalse";} ?> - - -
{{__('messages.File')}}{{__('messages.Hover for more')}}
{{ base_path(".env") }}
{{ base_path("database/database.sqlite") }}
- -

{{__('messages.Security')}}

-

{{__('messages.security.risk.1-3')}} '✔️' {{__('messages.security.risk.2-3')}} '❗' {{__('messages.security.risk.3-3')}}

- - - - - - - - - - - - - - - - - - - -
{{__('messages.Link')}}{{__('messages.Hover for more')}}
{{ url('/.env') }}
{{ url('/database/database.sqlite') }}
- - -@endsection \ No newline at end of file diff --git a/resources/views/panel/edit-user.blade.php b/resources/views/panel/edit-user.blade.php index d19ca4f..884f451 100755 --- a/resources/views/panel/edit-user.blade.php +++ b/resources/views/panel/edit-user.blade.php @@ -13,7 +13,7 @@
-

{{__('messages.Edit User')}}

+

{{__('messages.Edit User')}}

@foreach($user as $user) @@ -45,7 +45,7 @@ @else @endif - @if(file_exists(base_path(findAvatar($user->id))))
{{__('messages.Delete')}}@endif + @if(file_exists(base_path(findAvatar($user->id))))
{{__('messages.Delete')}}@endif @if($_SERVER['QUERY_STRING'] === 'delete' and File::exists(base_path(findAvatar($user->id))))@php File::delete(base_path(findAvatar($user->id))); header("Location: ".url()->current()); die(); @endphp @endif

@@ -58,7 +58,7 @@
@if(!file_exists(base_path('assets/img/background-img/'.findBackground($user->id))))

{{__('messages.No image selected')}}

@endif - @if(file_exists(base_path('assets/img/background-img/'.findBackground($user->id))))
{{__('messages.Delete')}}@endif + @if(file_exists(base_path('assets/img/background-img/'.findBackground($user->id))))
{{__('messages.Delete')}}@endif @if($_SERVER['QUERY_STRING'] === 'deleteB' and File::exists(base_path('assets/img/background-img/'.findBackground($user->id))))@php File::delete(base_path('assets/img/background-img/'.findBackground($user->id))); header("Location: ".url()->current()); die(); @endphp @endif

@@ -79,7 +79,7 @@
- +
diff --git a/resources/views/panel/links.blade.php b/resources/views/panel/links.blade.php index f7049f1..1a43bb9 100644 --- a/resources/views/panel/links.blade.php +++ b/resources/views/panel/links.blade.php @@ -13,7 +13,7 @@
-

{{__('messages.Links')}}

+

{{__('messages.Links')}}

@@ -43,7 +43,7 @@ {!! $links ?? ''->links() !!} - {{__('messages.Back')}} + {{__('messages.Back')}}
diff --git a/resources/views/panel/phpinfo.blade.php b/resources/views/panel/phpinfo.blade.php index 670d185..ae1adf4 100644 --- a/resources/views/panel/phpinfo.blade.php +++ b/resources/views/panel/phpinfo.blade.php @@ -84,8 +84,8 @@
      Back
-

Information about PHP's configuration

-

Outputs information about the current state of PHP

+

{{__('messages.Information about PHP’s configuration')}}

+

{{__('messages.Outputs information about the current state of PHP')}}

-

{{__('messages.Site Customization')}}

+

Site Customization

@csrf
- @if(file_exists(base_path("assets/linkstack/images/").findFile('avatar')))@endif + @if(file_exists(base_path("assets/linkstack/images/").findFile('avatar')))@endif
- @if(file_exists(base_path("assets/linkstack/images/").findFile('favicon')))@endif + @if(file_exists(base_path("assets/linkstack/images/").findFile('favicon')))@endif

-

{{__('messages.Home message')}}

+

Home message

- +
diff --git a/resources/views/panel/users.blade.php b/resources/views/panel/users.blade.php index 82d7866..42b173c 100755 --- a/resources/views/panel/users.blade.php +++ b/resources/views/panel/users.blade.php @@ -15,7 +15,7 @@
-

Manage Users

+

{{__('messages.Manage Users')}}

@@ -23,7 +23,7 @@
- +
@@ -41,27 +41,27 @@ - - - - - - - - - - @if(env('REGISTER_AUTH') !== 'auth')@endif - - + + + + + + + + + + @if(env('REGISTER_AUTH') !== 'auth')@endif + + @foreach($users as $user) @php - $dateFormat = 'd/m/Y'; + $dateFormat = __('messages.date.format'); $date = date($dateFormat, strtotime($user->created_at)); - if(!isset($user->created_at)){$date = "N/A";} + if(!isset($user->created_at)){$date = __('messages.N/A');} $lastSeen = $user->updated_at; $lastSeenDate = date($dateFormat, strtotime($lastSeen)); @@ -69,22 +69,22 @@ $datetime = new DateTime($lastSeen, $timezone); $now = new DateTime(null, $timezone); $interval = $now->diff($datetime); - $daysAgo = $interval->days." days ago"; - if($interval->days == 1) $daysAgo = "1 day ago"; - if($interval->days == 0) $daysAgo = "Today"; + $daysAgo = $interval->days." ".__('messages.days ago'); + if($interval->days == 1) $daysAgo = __('messages.1 day ago'); + if($interval->days == 0) $daysAgo = __('messages.Today'); if ($interval->days >= 365) { $yearsAgo = floor($interval->days / 365); if ($yearsAgo == 1) { - $daysAgo = "1 year ago"; + $daysAgo = __('messages.1 year ago'); } else { - $daysAgo = "$yearsAgo years ago"; + $daysAgo = $yearsAgo . __('messages.years ago'); }} @endphp - + @@ -92,15 +92,15 @@ @if(env('REGISTER_AUTH') !== 'auth') + @if($user->email_verified_at == ''){{__('messages.Pending')}}@else{{__('messages.Verified')}}@endif @endif @endif - +
IDNameE-MailPageRoleLinksClicksCreated atLast seenE-MailStatusAction{{__('messages.ID')}}{{__('messages.Name')}}{{__('messages.E-Mail')}}{{__('messages.Page')}}{{__('messages.Role')}}{{__('messages.Links')}}{{__('messages.Clicks')}}{{__('messages.Created at')}}{{__('messages.Last seen')}}{{__('messages.E-Mail')}}{{__('messages.Status')}}{{__('messages.Action')}}
{{ $user->id }} {{ $user->name }} {{ $user->email }} @if(isset($user->littlelink_name))  {{ $user->littlelink_name }} @else N/A @endif@if(isset($user->littlelink_name))  {{ $user->littlelink_name }} @else {{__('messages.N/A')}} @endif {{ $user->role }} {{$user->links}} {{$user->clicks}}{{$daysAgo}}@if($user->find($user->id)->role == 'admin' and $user->email_verified_at != '')
-
@else - @if($user->email_verified_at == '')Pending@elseVerified@endif
@if($user->find($user->id)->role == 'admin' and $user->id == 1)
-
@else@if($user->block == 'yes') Pending @elseif($user->block == 'no') Approved @endif@endif
@if($user->find($user->id)->role == 'admin' and $user->id == 1)
-
@else@if($user->block == 'yes') {{__('messages.Pending')}} @elseif($user->block == 'no') {{__('messages.Approved')}} @endif@endif
@if($user->find($user->id)->role == 'admin' and $user->id == 1)
-
@else
- + Add new user + + {{__('messages.Add new user')}}