From d9f170d7e600559e17970c0f6855b35bf4f76a88 Mon Sep 17 00:00:00 2001
From: mprins-ram <mprins@ram-it.nl>
Date: Thu, 20 Oct 2022 11:11:13 +0200
Subject: [PATCH] Fix for displaying user description when F2A isnt used

---
 bootstrap/cache/.gitignore              | 2 --
 logs/.gitignore                         | 4 ----
 resources/views/user/index.blade.php    | 2 ++
 rrd/.gitignore                          | 4 ----
 storage/app/.gitignore                  | 3 ---
 storage/app/public/.gitignore           | 2 --
 storage/debugbar/.gitignore             | 2 --
 storage/framework/cache/.gitignore      | 3 ---
 storage/framework/cache/data/.gitignore | 2 --
 storage/framework/sessions/.gitignore   | 2 --
 storage/framework/testing/.gitignore    | 2 --
 storage/framework/views/.gitignore      | 2 --
 storage/logs/.gitignore                 | 2 --
 13 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 bootstrap/cache/.gitignore
 delete mode 100644 logs/.gitignore
 delete mode 100644 rrd/.gitignore
 delete mode 100644 storage/app/.gitignore
 delete mode 100644 storage/app/public/.gitignore
 delete mode 100644 storage/debugbar/.gitignore
 delete mode 100644 storage/framework/cache/.gitignore
 delete mode 100644 storage/framework/cache/data/.gitignore
 delete mode 100644 storage/framework/sessions/.gitignore
 delete mode 100644 storage/framework/testing/.gitignore
 delete mode 100644 storage/framework/views/.gitignore
 delete mode 100644 storage/logs/.gitignore

diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/bootstrap/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/logs/.gitignore b/logs/.gitignore
deleted file mode 100644
index 5e7d2734cf..0000000000
--- a/logs/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
index 5d773edbec..9ea3fd51f0 100644
--- a/resources/views/user/index.blade.php
+++ b/resources/views/user/index.blade.php
@@ -44,6 +44,8 @@
                             @config('twofactor')
                                 @if(\App\Models\UserPref::getPref($user, 'twofactor'))
                                 <td>1</td>
+                                @else
+                                <td></td>
                                 @endif
                             @endconfig
                             <td>{{ $user->descr }}</td>
diff --git a/rrd/.gitignore b/rrd/.gitignore
deleted file mode 100644
index 5e7d2734cf..0000000000
--- a/rrd/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
deleted file mode 100644
index 8f4803c056..0000000000
--- a/storage/app/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!public/
-!.gitignore
diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/storage/app/public/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/storage/debugbar/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore
deleted file mode 100644
index 01e4a6cda9..0000000000
--- a/storage/framework/cache/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!data/
-!.gitignore
diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/storage/framework/cache/data/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/storage/framework/sessions/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/storage/framework/testing/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/storage/framework/views/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/storage/logs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore