Merge branch 'master' of http://git.gitorious.org/owncloud/owncloud

3 files changed, 44 insertions, 0 deletions

diff --git a/inc/User/backend.php b/inc/User/backend.php
index b830859566e..4283e6799ef 100755
--- a/inc/User/backend.php
+++ b/inc/User/backend.php
@@ -138,4 +138,16 @@ abstract class OC_USER_BACKEND {
 	 */
 	abstract public static function checkPassword($username, $password);
 
+
+	/**
+	 * get a list of all users
+	 *
+	 */
+	abstract public static function getUsers();
+	
+	/**
+	 * get a list of all groups
+	 *
+	 */
+	abstract public static function getGroups();
 }
diff --git a/inc/lib_user.php b/inc/lib_user.php
index 593cd979ef4..2f55e5f6b2a 100644
--- a/inc/lib_user.php
+++ b/inc/lib_user.php
@@ -213,4 +213,19 @@ class OC_USER {
 		return self::$_backend->checkPassword($username, $password);
 	}
 
+	/**
+	 * get a list of all users
+	 *
+	 */
+	public static function getUsers() {
+		return self::$_backend->getUsers();
+	}
+	
+	/**
+	 * get a list of all groups
+	 *
+	 */
+	public static function getGroups() {
+		return self::$_backend->getGroups();
+	}
 }
diff --git a/plugins/ldap/lib_ldap.php b/plugins/ldap/lib_ldap.php
index 2105ed2464e..581561a505d 100755
--- a/plugins/ldap/lib_ldap.php
+++ b/plugins/ldap/lib_ldap.php
@@ -199,4 +199,21 @@ class OC_USER_LDAP extends OC_USER_BACKEND {
 		return false;
 	}
 
+	/**
+	 * get a list of all users
+	 *
+	 */
+	public static function getUsers(){
+		// does not work with MOD_AUTH (only or some modules)
+		return false;
+	}
+	
+	/**
+	 * get a list of all groups
+	 *
+	 */
+	public static function getGroups(){
+		// does not work with MOD_AUTH (only or some modules)
+		return false;
+	}
 }