Make sure only one owner is mentioned (Project details of LO in share…

…d folder)
thexerteproject · Mar 10, 2023 · dc81e0a · dc81e0a
1 parent 899f98f
commit dc81e0a
Showing 1 changed file with 18 additions and 21 deletions.
diff --git a/website_code/php/properties/properties_library.php b/website_code/php/properties/properties_library.php
@@ -966,36 +966,15 @@ function sharing_info($template_id)
                 if ($role['user_id'] == $user['user_id']) {
                     if ($row['folder'] == $role['folder_id']) {
                         $query_shared_folder_users[$indexUser]["role"] = $role['role'];
-                        //$query_shared_folder_users[$indexUser]["role_source"] = 'folder';
-
-                        //if ($user["role"] == "creator") {
-                        //    $query_shared_folder_users[$indexUser]["role"] = "co-author";
-                        //}
 
                         if ($row["user_id"] == $query_shared_folder_users[$indexUser]["user_id"] && $row["role"] == "creator") {
                             $query_shared_folder_users[$indexUser]["role"] = "creator";
-                            // Change the role of the user to co-author
-                            foreach ($query_shared_folder_users as $indexUser2 => $user2) {
-                                if ($user2['user_id'] != $row['user_id'] && $user2['role'] == "creator") {
-                                    $query_shared_folder_users[$indexUser2]["role"] = "co-author";
-                                    break;
-                                }
-                            }
                         }
                     }
                 }
                 if ($row["user_id"] == $query_shared_folder_users[$indexUser]["user_id"] && $row["role"] != "creator" && $roles[$role["role"]] < $roles[$row["role"]]) {
                     $query_shared_folder_users[$indexUser]["role"] = $row["role"];
                     $query_shared_folder_users[$indexUser]["role_source"] = 'template';
-                    if ($row['role'] == "creator") {
-                        // Change the role of the user to co-author
-                        foreach ($query_shared_folder_users as $indexUser2 => $user2) {
-                            if ($user2['user_id'] != $row['user_id'] && $user2['role'] == "creator") {
-                                $query_shared_folder_users[$indexUser2]["role"] = "co-author";
-                                break;
-                            }
-                        }
-                    }
                 }
             }
         }
@@ -1015,6 +994,24 @@ function sharing_info($template_id)
             }
         }
     }
+    foreach ($query_sharing_rows as $index => $row) {
+        foreach ($query_shared_folder_users as $indexUser => $user) {
+            foreach ($query_shared_folder_users_roles as $indexRole => $role) {
+                if ($role['user_id'] == $user['user_id']) {
+                    if ($row['folder'] == $role['folder_id']) {
+                        if ($row["user_id"] == $query_shared_folder_users[$indexUser]["user_id"] && $row["role"] == "creator") {
+                            foreach ($query_shared_folder_users as $indexUser2 => $user2) {
+                                if ($user2['user_id'] != $row['user_id'] && $user2['role'] == "creator") {
+                                    $query_shared_folder_users[$indexUser2]["role"] = "co-author";
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     foreach ($query_shared_folder_users as $index => $user){
         $query_shared_folder_users[$index]["template_id"] = $template_id;