diff options
| author | "Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-06-07 20:41:35 +0100 |
|---|---|---|
| committer | "Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-06-07 20:41:35 +0100 |
| commit | f95fc6ac49494a61141ccef25d41b38b98288ccb (patch) | |
| tree | c34af947bfe99d6a0934a58daf34a2734adadb1d /blogs_rss.php | |
| parent | 763eff5e515b797fad6639cae52df9ce064b8bf2 (diff) | |
| download | blogs-f95fc6ac49494a61141ccef25d41b38b98288ccb.tar.gz blogs-f95fc6ac49494a61141ccef25d41b38b98288ccb.tar.bz2 blogs-f95fc6ac49494a61141ccef25d41b38b98288ccb.zip | |
Merge group_id and role_id parameters
Not fully tested, but seems stable on my blog sites
Diffstat (limited to 'blogs_rss.php')
| -rw-r--r-- | blogs_rss.php | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/blogs_rss.php b/blogs_rss.php index d606752..8d832fe 100644 --- a/blogs_rss.php +++ b/blogs_rss.php @@ -26,7 +26,7 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { 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.'/'.BLOGS_PKG_NAME.( !empty( $_REQUEST['user_id'] ) ? "_".$_REQUEST['user_id'] : "" ).( !empty( $_REQUEST['group_id'] ) ? "_".$_REQUEST['group_id'] : "" ).( !empty( $_REQUEST['blog_id'] ) ? "_".$_REQUEST['blog_id'] : "" ).'_'.$cacheFileTail; + $cacheFile = TEMP_PKG_PATH.RSS_PKG_NAME.'/'.BLOGS_PKG_NAME.( !empty( $_REQUEST['user_id'] ) ? "_".$_REQUEST['user_id'] : "" ).( !empty( $_REQUEST['group_id'] ) ? "_".$_REQUEST['group_id'] : "" ).( !empty( $_REQUEST['role_id'] ) ? "_".$_REQUEST['role_id'] : "" ).( !empty( $_REQUEST['blog_id'] ) ? "_".$_REQUEST['blog_id'] : "" ).'_'.$cacheFileTail; $rss->useCached( $rss_version_name, $cacheFile, $gBitSystem->getConfig( 'rssfeed_cache_time' )); $blogPost = new BitBlogPost(); @@ -35,7 +35,11 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { $listHash['parse_data'] = TRUE; $listHash['full_data'] = TRUE; if( !empty( $_REQUEST['user_id'] ) ) { - require_once( USERS_PKG_PATH.'BitUser.php' ); + if ( $gBitSystem->getConfig( 'user_class', 'BitPermUser' ) == 'RolePermUser' ) { + require_once( USERS_PKG_PATH.'RoleUser.php' ); + } else { + require_once( USERS_PKG_PATH.'BitUser.php' ); + } $blogUser = new BitUser(); $userData = $blogUser->getUserInfo( array('user_id' => $_REQUEST['user_id']) ); // dont try and fool me @@ -44,7 +48,7 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { $rss->title = $userName." at ".$gBitSystem->getConfig( 'site_title' ); $listHash['user_id'] = $_REQUEST['user_id']; } - }else if( !empty( $_REQUEST['group_id'] ) ) { + } else if( !empty( $_REQUEST['group_id'] ) ) { require_once( USERS_PKG_PATH . 'BitPermUser.php' ); $permUser = new BitPermUser(); $groupData = $permUser->getGroupInfo( $_REQUEST['group_id'] ); @@ -54,7 +58,16 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) { $rss->title = $groupName." Group at ".$gBitSystem->getConfig( 'site_title' ); $listHash['group_id'] = $_REQUEST['group_id']; } - + } else if( !empty( $_REQUEST['role_id'] ) ) { + require_once( USERS_PKG_PATH . 'RolePermUser.php' ); + $permUser = new BitPermUser(); + $roleData = $permUser->getRoleInfo( $_REQUEST['role_id'] ); + // dont try and fool me + if (!empty($roleData)){ + $roleName = $roleData['role_name']; + $rss->title = $roleName." Role at ".$gBitSystem->getConfig( 'site_title' ); + $listHash['role_id'] = $_REQUEST['role_id']; + } } if( !empty( $_REQUEST['blog_id'] ) ) { |