From 92df3f8ffeb7221e51b1c5ebd6b0a58af9e67ae5 Mon Sep 17 00:00:00 2001 From: AlekVolsk Date: Sat, 1 Jun 2019 17:40:11 +0400 Subject: [PATCH] v1.3.5 --- README.md | 2 +- README.ru.md | 2 +- admin/models/ajax.php | 15 ++++++++++++--- vlogs.xml | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f707b73..764207a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # View logs -![Version](https://img.shields.io/badge/VERSION-1.3.4-0366d6.svg?style=for-the-badge) +![Version](https://img.shields.io/badge/VERSION-1.3.5-0366d6.svg?style=for-the-badge) ![Joomla](https://img.shields.io/badge/joomla-3.2+-1A3867.svg?style=for-the-badge) ![Php](https://img.shields.io/badge/php-5.6+-8892BF.svg?style=for-the-badge) diff --git a/README.ru.md b/README.ru.md index 0865aca..07d97d2 100644 --- a/README.ru.md +++ b/README.ru.md @@ -1,6 +1,6 @@ # View logs -![Version](https://img.shields.io/badge/VERSION-1.3.4-0366d6.svg?style=for-the-badge) +![Version](https://img.shields.io/badge/VERSION-1.3.5-0366d6.svg?style=for-the-badge) ![Joomla](https://img.shields.io/badge/joomla-3.2+-1A3867.svg?style=for-the-badge) ![Php](https://img.shields.io/badge/php-5.6+-8892BF.svg?style=for-the-badge) diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 0e366bc..66ef4fc 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -296,21 +296,30 @@ public function dwFile() $fileName = pathinfo(ini_get('error_log'))['filename']; } else { $data = $this->getCSV($log_path . '/' . $file, ' '); + $base_ci = -1; foreach ($data as $i => $item) { if ($i < 6 && (count($item) < 4 || $item[0][0] == '#')) { + if (strpos($item[0], '#Fields:') !== false) { + $item[0] = str_replace('#Fields: ', '', $item[0]); + foreach ($item as $l => $fname) { + if (strtolower($fname) === 'message') { + $base_ci = $l; + break; + } + } + } unset($data[$i]); } else { if (count($item) == 1) { $item = explode(' ', $item[0]); } else { - $ci = count($item) - 1; + $ci = $base_ci >= 0 ? $base_ci : count($item) - 1; $msg = $item[$ci]; unset($item[$ci]); $item = explode(' ', implode(' ', $item)); - $item[] = $msg; + $item[] = '"' . $msg . '"'; unset($msg); } - $data[$i] = $item; } } diff --git a/vlogs.xml b/vlogs.xml index b440d8b..7de479a 100644 --- a/vlogs.xml +++ b/vlogs.xml @@ -6,7 +6,7 @@ https://alekvolsk.pw © 2019 Aleksey A. Morozov. All right reserved. GNU General Public License version 3 or later; see http://www.gnu.org/licenses/gpl-3.0.txt - 1.3.4 + 1.3.5 COM_VLOGS_DESC February 2019