Moved dependency checks to end of class files

Dependency messages now appear below the configuration options instead of above
Reworked dependency check method to support consolidated messages for multiple backends

Conflicts:
	apps/files_external/lib/google.php
	apps/files_external/lib/swift.php
	apps/files_external/templates/settings.php

1 files changed, 11 insertions, 12 deletions

diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index f6a54bc0ca8..38de3360f2b 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -33,18 +33,6 @@ class Dropbox extends \OC\Files\Storage\Common {
 
 	private static $tempFiles = array();
 
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		if (function_exists('curl_init')) {
-			return true;
-		} else {
-			$l = new \OC_L10N('files_external');
-			return $l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of Dropbox is not possible. Please ask your system administrator to install it.');
-		}
-	}
-
 	public function __construct($params) {
 		if (isset($params['configured']) && $params['configured'] == 'true'
 			&& isset($params['app_key'])
@@ -323,4 +311,15 @@ class Dropbox extends \OC\Files\Storage\Common {
 		return true;
 	}
 
+	/**
+	 * check if curl is installed
+	 */
+	public static function checkDependencies() {
+		if (function_exists('curl_init')) {
+			return true;
+		} else {
+			return array('curl');
+		}
+	}
+
 }