throw exception if setup is incomplete

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 3869f5da9c912aedea777aa1e52b42f8471366dd..1e18a8d4aa7ea234d9b647a3d5b5533aa7ce8e89 100644 (file)
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -31,6 +31,8 @@
 namespace OCA\user_ldap\lib;
 
 //magic properties (incomplete)
+use OC\ServerNotAvailableException;
+
 /**
  * responsible for LDAP connections in context with the provided configuration
  *
@@ -168,7 +170,7 @@ class Connection extends LDAPUtility {
                }
                if(is_null($this->ldapConnectionRes)) {
                        \OCP\Util::writeLog('user_ldap', 'No LDAP Connection to server ' . $this->connection->ldapHost, \OCP\Util::ERROR);
-                       throw new \Exception('Connection to LDAP server could not be established');
+                       throw new ServerNotAvailableException('Connection to LDAP server could not be established');
                }
                return $this->ldapConnectionRes;
        }

diff --git a/lib/private/hook.php b/lib/private/hook.php
index c4ea1999b09fa1b60df804922dbbb0aa057376e5..1e7a084bc31a21254d5ec719107966e31d28488b 100644 (file)
--- a/lib/private/hook.php
+++ b/lib/private/hook.php
@@ -114,6 +114,9 @@ class OC_Hook{
                                OC_Log::write('hook',
                                        'error while running hook (' . $class . '::' . $i["name"] . '): ' . $message,
                                        OC_Log::ERROR);
+                               if($e instanceof \OC\ServerNotAvailableException && $signalclass === 'OC_Filesystem' && $signalname === 'setup') {
+                                       throw $e;
+                               }
                        }
                }
 

diff --git a/lib/private/servernotavailableexception.php b/lib/private/servernotavailableexception.php
new file mode 100644 (file)
index 0000000..5a57917
--- /dev/null
+++ b/lib/private/servernotavailableexception.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC;
+
+
+class ServerNotAvailableException extends \Exception {
+
+}