close window if returned

mynaparrot · Sep 29, 2024 · 5f80d84 · 5f80d84
1 parent 174566a
commit 5f80d84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/classes/external/mod_plugnmeet_create_room.php b/classes/external/mod_plugnmeet_create_room.php
@@ -94,7 +94,7 @@ public static function create_room($instanceid, $join, $isadmin) {
 
         $connect = new PlugNmeetConnect($config);
         try {
-            $logouturl = $PAGE->url->get_scheme() . "://".$PAGE->url->get_host() . "/mod/plugnmeet/view.php?id=" . $cm->id;
+            $logouturl = $PAGE->url->get_scheme() . "://".$PAGE->url->get_host() . "/mod/plugnmeet/view.php?id=" . $cm->id . "&returned=true";
             $extradata = json_encode(array(
                 "platform" => "moodle",
                 "php-version" => phpversion(),

diff --git a/view.php b/view.php
@@ -23,6 +23,8 @@
  * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+use mod_plugnmeet\event\course_module_viewed;
+
 require(__DIR__ . '/../../config.php');
 require_once(__DIR__ . '/lib.php');
 
@@ -61,7 +63,7 @@
     exit();
 }
 
-$event = \mod_plugnmeet\event\course_module_viewed::create(array(
+$event = course_module_viewed::create(array(
     'objectid' => $moduleinstance->id,
     'context' => $context
 ));
@@ -87,6 +89,13 @@
         </div>
         <?php endif; ?>
     </div>
-
+    <script>
+        // check if returned from conference
+        const params = new URLSearchParams(document.location.search);
+        if (params.has("returned", "true")) {
+            // this will only work if link opened with window.open()
+            window.close();
+        }
+    </script>
 <?php
 echo $OUTPUT->footer();
diff --git a/views/join_part.php b/views/join_part.php
@@ -191,7 +191,7 @@ function join_conference() {
                             if (!windowOpen) {
                                 setTimeout(() => {
                                     window.location.href = url
-                                }, 2000);
+                                }, 5000);
                             }
                         } else {
                             alert(res.msg);