Allow moderators to access surveys of their admin

timed-and-secured-assets · Feb 18, 2024 · 1c98a06 · till-20 · Feb 18, 2024 · till-20
1 parent d85e30d
commit 1c98a06
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/application/Controller/AdminSurveyController.php b/application/Controller/AdminSurveyController.php
@@ -551,7 +551,14 @@ private function setStudy($name) {
 
         $study = SurveyStudy::loadByUserAndName($this->user, $name);
         if (!$study->valid) {
-            formr_error(404, 'Not Found', 'Requested Survey does not exist or has been moved');
+            if($this->user->moderator_for==0){
+                formr_error(404, 'Not Found', 'Requested Survey does not exist or has been moved');
+            }
+
+            $study = SurveyStudy::loadByUserIdAndName($this->user->moderator_for, $name);
+            if(!$study->valid){
+                formr_error(404, 'Not Found', 'Requested Survey does not exist or has been moved');
+            }
         }
 
         $google_id = $study->getGoogleFileId();

diff --git a/application/Model/SurveyStudy.php b/application/Model/SurveyStudy.php
@@ -94,6 +94,20 @@ public static function loadByUserAndName(User $user, $name) {
         return new SurveyStudy(null, $options);
     }
 
+    /**
+     * 
+     * @param int $id
+     * @param string $name
+     * @return \SurveyStudy
+     */
+    public static function loadByUserIDAndName(int $id, $name) {
+        $options = [
+            'name' => $name,
+            'user_id' => $id,
+        ];
+        return new SurveyStudy(null, $options);
+    }
+
     protected function load($id, $options) {
         if (!$options || !is_array($options)) {
             $options = [];