From ded6666897b4f6f33fe3d2ada0815d6de766ebaf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 28 Aug 2015 15:25:21 +0200
Subject: [PATCH] wizard: Show a warning if the IDO is used for the internal
 database

resolves #9653
---
 .../application/forms/DbResourcePage.php      | 65 ++++++++++++-------
 modules/setup/library/Setup/Utils/DbTool.php  |  2 +
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index 22b0576d6..7389e3d47 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -3,7 +3,7 @@
 
 namespace Icinga\Module\Setup\Forms;
 
-use PDOException;
+use Exception;
 use Icinga\Web\Form;
 use Icinga\Forms\Config\Resource\DbResourceForm;
 use Icinga\Module\Setup\Utils\DbTool;
@@ -112,7 +112,7 @@ class DbResourcePage extends Form
         try {
             $db = new DbTool($this->getValues());
             $db->checkConnectivity();
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             $this->error(sprintf(
                 $this->translate('Failed to successfully validate the configuration: %s'),
                 $e->getMessage()
@@ -120,34 +120,49 @@ class DbResourcePage extends Form
             return false;
         }
 
-        if ($this->getValue('db') === 'pgsql') {
-            if (! $db->isConnected()) {
-                try {
-                    $db->connectToDb();
-                } catch (PDOException $e) {
-                    $this->warning($this->translate(sprintf(
-                        'Unable to check the server\'s version. This is usually not a critical error as there is'
-                        . ' probably only access to the database permitted which does not exist yet. If you are'
-                        . ' absolutely sure you are running PostgreSQL in a version equal to or newer than 9.1,'
-                        . ' you can skip the validation and safely proceed to the next step. The error was: %s',
-                        $e->getMessage()
-                    )));
-                    return false;
-                }
-            }
+        $state = true;
+        $connectionError = null;
 
-            $version = $db->getServerVersion();
-            if (version_compare($version, '9.1', '<')) {
-                $this->error($this->translate(sprintf(
-                    'The server\'s version %s is too old. The minimum required version is %s.',
-                    $version,
-                    '9.1'
+        try {
+            $db->connectToDb();
+        } catch (Exception $e) {
+            $connectionError = $e;
+        }
+
+        if ($connectionError === null && array_search('icinga_instances', $db->listTables(), true) !== false) {
+            $this->warning($this->translate(
+                'The database you\'ve configured to use for Icinga Web 2 seems to be the one of Icinga. Please be aware'
+                . ' that this database configuration is supposed to be used for Icinga Web 2\'s configuration and that'
+                . ' it is highly recommended to not mix different schemas in the same database. If this is intentional,'
+                . ' you can skip the validation and ignore this warning. If not, please provide a different database.'
+            ));
+            $state = false;
+        }
+
+        if ($this->getValue('db') === 'pgsql') {
+            if ($connectionError !== null) {
+                $this->warning($this->translate(sprintf(
+                    'Unable to check the server\'s version. This is usually not a critical error as there is'
+                    . ' probably only access to the database permitted which does not exist yet. If you are'
+                    . ' absolutely sure you are running PostgreSQL in a version equal to or newer than 9.1,'
+                    . ' you can skip the validation and safely proceed to the next step. The error was: %s',
+                    $connectionError->getMessage()
                 )));
-                return false;
+                $state = false;
+            } else {
+                $version = $db->getServerVersion();
+                if (version_compare($version, '9.1', '<')) {
+                    $this->error($this->translate(sprintf(
+                        'The server\'s version %s is too old. The minimum required version is %s.',
+                        $version,
+                        '9.1'
+                    )));
+                    $state = false;
+                }
             }
         }
 
-        return true;
+        return $state;
     }
 
     /**
diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
index 03f10ebf4..dd632f352 100644
--- a/modules/setup/library/Setup/Utils/DbTool.php
+++ b/modules/setup/library/Setup/Utils/DbTool.php
@@ -271,6 +271,8 @@ class DbTool
                 $this->config['db']
             );
         }
+
+        $this->zendConn->getConnection(); // Force connection attempt
     }
 
     /**