Prevent re-sharing of shared folders

thexerteproject · Mar 9, 2023 · 2fcdc25 · 2fcdc25
1 parent 25a82a1
commit 2fcdc25
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/website_code/php/folder_status.php b/website_code/php/folder_status.php
@@ -338,10 +338,12 @@ function is_folder_shared_subfolder($folder_id)
             // Check if folder itself is shared
             $sql = "select fr.folder_parent, count(fr2.folder_id) as nrshared from {$prefix}folderrights fr, {$prefix}folderrights fr2 where fr.folder_id=? and fr.login_id=? and fr2.folder_id=fr.folder_id group by fr2.folder_id, fr.folder_parent";
             $result = db_query_one($sql, array($folder, $_SESSION['toolkits_logon_id']));
-            if ($result['nrshared'] > 1 && $folder != $folder_id) {
+            if ($result != null && $result['nrshared'] > 1 && $folder != $folder_id) {
                 return true;
             }
             else{
+                $sql = "select fr.folder_parent from {$prefix}folderrights fr where fr.folder_id=? and fr.role=?";
+                $result = db_query_one($sql, array($folder, 'creator'));
                 $parent = $result['folder_parent'];
                 $folder = $parent;
             }
@@ -354,6 +356,12 @@ function is_folder_shared_subfolder($folder_id)
             else{
                 $sql = "select fr.folder_parent from {$prefix}folderrights fr where fr.folder_id=? and fr.login_id=?";
                 $result = db_query_one($sql, array($folder, $_SESSION['toolkits_logon_id']));
+
+                if ($result == null)
+                {
+                    $sql = "select fr.folder_parent from {$prefix}folderrights fr where fr.folder_id=? and fr.role=?";
+                    $result = db_query_one($sql, array($folder, 'creator'));
+                }
                 $parent = $result['folder_parent'];
                 $folder = $parent;
             }