diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-11-22 07:27:19 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-11-22 07:27:19 +0000 |
| commit | 065390ab852a58a14c6339e90dfb0d7eced2afba (patch) | |
| tree | d112df21749dc050030bf4b665da4e3755a3a9f4 /plugins/storage.bitfile.php | |
| parent | 300a03c554874c55d3a6861450a7c780e19c89f4 (diff) | |
| download | liberty-065390ab852a58a14c6339e90dfb0d7eced2afba.tar.gz liberty-065390ab852a58a14c6339e90dfb0d7eced2afba.tar.bz2 liberty-065390ab852a58a14c6339e90dfb0d7eced2afba.zip | |
merge recent changes into HEAD
Diffstat (limited to 'plugins/storage.bitfile.php')
| -rw-r--r-- | plugins/storage.bitfile.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/plugins/storage.bitfile.php b/plugins/storage.bitfile.php index be15c1f..595608e 100644 --- a/plugins/storage.bitfile.php +++ b/plugins/storage.bitfile.php @@ -1,6 +1,6 @@ <?php /** - * @version $Revision: 1.6 $ + * @version $Revision: 1.7 $ * @package liberty * @subpackage plugins_storage */ @@ -69,11 +69,17 @@ function bit_files_load( $pRow ) { WHERE ta.`foreign_id` = ? AND ta.`content_id` = ?"; if( $rs = $gBitSystem->mDb->query($query, array( $pRow['foreign_id'], $pRow['content_id'] )) ) { $ret = $rs->fields; - if (preg_match ( '/image\//', $ret['mime_type'] )) { + $canThumbFunc = liberty_get_function( 'can_thumbnail' ); + if ( file_exists( BIT_ROOT_PATH.dirname( $ret['storage_path'] ).'/medium.jpg' ) ) { $ret['thumbnail_url']['avatar'] = BIT_ROOT_URL.dirname( $ret['storage_path'] ).'/avatar.jpg'; $ret['thumbnail_url']['small'] = BIT_ROOT_URL.dirname( $ret['storage_path'] ).'/small.jpg'; $ret['thumbnail_url']['medium'] = BIT_ROOT_URL.dirname( $ret['storage_path'] ).'/medium.jpg'; $ret['thumbnail_url']['large'] = BIT_ROOT_URL.dirname( $ret['storage_path'] ).'/large.jpg'; + } elseif( $canThumbFunc( $ret['mime_type'] ) ) { + $ret['thumbnail_url']['avatar'] = LIBERTY_PKG_URL.'icons/generating_thumbnails.png'; + $ret['thumbnail_url']['small'] = LIBERTY_PKG_URL.'icons/generating_thumbnails.png'; + $ret['thumbnail_url']['medium'] = LIBERTY_PKG_URL.'icons/generating_thumbnails.png'; + $ret['thumbnail_url']['large'] = LIBERTY_PKG_URL.'icons/generating_thumbnails.png'; } else { $mime_thumbnail = $gLibertySystem->getMimeThumbnailURL($ret['mime_type']); $ret['thumbnail_url']['avatar'] = $mime_thumbnail; @@ -81,6 +87,9 @@ function bit_files_load( $pRow ) { $ret['thumbnail_url']['medium'] = $mime_thumbnail; $ret['thumbnail_url']['large'] = $mime_thumbnail; } +// if ( file_exists( BIT_ROOT_PATH.dirname( $ret['storage_path'] ).'/original.jpg' ) ) { +// $ret['thumbnail_url']['original'] = BIT_ROOT_URL.dirname( $ret['storage_path'] ).'/original.jpg'; +// } $ret['filename'] = substr( $ret['storage_path'], strrpos($ret['storage_path'], '/')+1); $ret['source_url'] = BIT_ROOT_URL.str_replace( '+', '%20', str_replace( '%2F', '/', urlencode( $ret['storage_path'] ) ) ); $ret['wiki_plugin_link'] = "{attachment id=".$ret['attachment_id']."}"; |