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, 14 insertions, 14 deletions

diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 6fb262323ff..3ef13b633a9 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -17,20 +17,6 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 	private $root;
 	private $share;
 
-	/**
-	 * check if smbclient is installed
-	 */
-	public static function checkDependencies() {
-		if (function_exists('shell_exec')) {
-			$output = shell_exec('which smbclient');
-			if (!empty($output)) {
-				return true;
-			}
-		}
-		$l = new \OC_L10N('files_external');
-		return $l->t('<b>Note:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.');
-	}
-
 	public function __construct($params) {
 		if (isset($params['host']) && isset($params['user']) && isset($params['password']) && isset($params['share'])) {
 			$this->host=$params['host'];
@@ -148,4 +134,18 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 		}
 		return $lastCtime;
 	}
+
+	/**
+	 * check if smbclient is installed
+	 */
+	public static function checkDependencies() {
+		if (function_exists('shell_exec')) {
+			$output = shell_exec('which smbclient');
+			if (!empty($output)) {
+				return true;
+			}
+		}
+		return array('smbclient');
+	}
+
 }