hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed the way to detect images in the code-file view

Browse Source
This commit is contained in:
hyung-hwan
2015-02-13 07:28:11 +00:00
parent dfcf18917b
commit 05d7176321
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
codepot/src/codepot/views/code_file.php
View File

@ -231,29 +231,22 @@ if ($login['settings'] != NULL &&
<pre class="prettyprint <?=$prettyprint_linenums?> <?=$prettyprint_lang?>" id="code_file_mainarea_result_pre"> <pre class="prettyprint <?=$prettyprint_linenums?> <?=$prettyprint_lang?>" id="code_file_mainarea_result_pre">
<?php <?php
$is_octet_stream = 0; $is_octet_stream = FALSE;
if (array_key_exists('properties', $file) && count($file['properties']) > 0) if (array_key_exists('properties', $file) && count($file['properties']) > 0)
{ {
foreach ($file['properties'] as $pn => $pv) foreach ($file['properties'] as $pn => $pv)
{ {
if ($pn == 'svn:mime-type' && $pv == 'application/octet-stream') if ($pn == 'svn:mime-type' && $pv == 'application/octet-stream')
{ {
$is_octet_stream = 1; $is_octet_stream = TRUE;
break; break;
} }
else if ($pn == 'svn:executable' && $pv == '*')
{
if (in_array (strtolower($fileext), array ('png', 'jpg', 'gif', 'tif', 'bmp', 'ico')))
{
$is_octet_stream = -1; /* not sure */
break;
}
}
} }
} }
$is_image_stream = FALSE; $is_image_stream = FALSE;
if ($is_octet_stream != 0) if ($is_octet_stream ||
in_array (strtolower($fileext), array ('png', 'jpg', 'gif', 'tif', 'bmp', 'ico')))
{ {
$img = @imagecreatefromstring ($file['content']); $img = @imagecreatefromstring ($file['content']);
if ($img !== FALSE) if ($img !== FALSE)