Mercurial > hg > fapweb

changeset 894:a8fe46a555be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moar work.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 26 Nov 2014 20:19:29 +0200
parents 43fa1c4c783f
children 878e3bd6f385
files msite.inc.php
diffstat 1 files changed, 16 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/msite.inc.php	Wed Nov 26 20:11:32 2014 +0200
+++ b/msite.inc.php	Wed Nov 26 20:19:29 2014 +0200
@@ -852,7 +852,7 @@
 //
 function stFilterPathComponent($str)
 {
-  return preg_replace("/[^a-zA-Z0-9\,\._-]/", "_", $str);
+  return preg_replace("/[^a-zA-Z0-9\(\)\,\._-]/", "_", $str);
 }
 
 
@@ -968,12 +968,11 @@
 
   foreach ($pdata["files"] as $pkey => $pfile)
   {
-    if ($pfile["exists"] === false ||
-        $pfile["mtime"] < $efile["utime"])
-    {
+    if ($pfile["exists"])
+      $pdata["exists"]++;
+
+    if ($pfile["mtime"] < $efile["utime"])
       $pdata["valid"] = FALSE;
-      break;
-    }
   }
 
   return TRUE;
@@ -988,12 +987,7 @@
   switch ($pdata["type"])
   {
     case EPREV_IMAGE:
-      if (!$pdata["valid"])
-      {
-        echo
-          "<img class=\"imagePreview\" src=\"".stGetSetting("previewNoImage")."\" alt=\"Preview\" />";
-      }
-      else
+      if ($pdata["valid"] && $pdata["exists"] >= 2)
       {
         echo
           "<a href=\"".ihentities($pdata["files"]["image"]["url"]).
@@ -1001,10 +995,15 @@
           "<img class=\"imagePreview\" src=\"".ihentities($pdata["files"]["thumb"]["url"]).
           "\" alt=\"Preview\" /></a>";
       }
+      else
+      {
+        echo
+          "<img class=\"imagePreview\" src=\"".stGetSetting("previewNoImage")."\" alt=\"Preview\" />";
+      }
       break;
 
     case EPREV_AUDIO:
-      if ($pdata["valid"] && count($pdata["files"]) > 0)
+      if ($pdata["valid"] && $pdata["exists"] > 0)
       {
         echo "<audio controls preload=\"none\" class=\"audioPreview\">";
         foreach ($pdata["files"] as $pkey => $pfile)
@@ -1013,6 +1012,10 @@
         }
         echo "</audio>";
       }
+      else
+      {
+        // XXX TODO?
+      }
       break;
   }
 }