Fix expandLink to be simpler.

Author: csev

src/UI/Lessons.php

@@ -120,7 +120,7 @@ public function header($buffer=false) {
         }
         if ( isset($this->lessons->headers) && is_array($this->lessons->headers) ) {
             foreach($this->lessons->headers as $header) {
-                $header = self::expandLink($header);
+                $header = $this->expandLink($header);
                 echo($header);
                 echo("\n");
             }
@@ -411,26 +411,6 @@ public static function absolute_url_ref(&$url) {
      */
     public static function expandLink($url) {
         global $CFG;
-        // Skip expansion if URL already starts with http:// or https://
-        if (strpos($url, 'http://') === 0 || strpos($url, 'https://') === 0) {
-            return $url;
-        }
-        
-        // Clean up duplicate placeholders first (e.g., {apphome}/{apphome} -> {apphome})
-        $url = preg_replace('#\{apphome\}/+\{apphome\}#', '{apphome}', $url);
-        $url = preg_replace('#\{wwwroot\}/+\{wwwroot\}#', '{wwwroot}', $url);
-        
-        // Check if URL already contains expanded apphome or wwwroot (prevent double expansion)
-        $has_expanded_apphome = isset($CFG->apphome) && strpos($url, $CFG->apphome) !== false;
-        $has_expanded_wwwroot = isset($CFG->wwwroot) && strpos($url, $CFG->wwwroot) !== false;
-        
-        if ($has_expanded_apphome || $has_expanded_wwwroot) {
-            // URL already contains expanded values, just remove any remaining placeholders
-            $url = str_replace(array('{apphome}', '{wwwroot}'), '', $url);
-            // Clean up any double slashes that might result
-            $url = preg_replace('#([^:])//+#', '$1/', $url);
-            return $url;
-        }
 
         $search = array(
             "{apphome}",
@@ -442,20 +422,6 @@ public static function expandLink($url) {
         );
         $url = str_replace($search, $replace, $url);
 
-        // Hopefully, the URL starts with http:// or https://
-        if (strpos($url, 'http://') === 0 || strpos($url, 'https://') === 0) {
-            return $url;
-        }
-
-        // If we still don't have http:// or https://, and apphome is set, assume apphome, adding a / is the url sode not start with a slash
-        if ( $url !== '' && isset($CFG->apphome) ) {
-            if ( strpos($url, '/') !== 0 ) {    
-                $url = $CFG->apphome . '/' . $url;
-            } else {
-                $url = $CFG->apphome . $url;
-            }
-        }
-        
         return $url;
     }
 

src/UI/Lessons2.php

@@ -428,26 +428,6 @@ public static function absolute_url_ref(&$url) {
      */
     public static function expandLink($url) {
         global $CFG;
-        // Skip expansion if URL already starts with http:// or https://
-        if (strpos($url, 'http://') === 0 || strpos($url, 'https://') === 0) {
-            return $url;
-        }
-        
-        // Clean up duplicate placeholders first (e.g., {apphome}/{apphome} -> {apphome})
-        $url = preg_replace('#\{apphome\}/+\{apphome\}#', '{apphome}', $url);
-        $url = preg_replace('#\{wwwroot\}/+\{wwwroot\}#', '{wwwroot}', $url);
-        
-        // Check if URL already contains expanded apphome or wwwroot (prevent double expansion)
-        $has_expanded_apphome = isset($CFG->apphome) && strpos($url, $CFG->apphome) !== false;
-        $has_expanded_wwwroot = isset($CFG->wwwroot) && strpos($url, $CFG->wwwroot) !== false;
-        
-        if ($has_expanded_apphome || $has_expanded_wwwroot) {
-            // URL already contains expanded values, just remove any remaining placeholders
-            $url = str_replace(array('{apphome}', '{wwwroot}'), '', $url);
-            // Clean up any double slashes that might result
-            $url = preg_replace('#([^:])//+#', '$1/', $url);
-            return $url;
-        }
 
         $search = array(
             "{apphome}",
@@ -459,19 +439,6 @@ public static function expandLink($url) {
         );
         $url = str_replace($search, $replace, $url);
 
-        // Hopefully, the URL starts with http:// or https://
-        if (strpos($url, 'http://') === 0 || strpos($url, 'https://') === 0) {
-            return $url;
-        }
-
-        // If we still don't have http:// or https://, and apphome is set, assume apphome, adding a / is the url sode not start with a slash
-        if ( $url !== '' && isset($CFG->apphome) ) {
-            if ( strpos($url, '/') !== 0 ) {    
-                $url = $CFG->apphome . '/' . $url;
-            } else {
-                $url = $CFG->apphome . $url;
-            }
-        }
         return $url;
     }