Small re-write to use realtive paths instead of absolute paths in "mo…

…d_url" onclick events. Allowing for domain aliases.
LoneBeta · Jul 16, 2018 · 9fb1e68 · 9fb1e68
1 parent 4ecf02b
commit 9fb1e68
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mod/url/lib.php b/mod/url/lib.php
@@ -231,17 +231,21 @@ function url_get_coursemodule_info($coursemodule) {
     $info->icon = url_guess_icon($url->externalurl, 24);
 
     $display = url_get_final_display_type($url);
+
+    $parsedurl = parse_url($CFG->wwwroot);
 
     if ($display == RESOURCELIB_DISPLAY_POPUP) {
-        $fullurl = "$CFG->wwwroot/mod/url/view.php?id=$coursemodule->id&amp;redirect=1";
+        $fullurl = isset($parsedurl['path']) ? $parsedurl['path'] : '';
+        $fullurl .= "/mod/url/view.php?id=$coursemodule->id&amp;redirect=1";
         $options = empty($url->displayoptions) ? array() : unserialize($url->displayoptions);
         $width  = empty($options['popupwidth'])  ? 620 : $options['popupwidth'];
         $height = empty($options['popupheight']) ? 450 : $options['popupheight'];
         $wh = "width=$width,height=$height,toolbar=no,location=no,menubar=no,copyhistory=no,status=no,directories=no,scrollbars=yes,resizable=yes";
         $info->onclick = "window.open('$fullurl', '', '$wh'); return false;";
 
     } else if ($display == RESOURCELIB_DISPLAY_NEW) {
-        $fullurl = "$CFG->wwwroot/mod/url/view.php?id=$coursemodule->id&amp;redirect=1";
+        $fullurl = isset($parsedurl['path']) ? $parsedurl['path'] : '';
+        $fullurl .= "/mod/url/view.php?id=$coursemodule->id&amp;redirect=1";
         $info->onclick = "window.open('$fullurl'); return false;";
 
     }