Skip deleted user - avoid missing arguments on share

pydio · Oct 11, 2013 · efa14f7 · efa14f7
1 parent 020f1bc
commit efa14f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -944,7 +944,8 @@ function createSharedRepository($httpVars, $repository, $accessDriver, $uniqueUs
             if($eType == "user"){
                 $u = AJXP_Utils::decodeSecureMagic($httpVars["user_".$index], AJXP_SANITIZE_ALPHANUM);
                 if(!AuthService::userExists($u) && !isSet($httpVars["user_pass_".$index])){
-                    return 100;
+                    $index++;
+                    continue;
                 }else if(AuthService::userExists($u) && isSet($httpVars["user_pass_".$index])){
                     throw new Exception("User $u already exists, please choose another name.");
                 }

diff --git a/core/src/plugins/conf.sql/class.sqlConfDriver.php b/core/src/plugins/conf.sql/class.sqlConfDriver.php
@@ -357,7 +357,7 @@ public function deleteRepository($repositoryId)
     public function getUserChildren( $userId )
     {
         $children = array();
-        $children_results = dibi::query('SELECT [login] FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] = %s', "ajxp.parent_user", $userId);
+        $children_results = dibi::query('SELECT [ajxp_users].[login] FROM [ajxp_user_rights],[ajxp_users] WHERE [repo_uuid] = %s AND [rights] = %s AND [ajxp_user_rights].[login] = [ajxp_users].[login]', "ajxp.parent_user", $userId);
         $all = $children_results->fetchAll();
         foreach ($all as $item) {
             $children[] = $this->createUserObject($item["login"]);
@@ -374,7 +374,7 @@ public function getUsersForRepository($repositoryId)
     {
         $result = array();
         // OLD METHOD
-        $children_results = dibi::query('SELECT [login] FROM [ajxp_user_rights] WHERE [repo_uuid] = %s GROUP BY [login]', $repositoryId);
+        $children_results = dibi::query('SELECT [ajxp_users].[login] FROM [ajxp_user_rights],[ajxp_users] WHERE [repo_uuid] = %s AND [ajxp_user_rights].[login] = [ajxp_users].[login] GROUP BY [ajxp_user_rights].[login]', $repositoryId);
         $all = $children_results->fetchAll();
         foreach ($all as $item) {
             $result[$item["login"]] = $this->createUserObject($item["login"]);