regen.php no longer needs to shell out to php

Author: townxelliot

.gitignore

@@ -13,3 +13,4 @@ wiki.git
 xwalk.css
 markdown.css
 menus.js
+github-regen

gfm.php

@@ -25,17 +25,6 @@ function missing ($f) {
     exit;
 }
 
-function make_name ($name) {
-    return preg_replace ('/_+/', ' ',
-           preg_replace ('/-+/', ' ',
-           preg_replace ('/^[0-9]*[-_]/', '',
-           $name)));
-}
-
-function sort_entries ($a, $b) {
-    return strcasecmp ($a['wiki'], $b['wiki']);
-}
-
 function ob_callback ($buffer) {
     global $d;
     fwrite ($d, $buffer);

regen.php

@@ -1,4 +1,6 @@
 <?php
+require_once ('wiki-pages.php');
+require_once ('wiki-history.php');
 /*
  * make sure you populate wiki.git via:
 
@@ -34,6 +36,7 @@
     print "git fetch failed";
     exit;
 }
-@system('php gfm.php wiki/pages.md >&1 >/dev/null');
-@system('php gfm.php wiki/history.md 2>&1 >/dev/null');
+
+wiki_pages ();
+wiki_history ();
 @touch ('github-regen');

strings.php

@@ -0,0 +1,9 @@
+<?php
+// functions for manipulating strings
+function make_name ($name) {
+    return preg_replace ('/_+/', ' ',
+           preg_replace ('/-+/', ' ',
+           preg_replace ('/^[0-9]*[-_]/', '',
+           $name)));
+}
+?>

wiki-history.php

@@ -1,4 +1,6 @@
 <?php
+require_once ('strings.php');
+
 // functions for generating the wiki history page in wiki/history.md.html;
 // note that this is actually a JSON file which is converted into
 // HTML once fetched via JavaScript... (see xwalk.js)

wiki-pages.php

@@ -1,6 +1,12 @@
 <?php
+require_once ('strings.php');
+
 // functions for generating wiki page list HTML in wiki/pages.md.html
 
+function sort_entries ($a, $b) {
+    return strcasecmp ($a['wiki'], $b['wiki']);
+}
+
 function generate_page_list () {
     $path = 'wiki';
     $wiki_git = '--git-dir='.$path.'.git';
@@ -16,16 +22,16 @@ function generate_page_list () {
         if (preg_match ('/\.(html|php|htaccess|js|log|git)$/', $file) ||
             preg_match ('/^assets\/.*/', $file))
             continue;
+        $normalised_name = make_name (pathinfo ($file, PATHINFO_FILENAME));
         $entries [] = Array ('wiki' => $file,
-                             'name' => make_name (
-                                 pathinfo ('wiki/'.$file, PATHINFO_FILENAME)));
+                             'name' => $normalised_name);
     }
     pclose ($p);
     usort ($entries, "sort_entries");
     for ($i = 0; $i < count ($entries); $i++) {
         $name = preg_replace ('/^[0-9]*[-_]/', '', $entries[$i]['wiki']);
         $name = preg_replace ('/\.[^.]*$/', '', $name);
-        $entries[$i]['file'] = '/'.$path.$name;
+        $entries[$i]['file'] = $path.'/'.$name;
         $entries[$i]['wiki'] = preg_replace ('/\.[^.]*$/', '', $entries[$i]['wiki']);
     }
     return $entries;