Mercurial > hg > fapweb
changeset 895:878e3bd6f385
Moar fixes.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 26 Nov 2014 20:33:07 +0200 |
parents | a8fe46a555be |
children | 52737f6192bb |
files | msite.inc.php |
diffstat | 1 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/msite.inc.php Wed Nov 26 20:19:29 2014 +0200 +++ b/msite.inc.php Wed Nov 26 20:33:07 2014 +0200 @@ -928,8 +928,7 @@ function stGetPreviewFileData($compo, $entry, &$pdata) { - if ($compo === false || $entry === false || - ($efile = stFetchSQL("SELECT * FROM files WHERE deleted=0 AND id=".$entry["preview_id"])) === false) + if ($compo === false || $entry === false) return FALSE; $previewPath = stGetSetting("previewPath"); @@ -954,7 +953,7 @@ break; case EPREV_AUDIO: - foreach (stGetSetting("sampleType") as $type) + foreach (stGetSetting("sampleTypes") as $type => $fdata) { $pdata["files"][$type] = stGetEntryPreviewFile( $entry, $compo, $previewPath, $previewURL, @@ -966,13 +965,18 @@ return FALSE; } - foreach ($pdata["files"] as $pkey => $pfile) + if (($efile = stFetchSQL("SELECT * FROM files WHERE deleted=0 AND id=".$entry["preview_id"])) === false) + $pdata["valid"] = FALSE; + else { - if ($pfile["exists"]) - $pdata["exists"]++; + foreach ($pdata["files"] as $pkey => $pfile) + { + if ($pfile["exists"]) + $pdata["exists"]++; - if ($pfile["mtime"] < $efile["utime"]) - $pdata["valid"] = FALSE; + if ($pfile["mtime"] < $efile["utime"]) + $pdata["valid"] = FALSE; + } } return TRUE;