From 501cf5a6ef15ad92745f47c512744b199cda263c Mon Sep 17 00:00:00 2001
From: f0o <f0o@librenms.org>
Date: Wed, 2 Sep 2015 00:13:14 +0100
Subject: [PATCH] Present all output+errors at the end

---
 build-base.php                 |  2 +-
 html/install.php               | 11 ++++++++---
 includes/sql-schema/update.php |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build-base.php b/build-base.php
index 56860774ed..1abbe7642d 100644
--- a/build-base.php
+++ b/build-base.php
@@ -36,7 +36,7 @@ while (!feof($sql_fh)) {
         }
         elseif ( abs($limit-$_REQUEST['offset']) > 6) {
             $_SESSION['offset'] = $limit;
-            echo '<b>Installing, please wait..</b><sub>'.date('r').'</sub><script>window.location.href = "install.php?offset='.$limit.'";</script>';
+            $GLOBALS['refresh'] = '<b>Installing, please wait..</b><sub>'.date('r').'</sub><script>window.location.href = "install.php?offset='.$limit.'";</script>';
             return;
         } else {
             echo 'Step #'.$limit.' ...'.PHP_EOL;
diff --git a/html/install.php b/html/install.php
index b3775d2a8c..bec581e350 100644
--- a/html/install.php
+++ b/html/install.php
@@ -309,7 +309,6 @@ elseif($stage == "2") {
      </div>
      <div class="col-md-6">
          <h5 class="text-center">Importing MySQL DB - Do not close this page or interrupt the import</h5>
-<pre>
 <?php
 // Ok now let's set the db connection up
     $config['db_host']=$dbhost;
@@ -318,14 +317,20 @@ elseif($stage == "2") {
     $config['db_name']=$dbname;
     $config['db']['extension']='mysqli';
     $sql_file = '../build.sql';
-    if ($_REQUEST['offset'] <= 100) {
+    ob_end_flush();
+    ob_start();
+    if ($_SESSION['offset'] < 100 && $_REQUEST['offset'] < 94) {
         require '../build-base.php';
     }
     else {
         require '../includes/sql-schema/update.php';
     }
+    $_SESSION['out'] .= ob_get_clean().PHP_EOL;
+    ob_end_clean();
+    ob_start();
+    echo $GLOBALS['refresh'];
+    echo "<pre>".$_SESSION['out']."</pre>";
 ?>
-</pre>
      </div>
      <div class="col-md-3">
      </div>
diff --git a/includes/sql-schema/update.php b/includes/sql-schema/update.php
index 7bbe7fc3ba..837794abf2 100644
--- a/includes/sql-schema/update.php
+++ b/includes/sql-schema/update.php
@@ -91,6 +91,7 @@ if ($tmp[0] <= $db_rev) {
     return;
 }
 
+$limit = @$limit?: $_REQUEST['offset'];
 foreach ($filelist as $file) {
     list($filename,$extension) = explode('.', $file, 2);
     if ($filename > $db_rev) {
@@ -99,7 +100,7 @@ foreach ($filelist as $file) {
         $limit++;
         if ( abs($limit-$_REQUEST['offset']) > 6) {
             $_SESSION['offset'] = $limit;
-            echo '<b>Updating, please wait..</b><sub>'.date('r').'</sub><script>window.location.href = "install.php?offset='.$limit.'";</script>';
+            $GLOBALS['refresh'] = '<b>Updating, please wait..</b><sub>'.date('r').'</sub><script>window.location.href = "install.php?offset='.$limit.'";</script>';
             return;
         }
     }