From a361ae4008b72287ca2d6eb6a83b33069d9816e8 Mon Sep 17 00:00:00 2001 From: Mikhail Golenkov Date: Fri, 7 Feb 2020 14:25:33 +1100 Subject: [PATCH] Simplify url building for update_link_stylesheet_parse() #179. --- .../maintenance_static_page_generator.php | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/classes/local/controllers/maintenance_static_page_generator.php b/classes/local/controllers/maintenance_static_page_generator.php index 5cf0eba..6de8c25 100644 --- a/classes/local/controllers/maintenance_static_page_generator.php +++ b/classes/local/controllers/maintenance_static_page_generator.php @@ -156,25 +156,8 @@ class maintenance_static_page_generator { if (maintenance_static_page_io::is_url($originalurl)) { $fullurl = $originalurl; } else if ($originalurl[0] == '/') { - if (strpos($CFG->wwwroot, 'http://') === 0) { - $domain = substr($CFG->wwwroot, 7); - if (strpos($domain, '/') > 0) { - $base = substr($domain, 0, strpos($domain, '/')); - } else { - $base = $domain; - } - $fullurl = 'http://'.$base.$originalurl; - } else if (strpos($CFG->wwwroot, 'https://') === 0) { - $domain = substr($CFG->wwwroot, 8); - if (strpos($domain, '/') > 0) { - $base = substr($domain, 0, strpos($domain, '/')); - } else { - $base = $domain; - } - $fullurl = 'https://'.$base.$originalurl; - } else { - $fullurl = $CFG->wwwroot.$originalurl; - } + $rooturl = parse_url($CFG->wwwroot); + $fullurl = $rooturl['scheme'].'://'.$rooturl['host'].$originalurl; } else { $fullurl = $baseref.'/'.$originalurl; }