Merge remote-tracking branch 'origin/main' into develop

revert slight layout change to arrange the buttons better

app/Services/Logging/LogViewerService.php

@@ -142,13 +142,7 @@ class LogViewerService
                 $haystack = $parsed['raw'] . ' ' . $parsed['message'];
 
                 if (is_array($parsed['context'])) {
-                    $json = json_encode(
+                    $haystack .= ' ' . (string)json_encode($parsed['context'], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-                        $parsed['context'],
-                        JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PARTIAL_OUTPUT_ON_ERROR
-                    );
-                    if ($json !== false) {
-                        $haystack .= ' ' . $json;
-                    }
                 }
 
                 if (mb_stripos($haystack, $search) === false) {
@@ -288,7 +282,7 @@ class LogViewerService
         $context = null;
 
         // Basis: [timestamp] LEVEL ...
-        if (preg_match('/^\[(?<ts>[0-9\-:\s]{19})]\s+(?<lvl>[A-Za-z]+)\s+(?<rest>.*)$/', $line, $m) === 1) {
+        if (preg_match('/^\[(?<ts>[0-9\-:\s]{19})\]\s+(?<lvl>[A-Z]+)\s+(?<rest>.*)$/', $line, $m) === 1) {
             $ts = (string)$m['ts'];
             $level = (string)$m['lvl'];
             $rest = (string)$m['rest'];
@@ -314,20 +308,6 @@ class LogViewerService
             $message = $rest;
         }
 
-        if ($level === null) {
-            $upper = strtoupper($raw);
-
-            if (str_starts_with($upper, 'PHP WARNING') || str_starts_with($upper, 'WARNING')) {
-                $level = 'WARNING';
-            } elseif (str_starts_with($upper, 'PHP NOTICE') || str_starts_with($upper, 'NOTICE')) {
-                $level = 'INFO';
-            } elseif (str_starts_with($upper, 'PHP FATAL') || str_contains($upper, 'FATAL ERROR') || str_starts_with($upper, 'UNCAUGHT')) {
-                $level = 'ERROR';
-            } else {
-                $level = 'UNKNOWN';
-            }
-        }
-
         return [
             'ts' => $ts,
             'level' => $level,

public/api/create_user.php

@@ -135,24 +135,7 @@ exec($cmd . ' 2>&1', $output, $returnVar);
 $json = implode("\n", $output);
 
 // Optional: write raw output into logs for debugging
-$ts = date('Y-m-d H:i:s');
+@file_put_contents(__DIR__ . '/../logs/create_user_output.log', date('Y-m-d H:i:s') . ' CMD: ' . $cmd . "\n" . $json . "\n\n", FILE_APPEND | LOCK_EX);
-
-$ctx = [
-    'cmd' => $cmd,
-    'return_code' => $returnVar,
-    'output' => $json,
-];
-
-$line = sprintf(
-    "[%s] %-7s %s %s%s",
-    $ts,
-    'DEBUG',
-    'PowerShell CMD',
-    json_encode($ctx, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
-    PHP_EOL
-);
-
-@file_put_contents(__DIR__ . '/../logs/create_user_output.log', $line, FILE_APPEND | LOCK_EX);
 
 @unlink($tmpFile);
 

public/api/create_users_csv.php

@@ -82,24 +82,7 @@ $json = implode("\n", $output);
 @unlink($metaFile);
 
 // Optional: log the CSV script command and raw output to help debugging
-$ts = date('Y-m-d H:i:s');
+@file_put_contents(__DIR__ . '/../logs/create_users_csv_output.log', date('Y-m-d H:i:s') . ' CMD: ' . $cmd . "\n" . $json . "\n\n", FILE_APPEND | LOCK_EX);
-
-$ctx = [
-    'cmd' => $cmd,
-    'return_code' => $returnVar,
-    'output' => $json,
-];
-
-$line = sprintf(
-    "[%s] %-7s %s %s%s",
-    $ts,
-    'DEBUG',
-    'PowerShell CMD',
-    json_encode($ctx, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
-    PHP_EOL
-);
-
-@file_put_contents(__DIR__ . '/../logs/create_users_csv_output.log', $line, FILE_APPEND | LOCK_EX);
 
 $result = null;
 if ($json !== '') {

public/views/createuser.php

@@ -53,7 +53,7 @@ declare(strict_types=1);
                 <h6 class="m-0 font-weight-bold text-primary">Einzelner Benutzer</h6>
             </div>
             <div class="card-body">
-                <form method="post" action="../api/create_user.php">
+                <form method="post" action="/api/create_user.php">
                     <div class="form-group">
                         <label for="samaccountname">Anmeldename (sAMAccountName)</label>
                         <input type="text" class="form-control" id="samaccountname" name="samaccountname" required>
@@ -139,7 +139,7 @@ declare(strict_types=1);
             <div class="card-body">
                 <p class="small text-muted">Die CSV-Datei sollte eine Kopfzeile mit folgenden Spalten enthalten: <code>samaccountname,displayname,mail,password,groups</code>. Gruppen können komma-getrennt sein. Nach dem Hochladen erscheint der Inhalt in der Vorschau, dort kann er vor dem Absenden editiert werden.</p>
 
-                <form id="csvUploadForm" method="post" action="../api/create_users_csv.php" enctype="multipart/form-data">
+                <form id="csvUploadForm" method="post" action="/api/create_users_csv.php" enctype="multipart/form-data">
                     <div class="form-group">
                         <label for="csvfile">CSV-Datei</label>
                         <input type="file" class="form-control-file" id="csvfile" name="csvfile" accept=".csv">

public/views/logs.php

@@ -109,7 +109,7 @@ declare(strict_types=1);
             <div class="text-gray-600">Keine Einträge gefunden.</div>
         <?php else : ?>
             <div class="table-responsive">
-                <table class="table table-bordered table-sm">
+                <table class="table table-bordered table-sm" width="100%" cellspacing="0">
                     <thead>
                     <tr>
                         <th style="width: 170px;">Zeit</th>
@@ -144,9 +144,7 @@ declare(strict_types=1);
                             <td><?php echo htmlspecialchars((string)($e['message'] ?? ''), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); ?></td>
                             <td>
                                 <?php if ($ctxPretty !== '') : ?>
-                                    <pre class="mb-0 text-white" style="white-space: pre-wrap;">
+                                    <pre class="mb-0" style="white-space: pre-wrap;"><?php echo htmlspecialchars($ctxPretty, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); ?></pre>
-                                        <?php echo htmlspecialchars($ctxPretty, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); ?>
-                                    </pre>
                                 <?php else : ?>
                                     <span class="text-gray-600">-</span>
                                 <?php endif; ?>