Mercurial > hg > fapweb
changeset 952:ef0d8615ec06
Add silent option to stProbeFileInfo()
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 28 Nov 2014 08:50:50 +0200 |
parents | 6549fb84a814 |
children | 3b18afe14e46 |
files | msite.inc.php |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/msite.inc.php Fri Nov 28 08:40:32 2014 +0200 +++ b/msite.inc.php Fri Nov 28 08:50:50 2014 +0200 @@ -1049,7 +1049,7 @@ // // Probe file type information // -function stProbeFileInfo($filename) +function stProbeFileInfo($filename, $silent = FALSE) { global $fileTypeData; @@ -1068,7 +1068,7 @@ if ($sdata === FALSE || $smime === FALSE) { stLogError("Failed to probe file '".$filename."'."); - return stError("Internal error, failed to probe file."); + return stError("Failed to probe file."); } // Match through our supported types .. @@ -1086,6 +1086,9 @@ return $fdata; } + if ($silent) + return FALSE; + stLogError("File '".$filename."' (".$smime.") did not match any defined file types [".$sdata."]."); return stError("No matching defined file type found for '".$smime."'."); }