From fdea7ff2f9a2c7d8c361db99c631d0383e3b8448 Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 09:49:42 -0500
Subject: [PATCH 01/11] Style updates

---
 index.php | 137 ++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 98 insertions(+), 39 deletions(-)

diff --git a/index.php b/index.php
index 0c3996d..002d6f7 100644
--- a/index.php
+++ b/index.php
@@ -65,19 +65,33 @@ function osort(&$array, $properties)
     });
 }
 
+define('TPL_MESSAGE', <<<'EOS'
+<div style="margin: 20px auto; width: 400px; background-color: #eeeeee; padding: 20px;">
+    <div>{{message}}</div>
+</div>
+EOS
+);
+
+function pretty_message($message)
+{
+    print(str_replace('{{message}}', $message, TPL_MESSAGE));
+}
+
 if ($error_log === null) {
     $error_log = ini_get('error_log');
 }
 
 if (empty($error_log)) {
-    die('No error log was defined or could be determined from the ini settings.');
+    pretty_message('No error log was defined or could be determined from the ini settings.');
+    die();
 }
 
 try {
     $log = new SplFileObject($error_log);
     $log->setFlags(SplFileObject::DROP_NEW_LINE);
 } catch (RuntimeException $e) {
-    die("The file '{$error_log}' cannot be opened for reading.\n");
+    pretty_message("The file '{$error_log}' cannot be opened for reading.");
+    die();
 }
 
 if ($cache !== null && file_exists($cache)) {
@@ -203,9 +217,9 @@ function osort(&$array, $properties)
     <title>PHP error log on <?php echo htmlentities($host); ?></title>
     <script src="//code.jquery.com/jquery-2.2.1.min.js" type="text/javascript"></script>
     <style type="text/css">
-        body { font-family: Arial, Helvetica, sans-serif; font-size: 80%; margin: 0; padding: 0; }
-        article { width: 100%; display: block; margin: 0 0 1em 0; background-color: #fcfcfc; }
-        article > div { border: 1px solid #000000; border-left-width: 10px; padding: 1em; }
+        body { font-family: Arial, Helvetica, sans-serif; font-size: 13px; margin: 0; padding: 0; overflow-y: scroll; background-color: #ffffff; }
+        article { width: 100%; display: block; margin: 0 0 1em 0; background-color: #ffffff; }
+        article > div { border-left: 1px solid #000000; border-left-width: 10px; padding: 1em; -webkit-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.45); -moz-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.45); box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.45); }
         article > div > b { font-weight: bold; display: block; }
         article > div > i { display: block; }
         article > div > blockquote {
@@ -229,11 +243,24 @@ function osort(&$array, $properties)
             font-size: 90%;
         }
         footer a:hover { opacity: 1; }
-        #container { padding: 2em; }
-        #typeFilter, #pathFilter, #sortOptions { border: 0; margin: 0; padding: 0; }
-        #typeFilter > p { line-height: 2.2em; }
-        #pathFilter input { width: 30em; }
-        #typeFilter label { border-bottom: 4px solid #000000; margin-right: 1em; padding-bottom: 2px; }
+        .title { font-weight: bold; }
+        .header { background-color: #6f7f59; color: #ffffff; padding: 12px 0; }
+        .contain { margin: 0 auto; max-width: 880px; }
+        .controls-wrapper { background-color: #ffffff; padding: 6px 0; }
+        .controls { margin: 0; display:flex; justify-content: flex-start; flex-wrap: wrap; }
+        .controls fieldset { padding: 0; border: 0; margin: 0 12px 6px 0; }
+        .controls .label { text-transform: uppercase; padding: 4px 0; color: #4a4a4a; }
+        .controls .control { line-height: 1.1; }
+        #typeFilter input { vertical-align: middle; margin: 0; margin-top: -1px; }
+        #typeFilter label { display: inline-block; border-bottom: 4px solid #000000; margin-right: 6px; padding-bottom: 5px; color: #4a4a4a; }
+        #pathFilter input { min-width: 100px; font-size: 100%; display: inline-block; padding: 3px; border: 1px solid #d3d3d3; line-height: 1.3; }
+        #sortOptions a { padding: 4px 8px; border: 1px solid #d3d3d3; border-radius: 0; color: #4a4a4a; display: inline-block; text-decoration: none; background-color: #fff; background-image: -webkit-linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.02)); background-image: linear-gradient(top,rgba(0,0,0,0),rgba(0,0,0,0.02)); margin-right: -5px; }
+        #sortOptions a:first-child { border-top-left-radius: 4px; border-bottom-left-radius: 4px; }
+        #sortOptions a:last-child { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
+        #sortOptions a:hover { background-color: #eee; }
+        #sortOptions a.is-active { border-bottom-color: #3367d6; -webkit-box-shadow: inset 0 -1px 0 #3367d6; box-shadow: inset 0 -1px 0 #3367d6; }
+        .count-message { padding: 6px 0; color: #4a4a4a; }
+        .errors-wrapper { background-color: #efefef; }
         .hide { display: none; }
         .alternate { background-color: #f8f8f8; }
         .deprecated { border-color: #acacac !important; }
@@ -247,34 +274,58 @@ function osort(&$array, $properties)
 </head>
 <body>
 
-<div id="container">
-<?php if (!empty($logs)): ?>
-
-    <p id="serverDetails">Error log '<?php echo htmlentities($error_log); ?>' on <?php
-        echo htmlentities($host); ?> (PHP <?php echo phpversion();
-        ?>, <?php echo htmlentities($_SERVER['SERVER_SOFTWARE']); ?>)</p>
-
-    <fieldset id="typeFilter">
-        <p>Filter by type:
-            <?php foreach ($types as $title => $class): ?>
-            <label class="<?php echo $class; ?>">
-                <input type="checkbox" value="<?php echo $class; ?>" checked="checked" /> <?php
-                    echo $title; ?> (<span data-total="<?php echo $typecount[$title]; ?>"><?php
-                    echo $typecount[$title]; ?></span>)
-            </label>
-            <?php endforeach; ?>
-        </p>
-    </fieldset>
-
-    <fieldset id="pathFilter">
-        <p><label>Filter by path: <input type="text" value="" placeholder="Just start typing..." /></label></p>
-    </fieldset>
+<div id="page">
+
+<div class="header">
+    <div class="contain">
+        <span class="title">PHPError GUI</span> &bull;
+        <span class="server-details">
+            Error log '<?php echo htmlentities($error_log); ?>'
+            on <?php echo htmlentities($host); ?> (PHP <?php echo phpversion(); ?>,
+            <?php echo htmlentities($_SERVER['SERVER_SOFTWARE']); ?>)
+        </span>
+    </div>
+</div>
 
-    <fieldset id="sortOptions">
-        <p>Sort by: <a href="?type=last&amp;order=asc">last seen (<span>asc</span>)</a>, <a href="?type=hits&amp;order=desc">hits (<span>desc</span>)</a>, <a href="?type=type&amp;order=asc">type (<span>a-z</span>)</a></p>
-    </fieldset>
+<?php if (!empty($logs)): ?>
+<div class="controls-wrapper">
+    <div class="contain">
+        <div class="controls">
+            <fieldset id="typeFilter">
+                <div class="label">Filter by type</div>
+                <div class="control">
+                    <?php foreach ($types as $title => $class): ?>
+                    <label class="<?php echo $class; ?>">
+                        <input type="checkbox" value="<?php echo $class; ?>" checked="checked" /> <?php
+                            echo $title; ?> (<span data-total="<?php echo $typecount[$title]; ?>"><?php
+                            echo $typecount[$title]; ?></span>)
+                    </label>
+                    <?php endforeach; ?>
+                </div>
+            </fieldset>
+
+            <fieldset id="pathFilter">
+                <div class="label">Filter by path</div>
+                <div class="control">
+                    <input type="text" value="" placeholder="Just start typing..." />
+                </div>
+            </fieldset>
+
+            <fieldset id="sortOptions">
+                <div class="label">Sort by</div>
+                <div class="control">
+                    <a href="?type=last&amp;order=asc">last seen (<span>asc</span>)</a>
+                    <a href="?type=hits&amp;order=desc">hits (<span>desc</span>)</a>
+                    <a href="?type=type&amp;order=asc">type (<span>a-z</span>)</a>
+                </div>
+            </fieldset>
+        </div>
+    </div>
+</div>
 
-    <p id="entryCount"><?php echo $total; ?> distinct entr<?php echo($total == 1 ? 'y' : 'ies'); ?></p>
+<div class="errors-wrapper">
+<div class="contain">
+    <div id="entryCount" class="count-message"><?php echo $total; ?> distinct entr<?php echo($total == 1 ? 'y' : 'ies'); ?></div>
 
     <section id="errorList">
     <?php foreach ($logs as $log): ?>
@@ -287,7 +338,7 @@ function osort(&$array, $properties)
             <div class="<?php echo $types[$log->type]; ?>">
                 <i><?php echo htmlentities($log->type); ?></i> <b><?php echo htmlentities((empty($log->core) ? $log->msg : $log->core)); ?></b><br />
                 <?php if (!empty($log->more)): ?>
-                	<p><i><?php echo nl2br(htmlentities($log->more)); ?></i></p>
+                    <p><i><?php echo nl2br(htmlentities($log->more)); ?></i></p>
                 <?php endif; ?>
                 <p>
                     <?php if (!empty($log->path)): ?>
@@ -311,10 +362,14 @@ function osort(&$array, $properties)
     </section>
 
     <p id="nothingToShow" class="hide">Nothing to show with your selected filtering.</p>
+</div>
+</div>
 <?php else: ?>
-    <p>There are currently no PHP error log entries available.</p>
+    <div class="contain">
+        <p>There are currently no PHP error log entries available.</p>
+    </div>
 <?php endif; ?>
-</div>
+</div><!-- .page -->
 
 <footer>
     <a href="https://github.com/amnuts/phperror-gui" target="_blank">https://github.com/amnuts/phperror-gui</a>
@@ -442,6 +497,10 @@ function sortEntries(type, order) {
         $('#sortOptions').find('a').on('click', function(){
             var qs = parseQueryString($(this).attr('href'));
             sortEntries(qs.type, qs.order);
+
+            $('#sortOptions').find('a').removeClass('is-active');
+            $(this).addClass('is-active');
+
             $(this).attr('href', '?type=' + qs.type + '&order=' + (qs.order == 'asc' ? 'desc' : 'asc'));
             if (qs.type == 'type') {
                 $('span', $(this)).text((qs.order == 'asc' ? 'z-a' : 'a-z'));

From 7b936f7ed6d9176d40c547f19665aa4071261938 Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 10:30:50 -0500
Subject: [PATCH 02/11] Correct footer styles

---
 index.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 002d6f7..aca3f61 100644
--- a/index.php
+++ b/index.php
@@ -230,9 +230,10 @@ function pretty_message($message)
             overflow: auto;
             margin: 0;
         }
-        footer { border-top: 1px solid #ccc; padding: 1em 2em; }
+        footer { border-top: 1px solid #ccc; }
         footer a {
-            padding: 2em;
+            display: block;
+            padding: 1rem 26px;
             text-decoration: none;
             opacity: 0.7;
             background-position: 5px 50%;
@@ -246,7 +247,7 @@ function pretty_message($message)
         .title { font-weight: bold; }
         .header { background-color: #6f7f59; color: #ffffff; padding: 12px 0; }
         .contain { margin: 0 auto; max-width: 880px; }
-        .controls-wrapper { background-color: #ffffff; padding: 6px 0; }
+        .controls-wrapper { background-color: #ffffff; padding: 6px 0; border-bottom: 1px solid #d3d3d3; }
         .controls { margin: 0; display:flex; justify-content: flex-start; flex-wrap: wrap; }
         .controls fieldset { padding: 0; border: 0; margin: 0 12px 6px 0; }
         .controls .label { text-transform: uppercase; padding: 4px 0; color: #4a4a4a; }
@@ -260,7 +261,7 @@ function pretty_message($message)
         #sortOptions a:hover { background-color: #eee; }
         #sortOptions a.is-active { border-bottom-color: #3367d6; -webkit-box-shadow: inset 0 -1px 0 #3367d6; box-shadow: inset 0 -1px 0 #3367d6; }
         .count-message { padding: 6px 0; color: #4a4a4a; }
-        .errors-wrapper { background-color: #efefef; }
+        .errors-wrapper { background-color: #efefef; padding-bottom: 1rem; }
         .hide { display: none; }
         .alternate { background-color: #f8f8f8; }
         .deprecated { border-color: #acacac !important; }
@@ -372,7 +373,9 @@ function pretty_message($message)
 </div><!-- .page -->
 
 <footer>
-    <a href="https://github.com/amnuts/phperror-gui" target="_blank">https://github.com/amnuts/phperror-gui</a>
+    <div class="contain">
+        <a href="https://github.com/amnuts/phperror-gui" target="_blank">https://github.com/amnuts/phperror-gui</a>
+    </div>
 </footer>
 
 <script type="text/javascript">

From b4f43d261c6bc7126532ca846d229701af6fcdf5 Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 13:17:55 -0500
Subject: [PATCH 03/11] Simplify pretty_message to not rely on constant

---
 index.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/index.php b/index.php
index aca3f61..53bb463 100644
--- a/index.php
+++ b/index.php
@@ -65,16 +65,13 @@ function osort(&$array, $properties)
     });
 }
 
-define('TPL_MESSAGE', <<<'EOS'
-<div style="margin: 20px auto; width: 400px; background-color: #eeeeee; padding: 20px;">
-    <div>{{message}}</div>
-</div>
-EOS
-);
-
 function pretty_message($message)
 {
-    print(str_replace('{{message}}', $message, TPL_MESSAGE));
+    $tpl_message = '<div style="margin: 20px auto; width: 400px; background-color: #eeeeee; padding: 20px;">
+        <div>{{message}}</div>
+    </div>';
+
+    print(str_replace('{{message}}', $message, $tpl_message));
 }
 
 if ($error_log === null) {

From 12a3c83c9990a15bf1346cce3245f6476a217c63 Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 13:18:35 -0500
Subject: [PATCH 04/11] Tweak sort option buttons

---
 index.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/index.php b/index.php
index 53bb463..1791217 100644
--- a/index.php
+++ b/index.php
@@ -259,6 +259,7 @@ function pretty_message($message)
         #sortOptions a.is-active { border-bottom-color: #3367d6; -webkit-box-shadow: inset 0 -1px 0 #3367d6; box-shadow: inset 0 -1px 0 #3367d6; }
         .count-message { padding: 6px 0; color: #4a4a4a; }
         .errors-wrapper { background-color: #efefef; padding-bottom: 1rem; }
+        .zero-state { padding: 3rem 0; }
         .hide { display: none; }
         .alternate { background-color: #f8f8f8; }
         .deprecated { border-color: #acacac !important; }
@@ -312,9 +313,9 @@ function pretty_message($message)
             <fieldset id="sortOptions">
                 <div class="label">Sort by</div>
                 <div class="control">
-                    <a href="?type=last&amp;order=asc">last seen (<span>asc</span>)</a>
-                    <a href="?type=hits&amp;order=desc">hits (<span>desc</span>)</a>
-                    <a href="?type=type&amp;order=asc">type (<span>a-z</span>)</a>
+                    <a href="?type=last&amp;order=asc">last seen <span> </span></a>
+                    <a href="?type=hits&amp;order=desc">hits <span> </span></a>
+                    <a href="?type=type&amp;order=asc">type <span> </span></a>
                 </div>
             </fieldset>
         </div>
@@ -359,15 +360,15 @@ function pretty_message($message)
     <?php endforeach; ?>
     </section>
 
-    <p id="nothingToShow" class="hide">Nothing to show with your selected filtering.</p>
+    <p id="nothingToShow" class="zero-state hide">Nothing to show with your selected filtering.</p>
 </div>
 </div>
 <?php else: ?>
     <div class="contain">
-        <p>There are currently no PHP error log entries available.</p>
+        <p class="zero-state">There are currently no PHP error log entries available.</p>
     </div>
 <?php endif; ?>
-</div><!-- .page -->
+</div><!-- #page -->
 
 <footer>
     <div class="contain">
@@ -498,15 +499,12 @@ function sortEntries(type, order) {
             var qs = parseQueryString($(this).attr('href'));
             sortEntries(qs.type, qs.order);
 
-            $('#sortOptions').find('a').removeClass('is-active');
+            $('#sortOptions a').removeClass('is-active');
             $(this).addClass('is-active');
 
+            $('#sortOptions a span').text(' ');
             $(this).attr('href', '?type=' + qs.type + '&order=' + (qs.order == 'asc' ? 'desc' : 'asc'));
-            if (qs.type == 'type') {
-                $('span', $(this)).text((qs.order == 'asc' ? 'z-a' : 'a-z'));
-            } else {
-                $('span', $(this)).text((qs.order == 'asc' ? 'desc' : 'asc'));
-            }
+            $('span', $(this)).text((qs.order == 'asc' ? '↑' : '↓'));
             return false;
         });
         $(document).on('click', 'a.codeblock, a.traceblock', function(e){

From a59cb4b0781b90b68d1a145662ea0dbde2ae92ac Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 13:39:04 -0500
Subject: [PATCH 05/11] Set default sort option

---
 index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 1791217..7d1e138 100644
--- a/index.php
+++ b/index.php
@@ -257,6 +257,7 @@ function pretty_message($message)
         #sortOptions a:last-child { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
         #sortOptions a:hover { background-color: #eee; }
         #sortOptions a.is-active { border-bottom-color: #3367d6; -webkit-box-shadow: inset 0 -1px 0 #3367d6; box-shadow: inset 0 -1px 0 #3367d6; }
+        #sortOptions a span { display: inline-block; }
         .count-message { padding: 6px 0; color: #4a4a4a; }
         .errors-wrapper { background-color: #efefef; padding-bottom: 1rem; }
         .zero-state { padding: 3rem 0; }
@@ -313,7 +314,7 @@ function pretty_message($message)
             <fieldset id="sortOptions">
                 <div class="label">Sort by</div>
                 <div class="control">
-                    <a href="?type=last&amp;order=asc">last seen <span> </span></a>
+                    <a href="?type=last&amp;order=asc" class="is-active">last seen <span>↓</span></a>
                     <a href="?type=hits&amp;order=desc">hits <span> </span></a>
                     <a href="?type=type&amp;order=asc">type <span> </span></a>
                 </div>

From c2925e0bff0958d0df5ebbc4ec1802b185d03301 Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 15:06:32 -0500
Subject: [PATCH 06/11] Add ErrorLog object

---
 index.php | 205 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 122 insertions(+), 83 deletions(-)

diff --git a/index.php b/index.php
index 7d1e138..ee8c661 100644
--- a/index.php
+++ b/index.php
@@ -74,6 +74,124 @@ function pretty_message($message)
     print(str_replace('{{message}}', $message, $tpl_message));
 }
 
+class ErrorLog
+{
+    private $log;
+    private $types = [];
+    private $typecount = [];
+
+    public function __construct(SplFileObject $log)
+    {
+        $this->log = $log;
+    }
+
+    public function getTypes()
+    {
+        return $this->types;
+    }
+
+    public function getTypeCounts()
+    {
+        return $this->typecount;
+    }
+
+    public function parse()
+    {
+        $log = $this->log;
+        $logs = [];
+
+        $prevError = new stdClass;
+        while (!$log->eof()) {
+            if (preg_match('/stack trace:$/i', $log->current())) {
+                $stackTrace = $parts = [];
+                $log->next();
+                while ((preg_match('!^\[(?P<time>[^\]]*)\] PHP\s+(?P<msg>\d+\. .*)$!', $log->current(), $parts)
+                    || preg_match('!^(?P<msg>#\d+ .*)$!', $log->current(), $parts)
+                    || preg_match('/stack trace:$/i', $log->current())
+                    && !$log->eof())
+                ) {
+                    $stackTrace[] = $parts['msg'];
+                    $log->next();
+                }
+                // Not sure why this is here; it swallows up the next error message
+                //if (substr($stackTrace[0], 0, 2) == '#0') {
+                //    $stackTrace[] = $log->current();
+                //    $log->next();
+                //}
+                $prevError->trace = join("\n", $stackTrace);
+            }
+
+            $more = [];
+            while (!preg_match('!^\[(?P<time>[^\]]*)\] ((PHP|ojs2: )(?P<typea>.*?):|(?P<typeb>(WordPress|ojs2|\w has produced)\s{1,}\w+ \w+))\s+(?P<msg>.*)$!', $log->current()) && !$log->eof()) {
+                $more[] = $log->current();
+                $log->next();
+            }
+            if (!empty($more)) {
+                $prevError->more = join("\n", $more);
+            }
+
+            $parts = [];
+            if (preg_match('!^\[(?P<time>[^\]]*)\] ((PHP|ojs2: )(?P<typea>.*?):|(?P<typeb>(WordPress|ojs2|\w has produced)\s{1,}\w+ \w+))\s+(?P<msg>.*)$!', $log->current(), $parts)) {
+                $parts['type'] = (@$parts['typea'] ?: $parts['typeb']);
+                if ($parts[3] == 'ojs2: ' || $parts[6] == 'ojs2') {
+                    $parts['type'] = 'ojs2 application';
+                }
+                $msg = trim($parts['msg']);
+                $type = strtolower(trim($parts['type']));
+                $this->types[$type] = strtolower(preg_replace('/[^a-z]/i', '', $type));
+                if (!isset($logs[$msg])) {
+                    $data = [
+                        'type'  => $type,
+                        'first' => date_timestamp_get(date_create($parts['time'])),
+                        'last'  => date_timestamp_get(date_create($parts['time'])),
+                        'msg'   => $msg,
+                        'hits'  => 1,
+                        'trace' => null,
+                        'more'  => null
+                    ];
+                    $subparts = [];
+                    if (preg_match('!(?<core> in (?P<path>(/|zend)[^ :]*)(?: on line |:)(?P<line>\d+))$!', $msg, $subparts)) {
+                        $data['path'] = $subparts['path'];
+                        $data['line'] = $subparts['line'];
+                        $data['core'] = str_replace($subparts['core'], '', $data['msg']);
+                        $data['code'] = '';
+                        try {
+                            $file = new SplFileObject(str_replace('zend.view://', '', $subparts['path']));
+                            $file->seek($subparts['line'] - 4);
+                            $i = 7;
+                            do {
+                                $data['code'] .= $file->current();
+                                $file->next();
+                            } while (--$i && !$file->eof());
+                        } catch (Exception $e) {
+                        }
+                    }
+
+                    $logs[$msg] = (object)$data;
+                    if (!isset($this->typecount[$type])) {
+                        $this->typecount[$type] = 1;
+                    } else {
+                        ++$this->typecount[$type];
+                    }
+                } else {
+                    ++$logs[$msg]->hits;
+                    $time = date_timestamp_get(date_create($parts['time']));
+                    if ($time < $logs[$msg]->first) {
+                        $logs[$msg]->first = $time;
+                    }
+                    if ($time > $logs[$msg]->last) {
+                        $logs[$msg]->last = $time;
+                    }
+                }
+                $prevError = &$logs[$msg];
+            }
+            $log->next();
+        }
+
+        return $logs;
+    }
+}
+
 if ($error_log === null) {
     $error_log = ini_get('error_log');
 }
@@ -97,90 +215,11 @@ function pretty_message($message)
     $log->fseek($seek);
 }
 
-$prevError = new stdClass;
-while (!$log->eof()) {
-    if (preg_match('/stack trace:$/i', $log->current())) {
-        $stackTrace = $parts = [];
-        $log->next();
-        while ((preg_match('!^\[(?P<time>[^\]]*)\] PHP\s+(?P<msg>\d+\. .*)$!', $log->current(), $parts)
-            || preg_match('!^(?P<msg>#\d+ .*)$!', $log->current(), $parts)
-            && !$log->eof())
-        ) {
-            $stackTrace[] = $parts['msg'];
-            $log->next();
-        }
-        if (substr($stackTrace[0], 0, 2) == '#0') {
-            $stackTrace[] = $log->current();
-            $log->next();
-        }
-        $prevError->trace = join("\n", $stackTrace);
-    }
-
-    $more = [];
-    while (!preg_match('!^\[(?P<time>[^\]]*)\] ((PHP|ojs2: )(?P<typea>.*?):|(?P<typeb>(WordPress|ojs2|\w has produced)\s{1,}\w+ \w+))\s+(?P<msg>.*)$!', $log->current()) && !$log->eof()) {
-        $more[] = $log->current();
-        $log->next();
-    }
-    if (!empty($more)) {
-        $prevError->more = join("\n", $more);
-    }
+$errorlog = new ErrorLog($log);
+$logs = $errorlog->parse();
+$types = $errorlog->getTypes();
+$typecount = $errorlog->getTypeCounts();
 
-    $parts = [];
-    if (preg_match('!^\[(?P<time>[^\]]*)\] ((PHP|ojs2: )(?P<typea>.*?):|(?P<typeb>(WordPress|ojs2|\w has produced)\s{1,}\w+ \w+))\s+(?P<msg>.*)$!', $log->current(), $parts)) {
-        $parts['type'] = (@$parts['typea'] ?: $parts['typeb']);
-        if ($parts[3] == 'ojs2: ' || $parts[6] == 'ojs2') {
-            $parts['type'] = 'ojs2 application';
-        }
-        $msg = trim($parts['msg']);
-        $type = strtolower(trim($parts['type']));
-        $types[$type] = strtolower(preg_replace('/[^a-z]/i', '', $type));
-        if (!isset($logs[$msg])) {
-            $data = [
-                'type'  => $type,
-                'first' => date_timestamp_get(date_create($parts['time'])),
-                'last'  => date_timestamp_get(date_create($parts['time'])),
-                'msg'   => $msg,
-                'hits'  => 1,
-                'trace' => null,
-                'more'  => null
-            ];
-            $subparts = [];
-            if (preg_match('!(?<core> in (?P<path>(/|zend)[^ :]*)(?: on line |:)(?P<line>\d+))$!', $msg, $subparts)) {
-                $data['path'] = $subparts['path'];
-                $data['line'] = $subparts['line'];
-                $data['core'] = str_replace($subparts['core'], '', $data['msg']);
-                $data['code'] = '';
-                try {
-                    $file = new SplFileObject(str_replace('zend.view://', '', $subparts['path']));
-                    $file->seek($subparts['line'] - 4);
-                    $i = 7;
-                    do {
-                        $data['code'] .= $file->current();
-                        $file->next();
-                    } while (--$i && !$file->eof());
-                } catch (Exception $e) {
-                }
-            }
-            $logs[$msg] = (object)$data;
-            if (!isset($typecount[$type])) {
-                $typecount[$type] = 1;
-            } else {
-                ++$typecount[$type];
-            }
-        } else {
-            ++$logs[$msg]->hits;
-            $time = date_timestamp_get(date_create($parts['time']));
-            if ($time < $logs[$msg]->first) {
-                $logs[$msg]->first = $time;
-            }
-            if ($time > $logs[$msg]->last) {
-                $logs[$msg]->last = $time;
-            }
-        }
-        $prevError = &$logs[$msg];
-    }
-    $log->next();
-}
 
 if ($cache !== null) {
     $cacheData = serialize(['seek' => $log->getSize(), 'logs' => $logs, 'types' => $types, 'typecount' => $typecount]);

From b6a6da40ddddc02cdd56a8c24d951b58381b3135 Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 15:10:18 -0500
Subject: [PATCH 07/11] Add getCodeSnippet method

---
 index.php | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/index.php b/index.php
index ee8c661..44d147d 100644
--- a/index.php
+++ b/index.php
@@ -154,17 +154,7 @@ public function parse()
                         $data['path'] = $subparts['path'];
                         $data['line'] = $subparts['line'];
                         $data['core'] = str_replace($subparts['core'], '', $data['msg']);
-                        $data['code'] = '';
-                        try {
-                            $file = new SplFileObject(str_replace('zend.view://', '', $subparts['path']));
-                            $file->seek($subparts['line'] - 4);
-                            $i = 7;
-                            do {
-                                $data['code'] .= $file->current();
-                                $file->next();
-                            } while (--$i && !$file->eof());
-                        } catch (Exception $e) {
-                        }
+                        $data['code'] = $this->getCodeSnippet($subparts['path'], $subparts['line']);
                     }
 
                     $logs[$msg] = (object)$data;
@@ -190,6 +180,23 @@ public function parse()
 
         return $logs;
     }
+
+    protected function getCodeSnippet($path, $line)
+    {
+        $code = '';
+        try {
+            $file = new SplFileObject(str_replace('zend.view://', '', $path));
+            $file->seek($line - 4);
+            $i = 7;
+            do {
+                $code .= $file->current();
+                $file->next();
+            } while (--$i && !$file->eof());
+        } catch (Exception $e) {
+        }
+
+        return $code;
+    }
 }
 
 if ($error_log === null) {

From 5df07aa806d64150ec51a5e9dd54541c13a20bbe Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 15:20:07 -0500
Subject: [PATCH 08/11] Split out capturing file data from message

---
 index.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/index.php b/index.php
index 44d147d..85eebda 100644
--- a/index.php
+++ b/index.php
@@ -149,15 +149,10 @@ public function parse()
                         'trace' => null,
                         'more'  => null
                     ];
-                    $subparts = [];
-                    if (preg_match('!(?<core> in (?P<path>(/|zend)[^ :]*)(?: on line |:)(?P<line>\d+))$!', $msg, $subparts)) {
-                        $data['path'] = $subparts['path'];
-                        $data['line'] = $subparts['line'];
-                        $data['core'] = str_replace($subparts['core'], '', $data['msg']);
-                        $data['code'] = $this->getCodeSnippet($subparts['path'], $subparts['line']);
-                    }
+                    $logItem = (object)$data;
+                    $this->captureFileDataFromMessage($logItem);
 
-                    $logs[$msg] = (object)$data;
+                    $logs[$msg] = $logItem;
                     if (!isset($this->typecount[$type])) {
                         $this->typecount[$type] = 1;
                     } else {
@@ -181,6 +176,17 @@ public function parse()
         return $logs;
     }
 
+    protected function captureFileDataFromMessage($logItem)
+    {
+        $subparts = [];
+        if (preg_match('!(?<core> in (?P<path>(/|zend)[^ :]*)(?: on line |:)(?P<line>\d+))$!', $logItem->msg, $subparts)) {
+            $logItem->path = $subparts['path'];
+            $logItem->line = $subparts['line'];
+            $logItem->core = str_replace($subparts['core'], '', $logItem->msg);
+            $logItem->code = $this->getCodeSnippet($subparts['path'], $subparts['line']);
+        }
+    }
+
     protected function getCodeSnippet($path, $line)
     {
         $code = '';

From 9a31cbaf9c9fc218d7ae960b3e14e81eee89f044 Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 15:58:22 -0500
Subject: [PATCH 09/11] Split out additional methods for capturing data

---
 index.php | 100 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 66 insertions(+), 34 deletions(-)

diff --git a/index.php b/index.php
index 85eebda..4a009d0 100644
--- a/index.php
+++ b/index.php
@@ -76,6 +76,11 @@ function pretty_message($message)
 
 class ErrorLog
 {
+    const REGEX_ERROR_LINE = '!^\[(?P<time>[^\]]*)\] ((PHP|ojs2: )(?P<typea>.*?):|(?P<typeb>(WordPress|ojs2|\w has produced)\s{1,}\w+ \w+))\s+(?P<msg>.*)$!';
+    const REGEX_TRACE_LINE = '/stack trace:$/i';
+    const REGEX_TRACE_TYPE_A = '!^\[(?P<time>[^\]]*)\] PHP\s+(?P<msg>\d+\. .*)$!';
+    const REGEX_TRACE_TYPE_B = '!^(?P<msg>#\d+ .*)$!';
+
     private $log;
     private $types = [];
     private $typecount = [];
@@ -102,43 +107,14 @@ public function parse()
 
         $prevError = new stdClass;
         while (!$log->eof()) {
-            if (preg_match('/stack trace:$/i', $log->current())) {
-                $stackTrace = $parts = [];
-                $log->next();
-                while ((preg_match('!^\[(?P<time>[^\]]*)\] PHP\s+(?P<msg>\d+\. .*)$!', $log->current(), $parts)
-                    || preg_match('!^(?P<msg>#\d+ .*)$!', $log->current(), $parts)
-                    || preg_match('/stack trace:$/i', $log->current())
-                    && !$log->eof())
-                ) {
-                    $stackTrace[] = $parts['msg'];
-                    $log->next();
-                }
-                // Not sure why this is here; it swallows up the next error message
-                //if (substr($stackTrace[0], 0, 2) == '#0') {
-                //    $stackTrace[] = $log->current();
-                //    $log->next();
-                //}
-                $prevError->trace = join("\n", $stackTrace);
-            }
-
-            $more = [];
-            while (!preg_match('!^\[(?P<time>[^\]]*)\] ((PHP|ojs2: )(?P<typea>.*?):|(?P<typeb>(WordPress|ojs2|\w has produced)\s{1,}\w+ \w+))\s+(?P<msg>.*)$!', $log->current()) && !$log->eof()) {
-                $more[] = $log->current();
-                $log->next();
-            }
-            if (!empty($more)) {
-                $prevError->more = join("\n", $more);
-            }
+            $this->captureStackTrace($log, $prevError);
+            $this->captureAnyAdditionalText($log, $prevError);
 
             $parts = [];
-            if (preg_match('!^\[(?P<time>[^\]]*)\] ((PHP|ojs2: )(?P<typea>.*?):|(?P<typeb>(WordPress|ojs2|\w has produced)\s{1,}\w+ \w+))\s+(?P<msg>.*)$!', $log->current(), $parts)) {
-                $parts['type'] = (@$parts['typea'] ?: $parts['typeb']);
-                if ($parts[3] == 'ojs2: ' || $parts[6] == 'ojs2') {
-                    $parts['type'] = 'ojs2 application';
-                }
+            if (preg_match(self::REGEX_ERROR_LINE, $log->current(), $parts)) {
+                $type = $this->getErrorType($parts);
                 $msg = trim($parts['msg']);
-                $type = strtolower(trim($parts['type']));
-                $this->types[$type] = strtolower(preg_replace('/[^a-z]/i', '', $type));
+
                 if (!isset($logs[$msg])) {
                     $data = [
                         'type'  => $type,
@@ -203,6 +179,62 @@ protected function getCodeSnippet($path, $line)
 
         return $code;
     }
+
+    public function captureStackTrace($log, $prevError)
+    {
+        if (preg_match(self::REGEX_TRACE_LINE, $log->current())) {
+            $stackTrace = $parts = [];
+            $log->next();
+            while ((preg_match(self::REGEX_TRACE_TYPE_A, $log->current(), $parts)
+                || preg_match(self::REGEX_TRACE_TYPE_B, $log->current(), $parts)
+                || preg_match(self::REGEX_TRACE_LINE, $log->current())
+                && !$log->eof())
+            ) {
+                $stackTrace[] = $parts['msg'];
+                $log->next();
+            }
+            // Not sure why this is here; it swallows up the next error message
+            //if (substr($stackTrace[0], 0, 2) == '#0') {
+            //    $stackTrace[] = $log->current();
+            //    $log->next();
+            //}
+            $prevError->trace = join("\n", $stackTrace);
+        }
+    }
+
+    public function captureAnyAdditionalText($log, $prevError)
+    {
+        $more = [];
+
+        while (!preg_match(self::REGEX_ERROR_LINE, $log->current()) && !$log->eof()) {
+            $more[] = $log->current();
+            $log->next();
+        }
+
+        if (!empty($more)) {
+            $prevError->more = join("\n", $more);
+        }
+    }
+
+    public function getErrorType($parts)
+    {
+        $type = (@$parts['typea'] ?: $parts['typeb']);
+
+        if ($parts[3] == 'ojs2: ' || $parts[6] == 'ojs2') {
+            $type = 'ojs2 application';
+        }
+
+        $type = strtolower(trim($type));
+
+        $this->addType($type);
+
+        return $type;
+    }
+
+    public function addType($type)
+    {
+        $this->types[$type] = strtolower(preg_replace('/[^a-z]/i', '', $type));
+    }
 }
 
 if ($error_log === null) {

From 27e09ca126baefd55334789d84cb2dd170cc9855 Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 16:30:12 -0500
Subject: [PATCH 10/11] Split out into additional methods

---
 index.php | 83 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 32 deletions(-)

diff --git a/index.php b/index.php
index 4a009d0..1ac2b9b 100644
--- a/index.php
+++ b/index.php
@@ -116,33 +116,9 @@ public function parse()
                 $msg = trim($parts['msg']);
 
                 if (!isset($logs[$msg])) {
-                    $data = [
-                        'type'  => $type,
-                        'first' => date_timestamp_get(date_create($parts['time'])),
-                        'last'  => date_timestamp_get(date_create($parts['time'])),
-                        'msg'   => $msg,
-                        'hits'  => 1,
-                        'trace' => null,
-                        'more'  => null
-                    ];
-                    $logItem = (object)$data;
-                    $this->captureFileDataFromMessage($logItem);
-
-                    $logs[$msg] = $logItem;
-                    if (!isset($this->typecount[$type])) {
-                        $this->typecount[$type] = 1;
-                    } else {
-                        ++$this->typecount[$type];
-                    }
+                    $logs[$msg] = $this->createEntry($type, $parts['time'], $msg);
                 } else {
-                    ++$logs[$msg]->hits;
-                    $time = date_timestamp_get(date_create($parts['time']));
-                    if ($time < $logs[$msg]->first) {
-                        $logs[$msg]->first = $time;
-                    }
-                    if ($time > $logs[$msg]->last) {
-                        $logs[$msg]->last = $time;
-                    }
+                    $this->updateEntry($logs[$msg], $parts['time']);
                 }
                 $prevError = &$logs[$msg];
             }
@@ -152,14 +128,48 @@ public function parse()
         return $logs;
     }
 
-    protected function captureFileDataFromMessage($logItem)
+    protected function createEntry($type, $time, $msg)
+    {
+        $data = [
+            'type'  => $type,
+            'first' => date_timestamp_get(date_create($time)),
+            'last'  => date_timestamp_get(date_create($time)),
+            'msg'   => $msg,
+            'hits'  => 1,
+            'trace' => null,
+            'more'  => null
+        ];
+        $entry = (object)$data;
+        $this->captureFileDataFromMessage($entry);
+
+        $this->increaseTypecount($type);
+
+        return $entry;
+    }
+
+    protected function updateEntry($entry, $time)
+    {
+        ++$entry->hits;
+
+        $time = date_timestamp_get(date_create($time));
+
+        if ($time < $entry->first) {
+            $entry->first = $time;
+        }
+
+        if ($time > $entry->last) {
+            $entry->last = $time;
+        }
+    }
+
+    protected function captureFileDataFromMessage($entry)
     {
         $subparts = [];
-        if (preg_match('!(?<core> in (?P<path>(/|zend)[^ :]*)(?: on line |:)(?P<line>\d+))$!', $logItem->msg, $subparts)) {
-            $logItem->path = $subparts['path'];
-            $logItem->line = $subparts['line'];
-            $logItem->core = str_replace($subparts['core'], '', $logItem->msg);
-            $logItem->code = $this->getCodeSnippet($subparts['path'], $subparts['line']);
+        if (preg_match('!(?<core> in (?P<path>(/|zend)[^ :]*)(?: on line |:)(?P<line>\d+))$!', $entry->msg, $subparts)) {
+            $entry->path = $subparts['path'];
+            $entry->line = $subparts['line'];
+            $entry->core = str_replace($subparts['core'], '', $entry->msg);
+            $entry->code = $this->getCodeSnippet($subparts['path'], $subparts['line']);
         }
     }
 
@@ -235,6 +245,15 @@ public function addType($type)
     {
         $this->types[$type] = strtolower(preg_replace('/[^a-z]/i', '', $type));
     }
+
+    public function increaseTypecount($type)
+    {
+        if (!isset($this->typecount[$type])) {
+            $this->typecount[$type] = 1;
+        } else {
+            ++$this->typecount[$type];
+        }
+    }
 }
 
 if ($error_log === null) {

From e0d5d78d4a89d1b52a2c36d14890bcfccdddc291 Mon Sep 17 00:00:00 2001
From: Jansen Price <jansen.price@gmail.com>
Date: Sat, 23 Jun 2018 16:30:32 -0500
Subject: [PATCH 11/11] Add line numbers to code snippets

---
 index.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 1ac2b9b..0bdb58e 100644
--- a/index.php
+++ b/index.php
@@ -178,10 +178,11 @@ protected function getCodeSnippet($path, $line)
         $code = '';
         try {
             $file = new SplFileObject(str_replace('zend.view://', '', $path));
-            $file->seek($line - 4);
+            $cursorline = $line - 4;
+            $file->seek($cursorline);
             $i = 7;
             do {
-                $code .= $file->current();
+                $code .= ++$cursorline . '. ' . $file->current();
                 $file->next();
             } while (--$i && !$file->eof());
         } catch (Exception $e) {