diff options
| -rw-r--r-- | fisheye_rss.php | 27 | ||||
| -rw-r--r-- | templates/header_inc.tpl | 4 |
2 files changed, 19 insertions, 12 deletions
diff --git a/fisheye_rss.php b/fisheye_rss.php index bf20486..3d43a6e 100644 --- a/fisheye_rss.php +++ b/fisheye_rss.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/fisheye_rss.php,v 1.1 2006/12/09 23:07:17 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/fisheye_rss.php,v 1.2 2006/12/10 15:15:09 squareing Exp $ * @package fisheye * @subpackage functions */ @@ -23,17 +23,24 @@ $rss->description = $gBitSystem->getConfig( 'fisheye_rss_description', $gBitSyst if( !$gBitUser->hasPermission( 'p_fisheye_view_page' ) ) { require_once( RSS_PKG_PATH."rss_error.php" ); } else { - // check if we want to use the cache file - $cacheFile = TEMP_PKG_PATH.RSS_PKG_NAME.'/'.FISHEYE_PKG_NAME.'_'.$rss_version_name.'.xml'; - $rss->useCached( $rss_version_name, $cacheFile ); // use cached version if age < 1 hour - $listHash = array( 'max_records' => $gBitSystem->getConfig( 'fisheye_rss_max_records', 10 ), - 'sort_mode' => 'last_modified_desc', - 'gallery_id' => !empty( $_REQUEST['gallery_id'] ) ? $_REQUEST['gallery_id'] : NULL, - 'user_id' => !empty( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : NULL, + 'sort_mode' => 'last_modified_desc', + 'gallery_id' => !empty( $_REQUEST['gallery_id'] ) ? $_REQUEST['gallery_id'] : NULL, + 'user_id' => !empty( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : NULL, ); + // check if we want to use the cache file + $cacheFile = TEMP_PKG_PATH.RSS_PKG_NAME.'/'.FISHEYE_PKG_NAME.'_'."g{$listHash['gallery_id']}_u{$listHash['user_id']}_".$rss_version_name.'.xml'; + $rss->useCached( $rss_version_name, $cacheFile ); // use cached version if age < 1 hour + + // if we have a gallery we can work with - load it + if( @BitBase::verifyId( $_REQUEST['gallery_id'] ) ) { + $gallery = new FisheyeGallery( $_REQUEST['gallery_id'] ); + $gallery->load(); + $rss->title .= " - {$gallery->getTitle()}"; + } + $fisheye = new FisheyeImage(); $feeds = $fisheye->getList( $listHash ); @@ -45,8 +52,8 @@ if( !$gBitUser->hasPermission( 'p_fisheye_view_page' ) ) { $item = new FeedItem(); $item->title = $feed['title']; $item->link = $feed['display_url']; - $item->description = '<img src="'.str_replace( '/avatar.jpg', '/medium.jpg', $feed['thumbnail_url'] ).'" />'; - $item->description .= '<br />'.$feed['data']; + $item->description = '<a href="'.$feed['display_url'].'"><img src="'.str_replace( '/avatar.jpg', '/medium.jpg', $feed['thumbnail_url'] ).'" /></a>'; + $item->description .= '<p>'.$feed['data'].'</p>'; $item->date = ( int )$feed['last_modified']; $item->source = 'http://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL; diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl index e176995..3dcc225 100644 --- a/templates/header_inc.tpl +++ b/templates/header_inc.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_fisheye/templates/header_inc.tpl,v 1.7 2006/12/09 23:26:52 squareing Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_fisheye/templates/header_inc.tpl,v 1.8 2006/12/10 15:15:09 squareing Exp $ *} {strip} {if $gGallery->mInfo.previous_image_id} <link rel="prev" title="{tr}Previous{/tr}" href="{$gContent->getDisplayUrl($gGallery->mInfo.previous_image_id)|escape}" /> @@ -15,6 +15,6 @@ {else} {assign var=fisheye_rss_gal_id value=$gContent->mGalleryId} {/if} - <link rel="alternate" type="application/rss+xml" title="{tr}Image Galleries{/tr} RSS" href="{$smarty.const.FISHEYE_PKG_URL}fisheye_rss.php?version={$gBitSystem->getConfig('rssfeed_default_version',0)}&gallery_id={$fisheye_rss_gal_id}" /> + <link rel="alternate" type="application/rss+xml" title="{$gBitSystem->getConfig('fisheye_rss_title',"{tr}Image Galleries{/tr} RSS")}" href="{$smarty.const.FISHEYE_PKG_URL}fisheye_rss.php?version={$gBitSystem->getConfig('rssfeed_default_version',0)}&gallery_id={$fisheye_rss_gal_id}" /> {/if} {/strip} |