Bug #14, fixes - split/chunk a Moodle course home-page.. [iet:6252860]

IET-OU · Jul 21, 2016 · a143983 · a143983
1 parent 5b50a71
commit a143983
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/Generator/Html.php b/lib/Generator/Html.php
@@ -172,7 +172,7 @@ public function staticHtml($page)
 </div>
 
 EOT;
-        if (false === strpos($page->url, 'sideblock') || (isset($page->filename) && false === strpos($page->filename, '-resources-')) ) {
+        if (false === strpos($page->url, 'sideblock') || (isset($page->filename) && false === strpos($page->filename, '_resources-'))) {
             $template .= <<<EOT
 <script id="mbp-pg-data" type="application/json">
 %json

diff --git a/lib/Generator/StaticPages.php b/lib/Generator/StaticPages.php
@@ -212,7 +212,7 @@ protected function putSectionPage($section, $section_html)
                 'modulename'  => 'section',
                 'filename' => $section_pages[ 'sid:' . $section->id ],
                 'name'  => $section->title,
-                'content' => implode('\n', $section_html),
+                'content' => implode("\n", $section_html),
             ];
             $sec_page->url = $this->url($sec_page->filename);
             $filename = $this->output_dir . '/' . $sec_page->filename . '.htm';
@@ -302,7 +302,7 @@ protected function putUrlActivity($url)
 
     protected function url($filename)
     {
-        return $this->base . preg_replace('/^\-/', '', $filename);
+        return $this->base . preg_replace('/^[-_\.]/', '', $filename);
     }
 
     protected function putIndex()
@@ -343,7 +343,9 @@ protected function putYaml()
         $yml_post = ": { }\n\n#End.\n";
         $yml_join = ": { }\n    ";
 
-        $bytes = file_put_contents($filename, $yml_pre . implode($yml_join, $this->references) . $yml_post);
+        $references = array_merge($this->opt('section_pages', []), $this->references);
+
+        $bytes = file_put_contents($filename, $yml_pre . implode($yml_join, $references) . $yml_post);
         return $bytes;
     }
 }