Merge remote-tracking branch 'origin/develop'

snipe · Sep 25, 2023 · 16498fd · 16498fd
2 parents 13bee63 + 81a982f
commit 16498fd
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 8 deletions.
diff --git a/config/app.php b/config/app.php
@@ -239,7 +239,7 @@
     |
     */
 
-    'min_php' => '7.2.5',
+    'min_php' => '7.4.0',
 
 
     /*

diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
@@ -356,4 +356,10 @@
     'google_login'      => 'Google Workspace Login Settings',
     'enable_google_login'  => 'Enable users to login with Google Workspace',
     'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+    'mail_reply_to' => 'Mail Reply-To Address',
+    'mail_from' => 'Mail From Address',
+    'database_driver' => 'Database Driver',
+    'bs_table_storage' => 'Table Storage',
+    'timezone' => 'Timezone',
+
 ];
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
@@ -54,7 +54,7 @@
     }
   </style>
 
-
+  <div class="row">
     <!-- search filter list -->
     <div class="list clearfix">
 
@@ -346,7 +346,7 @@
       </div>
     </div>
   </div>
-
+</div>
 
 
 
@@ -358,19 +358,19 @@
         <h2 class="box-title">{{ trans('admin/settings/general.system') }}</h2>
       </div>
       <div class="box-body">
-        <div class="container row-striped col-md-11">
+        <div class="container row row-striped" style="width:97%">
 
           <!-- row -->
           <div class="row">
             <div class="col-md-2">
-              <strong>{{ trans('admin/settings/general.snipe_version') }}</strong>
+              <strong>{{ trans('admin/settings/general.snipe_version') }}:</strong>
             </div>
             <div class="col-md-4">
             {{ config('version.app_version') }}  build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
             </div>
 
             <div class="col-md-2">
-              <strong>{{ trans('admin/settings/general.license') }}</strong>
+              <strong>{{ trans('admin/settings/general.license') }}:</strong>
             </div>
           <div class="col-md-4">
               <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" rel="noopener">AGPL3</a>
@@ -381,19 +381,68 @@
           <!-- row -->
           <div class="row">
             <div class="col-md-2">
-              <strong>{{ trans('admin/settings/general.php') }}</strong>
+              <strong>{{ trans('admin/settings/general.php') }}:</strong>
             </div>
             <div class="col-md-4">
               {{ phpversion() }}
             </div>
 
             <div class="col-md-2">
-              <strong>{{ trans('admin/settings/general.laravel') }}</strong>
+              <strong>{{ trans('admin/settings/general.laravel') }}:</strong>
             </div>
             <div class="col-md-4">
               {{ $snipeSettings->lar_ver() }}
             </div>
+          </div>
+
+          <!-- row -->
+          <div class="row">
+              <div class="col-md-2">
+                <strong>{{ trans('admin/settings/general.timezone') }}:</strong>
+              </div>
+              <div class="col-md-4">
+                {{ config('app.timezone') }}
+              </div>
 
+              <div class="col-md-2">
+                <strong>{{ trans('admin/settings/general.database_driver') }}:</strong>
+              </div>
+              <div class="col-md-4">
+                {{ config('database.default') }}
+              </div>
+          </div>
+
+          <!-- row -->
+          <div class="row">
+            <div class="col-md-2">
+              <strong>{{ trans('admin/settings/general.mail_from') }}:</strong>
+            </div>
+            <div class="col-md-4">
+              {{ config('mail.from.name') }}
+              <code>&lt;{{ config('mail.from.address') }}&gt;</code>
+            </div>
+
+            <div class="col-md-2">
+              <strong>{{ trans('admin/settings/general.mail_reply_to') }}:</strong>
+            </div>
+            <div class="col-md-4">
+              {{ config('mail.reply_to.name') }}
+              <code>&lt;{{ config('mail.reply_to.address') }}&gt;</code>
+            </div>
+          </div>
+
+          <!-- row -->
+          <div class="row">
+            <div class="col-md-2">
+              <strong>{{ trans('admin/settings/general.bs_table_storage') }}:</strong>
+            </div>
+            <div class="col-md-10">
+              {{ config('session.bs_table_storage') }}
+            </div>
+
+          </div>
+
+        </div>
           </div>
           <!--/ row -->
         </div>
@@ -402,6 +451,9 @@
   </div><!--/col-md-8-->
 </div><!--/row-->
 
+
+
+
   @section('moar_scripts')
 <script nonce="{{ csrf_token() }}">
-Original file line number
+Diff line change
@@ Expand Up / @@ -239,7 +239,7 @@ @@
         |
         */
-        'min_php' => '7.2.5',
+        'min_php' => '7.4.0',
         /*
@@ Expand Down @@