User management works good enough for now. Need to do something else ...

3 files changed, 22 insertions, 26 deletions

diff --git a/admin/ajax/changepassword.php b/admin/ajax/changepassword.php
index 12a27fff58d..a8f3af15175 100644
--- a/admin/ajax/changepassword.php
+++ b/admin/ajax/changepassword.php
@@ -12,14 +12,15 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
 	exit();
 }
 
-$name = $_POST["username"];
+$username = $_POST["username"];
+$password = $_POST["password"];
 
 // Return Success story
-if( OC_USER::deleteUser( $name )){
-	echo json_encode( array( "status" => "success", "data" => array( "username" => $name )));
+if( OC_USER::setPassword( $username, $password )){
+	echo json_encode( array( "status" => "success", "data" => array( "username" => $username )));
 }
 else{
-	echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to delete user" )));
+	echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to change password" )));
 }
 
 ?>
diff --git a/admin/ajax/removeuser.php b/admin/ajax/removeuser.php
index 9cf52c128b0..7e587f16058 100644
--- a/admin/ajax/removeuser.php
+++ b/admin/ajax/removeuser.php
@@ -12,30 +12,14 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
 	exit();
 }
 
-$groups = array();
 $username = $_POST["username"];
-$password = $_POST["password"];
-$groups = $_POST["groups"];
-
-$success = true;
-if( $password ){
-	$success = $success && OC_USER::setPassword( $username, $password );
-}
-
-// update groups (delete old ones, add new ones)
-foreach( OC_GROUP::getUserGroups( $username ) as $i ){
-	OC_GROUP::removeFromGroup( $username, $i );
-}
-foreach( $groups as $i ){
-	OC_GROUP::addToGroup( $username, $i );
-}
 
 // Return Success story
-if( $success ){
-	echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "groups" => implode( ", ", $groups ))));
+if( OC_USER::deleteUser( $username )){
+	echo json_encode( array( "status" => "success", "data" => array( "username" => $username )));
 }
 else{
-	echo json_encode( array( "status" => "error", "data" => array( "message" => "Edit user" )));
+	echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to delete user" )));
 }
 
 ?>
diff --git a/admin/ajax/togglegroups.php b/admin/ajax/togglegroups.php
index 12a27fff58d..cd26dbc1440 100644
--- a/admin/ajax/togglegroups.php
+++ b/admin/ajax/togglegroups.php
@@ -12,11 +12,22 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
 	exit();
 }
 
-$name = $_POST["username"];
+$success = true;
+
+$username = $_POST["username"];
+$group = $_POST["group"];
+
+// Toggle group
+if( OC_GROUP::inGroup( $username, $group )){
+	OC_GROUP::removeFromGroup( $username, $group );
+}
+else{
+	OC_GROUP::addToGroup( $username, $group );
+}
 
 // Return Success story
-if( OC_USER::deleteUser( $name )){
-	echo json_encode( array( "status" => "success", "data" => array( "username" => $name )));
+if( $success ){
+	echo json_encode( array( "status" => "success", "data" => array( "username" => $username )));
 }
 else{
 	echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to delete user" )));