From 4eba46929845f3de010baa162ed198ee9fb3167f Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 10 Dec 2018 22:31:44 +0100
Subject: [PATCH] simplify https://github.com/opnsense/core/pull/3018

---
 src/www/diag_logs_common.inc | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/www/diag_logs_common.inc b/src/www/diag_logs_common.inc
index c69bb438c..e48296dc2 100644
--- a/src/www/diag_logs_common.inc
+++ b/src/www/diag_logs_common.inc
@@ -33,7 +33,7 @@ if (!isset($logsplit)) {
     $logsplit = 3;
 }
 
-function print_dump($logarr)
+function print_dump($logarr, $lineCharLimit)
 {
     global $config, $logsplit;
 
@@ -45,6 +45,10 @@ function print_dump($logarr)
     }
 
     foreach ($logarr as $logent) {
+        if ($lineCharLimit != 0 && strlen($logent) > $lineCharLimit) {
+            $logent = substr($logent, 0, $lineCharLimit - 1) . '…';
+        }
+
         $logent = preg_split('/\s+/', $logent);
         if (count($logent) < $logsplit + 1) {
             continue;
@@ -63,14 +67,6 @@ function print_dump($logarr)
     }
 }
 
-function limit_log_line_length(string $line, int $lineCharLimit): string
-{
-    if (strlen($line) <= $lineCharLimit) {
-        return $line;
-    } else {
-        return substr($line, 0, $lineCharLimit - 1) . '…';
-    }
-}
 
 function dump_clog($logfile, $tail, $grepfor = '', int $lineCharLimit = 0)
 {
@@ -98,13 +94,7 @@ function dump_clog($logfile, $tail, $grepfor = '', int $lineCharLimit = 0)
         $logarr = sprintf(gettext('File %s yielded no results.'), $logfile);
     }
 
-    if ($lineCharLimit != 0) {
-        $logarr = array_map(function($value) use ($lineCharLimit) {
-            return limit_log_line_length($value, $lineCharLimit);
-        }, $logarr);
-    }
-
-    print_dump($logarr);
+    print_dump($logarr, $lineCharLimit);
 }
 
 function dump_log($logfile, $tail, $grepfor = '', int $lineCharLimit = 0)
@@ -133,11 +123,5 @@ function dump_log($logfile, $tail, $grepfor = '', int $lineCharLimit = 0)
         $logarr = sprintf(gettext('File %s yielded no results.'), $logfile);
     }
 
-    if ($lineCharLimit != 0) {
-        $logarr = array_map(function($value) use ($lineCharLimit) {
-            return limit_log_line_length($value, $lineCharLimit);
-        }, $logarr);
-    }
-
-    print_dump($logarr);
+    print_dump($logarr, $lineCharLimit);
 }