Closing ul-elements correctly now. Remove comments in headings from toc

moodleou · Jul 11, 2016 · fb7c621 · fb7c621
1 parent 0edd1a1
commit fb7c621
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/tableofcontents.php b/tableofcontents.php
@@ -61,7 +61,7 @@ public function toHtml() {
 
     $toc = $this->ToC;
     //echo "<pre>" . print_r($toc, true) . "</pre>";
-    $output = "<h3 class='ouwtopheading'>" . get_string('tableofcontents', 'ouwiki') . "</h3>";
+    $output = PHP_EOL . "<h3 class='ouwtopheading'>" . get_string('tableofcontents', 'ouwiki') . "</h3>" . PHP_EOL;
 
     // Helps building the nested <ul>-elements
     $lastlvl = 0;
@@ -81,16 +81,16 @@ public function toHtml() {
                   $currentLvl = $this->getLvlByChapterNumber($chapterNumber);
 
                   // The elements heading
-                  $element = '<li><a href="#'.$obj->id.'">'.$chapterNumber." ".$obj->name .'</a></li>';
+                  $element = '<li><a href="#'.$obj->id.'">'.$chapterNumber." ".$obj->name .'</a></li>' . PHP_EOL;
 
                   // New nested <ul>
                   if($currentLvl > $lastlvl) {
-                    $output .= str_repeat("<ul>", $currentLvl - $lastlvl);
+                    $output .= str_repeat("<ul>" . PHP_EOL, $currentLvl - $lastlvl);
                     $output .= $element;
                   }
                   // Close as many <ul> as necessary
                   elseif ($currentLvl < $lastlvl) {
-                    $output .= str_repeat("</ul>", $lastlvl - $currentLvl);
+                    $output .= str_repeat("</ul>" . PHP_EOL, $lastlvl - $currentLvl);
                     $output .= $element;
                   }
                   // Same level, just add <li>
@@ -108,7 +108,7 @@ public function toHtml() {
       }
     }
 
-    $output .= "</ul>";
+    $output .= str_repeat("</ul>" . PHP_EOL, $lastlvl);
     return $output;
   }
 
@@ -189,7 +189,17 @@ private function parseHtml($html) {
       foreach ($headings as $heading) {
         // Get Heading level: <h6> => 6
         $lvl = substr($heading->tagName, 1);
-
+
+        $childNodes = $heading->childNodes;
+        for($i = 0; $i < $childNodes->length; $i++) {
+            $node = $childNodes->item($i);
+            if(isset($node->tagName)) {
+                $heading->removeChild($node);
+                echo "Child removed! <br />";
+            }
+        }
+
+
         // Get id:
         // <h1 id="ouw_s0_0"> => ouw_s0_0
         $attributes = $heading->attributes;