Merge branch 'testing' into 0.9.x

[quix0rs-gnu-social.git] / actions / doc.php

diff --git a/actions/doc.php b/actions/doc.php
index 99c2c796653590c943607fbc13b8f5df63783da3..459f5f09683ca013af2ffa7335fd06b4fb7a9f4c 100644 (file)
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -51,7 +51,12 @@ class DocAction extends Action
 
     function prepare($args)
     {
+        parent::prepare($args);
+
         $this->title  = $this->trimmed('title');
+        if (!preg_match('/^[a-zA-Z0-9_-]*$/', $this->title)) {
+            $this->title = 'help';
+        }
         $this->output = null;
 
         $this->loadDoc();
@@ -163,25 +168,48 @@ class DocAction extends Action
 
     function getFilename()
     {
-        $local = array_merge(glob(INSTALLDIR.'/local/doc-src/'.$this->title),
-                             glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*'));
+        if (file_exists(INSTALLDIR.'/local/doc-src/'.$this->title)) {
+            $localDef = INSTALLDIR.'/local/doc-src/'.$this->title;
+        }
 
-        if (count($local)) {
-            return $this->negotiateLanguage($local);
+        $local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*');
+        if ($local === false) {
+            // Some systems return false, others array(), if dir didn't exist.
+            $local = array();
         }
 
-        $dist = array_merge(glob(INSTALLDIR.'/doc-src/'.$this->title),
-                            glob(INSTALLDIR.'/doc-src/'.$this->title.'.*'));
+        if (count($local) || isset($localDef)) {
+            return $this->negotiateLanguage($local, $localDef);
+        }
 
-        if (count($dist)) {
-            return $this->negotiateLanguage($dist);
+        if (file_exists(INSTALLDIR.'/doc-src/'.$this->title)) {
+            $distDef = INSTALLDIR.'/doc-src/'.$this->title;
+        }
+
+        $dist = glob(INSTALLDIR.'/doc-src/'.$this->title.'.*');
+        if ($dist === false) {
+            $dist = array();
+        }
+
+        if (count($dist) || isset($distDef)) {
+            return $this->negotiateLanguage($dist, $distDef);
         }
 
         return null;
     }
 
-    function negotiateLanguage($files)
+    function negotiateLanguage($filenames, $defaultFilename=null)
     {
-        // FIXME: write this
+        // XXX: do this better
+
+        $langcode = common_language();
+
+        foreach ($filenames as $filename) {
+            if (preg_match('/\.'.$langcode.'$/', $filename)) {
+                return $filename;
+            }
+        }
+
+        return $defaultFilename;
     }
 }