From dcf9f262958a1b910b6fe59d02b3339dbf52f2b2 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 4 Jan 2015 23:36:21 -0500
Subject: [PATCH] Closes #103 Install errors should be displayed in the main
 install area, not in the panel

---
 install/install_functions.inc.php | 63 +++++++++++++++++--------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 2deee5ec..67269a74 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -347,35 +347,7 @@ function hesk_iDatabase($problem=0)
                 <p>Summary</p>
             </div>
             <div class="panel-body">
-                <?php
-                    if ($problem == 1)
-                    {
-                        echo '<br /><br />Double-check all the information below. Contact your hosting company for the correct information to use!<br /><br /><b>MySQL said:</b> '.$mysql_log.'</p>', 'Database connection failed';
-                    }
-                    elseif ($problem == 2)
-                    {
-                        echo '<b>Database tables already exist!</b><br /><br />
-                        HESK database tables with <b>'.$hesk_settings['db_pfix'].'</b> prefix already exist in this database!<br /><br />
-                        To upgrade an existing HESK installation select <a href="index.php">Update existing install</a> instead.<br /><br />
-                        To install a new copy of HESK in use a unique table prefix.';
-                    }
-                    elseif ($problem == 3)
-                    {
-                        echo '<b>Old database tables not found!</b><br /><br />
-                        HESK database tables have not been found in this database!<br /><br />
-                        To install HESK use the <a href="index.php">New install</a> option instead.';
-                    }
-                    elseif ($problem == 4)
-                    {
-                        echo '<b>Version '.HESK_NEW_VERSION.' tables already exist!</b><br /><br />
-                        Your database seems to be compatible with HESK version '.HESK_NEW_VERSION.'<br /><br />
-                        To install a new copy of HESK use the <a href="index.php">New install</a> option instead.';
-                    }
-                    else
-                    {
-                        echo '<p style="padding: 10px;">To complete setup HESK needs to connect to your database. You can get this information from your hosting control panel.</p>';
-                    }
-                ?>
+                <p style="padding: 10px;">To complete setup HESK needs to connect to your database. You can get this information from your hosting control panel.</p>
             </div>
         </div>
 	</div>
@@ -384,6 +356,39 @@ function hesk_iDatabase($problem=0)
         <form role="form" action="<?php echo INSTALL_PAGE; ?>" method="post">
             <div class="h3">Database Settings</div>
             <div class="footerWithBorder blankSpace"></div>
+            <?php
+            if ($problem == 1)
+            {
+                echo '<div class="alert alert-danger">';
+                echo '<br /><br />Double-check all the information below. Contact your hosting company for the correct information to use!<br /><br /><b>MySQL said:</b> '.$mysql_log.'</p>', 'Database connection failed';
+                echo '</div>';
+            }
+            elseif ($problem == 2)
+            {
+                echo '<div class="alert alert-danger">';
+                echo '<b>Database tables already exist!</b><br /><br />
+                        HESK database tables with <b>'.$hesk_settings['db_pfix'].'</b> prefix already exist in this database!<br /><br />
+                        To upgrade an existing HESK installation select <a href="index.php">Update existing install</a> instead.<br /><br />
+                        To install a new copy of HESK in use a unique table prefix.';
+                echo '</div>';
+            }
+            elseif ($problem == 3)
+            {
+                echo '<div class="alert alert-danger">';
+                echo '<b>Old database tables not found!</b><br /><br />
+                        HESK database tables have not been found in this database!<br /><br />
+                        To install HESK use the <a href="index.php">New install</a> option instead.';
+                echo '</div>';
+            }
+            elseif ($problem == 4)
+            {
+                echo '<div class="alert alert-danger">';
+                echo '<b>Version '.HESK_NEW_VERSION.' tables already exist!</b><br /><br />
+                        Your database seems to be compatible with HESK version '.HESK_NEW_VERSION.'<br /><br />
+                        To install a new copy of HESK use the <a href="index.php">New install</a> option instead.';
+                echo '</div>';
+            }
+            ?>
         
             <div class="form-group">
                 <label for="host">Database Host</label>