Shut up some errors

[irc/unrealircd/unrealircd-webpanel.git] / settings / install.php

diff --git a/settings/install.php b/settings/install.php
index 28886ddf3edc66a89070e3ba22603fba0388dedc..ec05d094a4f1ad5e375378f65112a4444af3ba31 100644 (file)
--- a/settings/install.php
+++ b/settings/install.php
@@ -160,7 +160,10 @@ $writable = (is_writable("../config/")) ? true: false;
                        Message::Fail("Could not create user");
                        return;
                }
-               $lkup->add_permission(PERMISSION_MANAGE_USERS);
+               $lkup->add_meta('role', 'Super-Admin');
+
+               /* Enable lookups on HIBP by default */
+               $config['hibp'] = true;
 
                /* Now, write all the config (config.php + settings in DB) */
                write_config();
@@ -285,6 +288,8 @@ $writable = (is_writable("../config/")) ? true: false;
        </div>
 </div>
 </form>
+
+<!-- Database overwrite prompt -->
 <div class="modal fade" id="db_overwrite_modal" tabindex="-1" role="dialog" aria-labelledby="confirmModalCenterTitle" aria-hidden="true">
        <div class="modal-dialog modal-dialog-centered" role="document">
                <div class="modal-content">
@@ -307,6 +312,27 @@ $writable = (is_writable("../config/")) ? true: false;
        </div>
 </div>
 
+<!-- Database error dialog -->
+<div class="modal fade" id="db_error_modal" tabindex="-1" role="dialog" aria-labelledby="confirmModalCenterTitle" aria-hidden="true">
+       <div class="modal-dialog modal-dialog-centered" role="document">
+               <div class="modal-content">
+               <div class="modal-header">
+                       <h5 class="modal-title" id="myModalLabel">Database server error</h5>
+                       <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                       <span aria-hidden="true">&times;</span>
+                       </button>
+               </div>
+               <div class="modal-body" id="db_error_text">
+                       Unable to connect to the database.
+               </div>
+               <div class="modal-footer">
+                               <button id="CloseButton" type="button" class="btn btn-primary" data-dismiss="modal">Ok</button>
+                       </form>
+               </div>
+               </div>
+       </div>
+</div>
+
 <script>
        let BASE_URL = '<?php echo BASE_URL; ?>';
        let chmod_help = document.getElementById('chmod_help');
@@ -401,6 +427,8 @@ $writable = (is_writable("../config/")) ? true: false;
                        else
                        {
                                sql_test_conn.innerHTML = "Failed!";
+                               $('#db_error_text').html(data.error ? data.error : 'An error occured while connecting to the DB server');
+                               $('#db_error_modal').modal();
                                setTimeout(function() {
                                        sql_test_conn.innerHTML = "Test connection";
                                        sql_test_conn.classList.remove('disabled');