Namespace additions

4 files changed, 35 insertions, 25 deletions

diff --git a/blogs_rss.php b/blogs_rss.php
index f60093e..76008a1 100755
--- a/blogs_rss.php
+++ b/blogs_rss.php
@@ -1,4 +1,11 @@
 <?php
+
+use Bitweaver\Blogs\BitBlog;
+use Bitweaver\KernelTools;
+use Bitweaver\Rss\FeedItem;
+use Bitweaver\Users\BitPermUser;
+use Bitweaver\Users\BitUser;
+use Bitweaver\Users\RoleUser;
 /**
  * @version $Header$
  * @package blogs
@@ -19,8 +26,8 @@ $gBitSystem->verifyFeature( 'blogs_rss' );
 require_once RSS_PKG_INCLUDE_PATH.'rss_inc.php';
 
 // default feed info
-$rss->title = $gBitSystem->getConfig( 'blogs_rss_title', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'Blog Posts' ) );
-$rss->description = $gBitSystem->getConfig( 'blogs_rss_description', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'RSS Feed' ) );
+$rss->title = $gBitSystem->getConfig( 'blogs_rss_title', $gBitSystem->getConfig( 'site_title' ).' - '.KernelTools::tra( 'Blog Posts' ) );
+$rss->description = $gBitSystem->getConfig( 'blogs_rss_description', $gBitSystem->getConfig( 'site_title' ).' - '.KernelTools::tra( 'RSS Feed' ) );
 
 // check permission to view wiki pages
 if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) {
@@ -37,17 +44,17 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) {
 	$listHash['full_data'] = true;
 	if( !empty( $_REQUEST['user_id'] ) ) {
 		$blogUser = $gBitSystem->getConfig( 'user_class', 'BitPermUser' ) == 'RolePermUser' ? new RoleUser() : new BitUser();
-		}
 		
-		$userData = $blogUser->getUserInfo( array('user_id' => $_REQUEST['user_id']) );
+		$userData = $blogUser->getUserInfo( [ 'user_id' => $_REQUEST['user_id'] ] );
 		// dont try and fool me
 		if (!empty($userData)) {
 			$userName = $userData['real_name']?$userData['real_name']:$userData['login'];
 			$rss->title = $userName." at ".$gBitSystem->getConfig( 'site_title' );
 			$listHash['user_id'] = $_REQUEST['user_id'];
+		}
 	} else if( !empty( $_REQUEST['group_id'] ) ) {
 		require_once USERS_PKG_PATH . 'BitPermUser.php';
-		$permUser = new RolePermUser();
+		$permUser = new BitPermUser();
 		$groupData = $permUser->getGroupInfo( $_REQUEST['group_id'] );
 		// dont try and fool me
 		if (!empty($groupData)){
@@ -84,15 +91,16 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) {
 	// set the rss link
 	$rss->link = 'http://'.$_SERVER['HTTP_HOST'].BLOGS_PKG_URL.( !empty( $_REQUEST['blog_id'] ) ? "?blog_id=".$_REQUEST['blog_id'] : "" );
 	// get all the data ready for the feed creator
-	foreach( $feeds['data'] as $feed ) {
+	foreach( $feeds as $feed ) {
 		$item = new FeedItem();
 		$item->title = BitBlogPost::getTitleFromHash( $feed );
-		$item->link = BIT_BASE_URI.BitBlogPost::getDisplayUrlFromHash( null, $feed );
+		$item->link = BIT_BASE_URI.BitBlogPost::getDisplayUrlFromHash( $feed );
 		$item->description = $feed['parsed'];
 
 		$item->date = ( int )$feed['last_modified'];
-		$item->source = 'http://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL;
-		$item->author = $gBitUser->getDisplayName( false, $feed );
+		$item->source = 'https://'.$_SERVER['HTTP_HOST'].BIT_ROOT_URL;
+		$item->author = $feed['real_name'];
+		$item->authorEmail = $feed['email'];
 
 		$item->descriptionTruncSize = $gBitSystem->getConfig( 'rssfeed_truncate', 50000 );
 		$item->descriptionHtmlSyndicated = true;
@@ -103,5 +111,4 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) {
 
 	// finally we are ready to serve the data
 	echo $rss->saveFeed( $rss_version_name, $cacheFile );
-}
-?>
+}
\ No newline at end of file
diff --git a/includes/lookup_blog_inc.php b/includes/lookup_blog_inc.php
index 838596d..90d32d4 100755
--- a/includes/lookup_blog_inc.php
+++ b/includes/lookup_blog_inc.php
@@ -16,10 +16,10 @@ require_once LIBERTY_PKG_INCLUDE_PATH.'lookup_content_inc.php';
 // if we already have a gContent, we assume someone else created it for us, and has properly loaded everything up.
 if( empty( $gContent ) || !is_object( $gContent ) || !$gContent->isValid() ) {
 	// if blog_id supplied, use that
-    if( BitBase::verifyId( $_REQUEST['blog_id'] ?? -2 ) ) {
+	if( !empty($_REQUEST['blog_id']) and BitBase::verifyId( $_REQUEST['blog_id'] ) ) {
 		$gContent = new BitBlog( $_REQUEST['blog_id'] );
 		$gContent->load();
-    } elseif( BitBase::verifyId( $_REQUEST['content_id'] ?? -2 ) ) {
+	} elseif( !empty($_REQUEST['content_id']) and BitBase::verifyId( $_REQUEST['content_id'] ) ) {
 		$gContent = new BitBlog( null, $_REQUEST['content_id'] );
 		$gContent->load();
 	} else {
diff --git a/send_post.php b/send_post.php
index 8b64c24..8c5f525 100755
--- a/send_post.php
+++ b/send_post.php
@@ -1,4 +1,6 @@
 <?php
+
+use Bitweaver\KernelTools;
 /**
  * @version $Header$
 
@@ -23,7 +25,7 @@ include_once BLOGS_PKG_CLASS_PATH.'BitBlogPost.php';
 $gBitSystem->verifyPermission( 'p_blogs_send_post' );
 
 if (!isset($_REQUEST["post_id"])) {
-	$gBitSystem->fatalError( tra( 'No post indicated' ));
+	$gBitSystem->fatalError( KernelTools::tra( 'No post indicated' ));
 }
 
 include_once BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php';
@@ -34,20 +36,20 @@ $gBitSmarty->assign('post_info', $gContent->mInfo );
 
 //Build absolute URI for this
 $parts = parse_url($_SERVER['REQUEST_URI']);
-$uri = httpPrefix(). $parts['path'] . '?post_id=' . $gContent->mInfo['post_id'];
-$uri2 = httpPrefix(). $parts['path'] . '/' . $gContent->mInfo['post_id'];
+$uri = KernelTools::httpPrefix(). $parts['path'] . '?post_id=' . $gContent->mInfo['post_id'];
+$uri2 = KernelTools::httpPrefix(). $parts['path'] . '/' . $gContent->mInfo['post_id'];
 $gBitSmarty->assign('uri', $uri);
 $gBitSmarty->assign('uri2', $uri2);
 
 $gBitSmarty->assign( 'parsed_data', $gContent->getParsedData() );
 
 if ($gBitSystem->isFeatureActive( 'blog_posts_comments' )) {
-	$comments_vars = array(
+	$comments_vars = [
 		'post_id',
 		'offset',
 		'find',
-		'sort_mode'
-	);
+		'sort_mode',
+	];
 
 	$comments_return_url = $_SERVER['SCRIPT_NAME']."?post_id=".$gContent->mPostId;
 	$commentsParentId = $gContent->mContentId;
@@ -76,7 +78,7 @@ if (isset($_REQUEST['send'])) {
 		$gBitSmarty->assign('mail_title', $gContent->mInfo['title'] ? $gContent->mInfo['title'] : date("d/m/Y [h:i]", $gContent->mInfo['created']));
 		$gBitSmarty->assign('mail_machine', $machine);
 		$mail_data = $gBitSmarty->fetch('bitpackage:blogs/blogs_send_link.tpl');
-		@mail($email, tra('Post recommendation at'). ' ' . $_SERVER["SERVER_NAME"], $mail_data,
+		@mail($email, KernelTools::tra('Post recommendation at'). ' ' . $_SERVER["SERVER_NAME"], $mail_data,
 			"From: ".$gBitSystem->getConfig( 'site_sender_email' )."\r\nContent-type: text/plain;charset=utf-8\r\n");
 	}
 
diff --git a/view_post_image.php b/view_post_image.php
index b1f70e9..fb70146 100755
--- a/view_post_image.php
+++ b/view_post_image.php
@@ -15,14 +15,15 @@
  */
 require_once '../kernel/includes/setup_inc.php';
 
-include_once BLOGS_PKG_CLASS_PATH.'BitBlog.php';
+use Bitweaver\Blogs\BitBlog;
+use Bitweaver\KernelTools;
 
 if (!isset($_REQUEST["image_id"])) {
-	$gBitSmarty->assign('msg', tra("No image id given"));
-	$gBitSystem->display( 'error.tpl' , null, array( 'display_mode' => 'display' ));
+	$gBitSmarty->assign('msg', KernelTools::tra("No image id given"));
+	$gBitSystem->display( 'error.tpl' , null, [ 'display_mode' => 'display' ]);
 	die;
 }
 
-$imageInfo = $gBlog->getStoreFileInfo($_REQUEST["image_id"]);
+$imageInfo = BitBlog::getStoreFileInfo($_REQUEST["image_id"]);
 $gBitSmarty->assign( 'imageInfo' , $imageInfo );
-$gBitSystem->display( 'bitpackage:blogs/view_post_image.tpl' , null, array( 'display_mode' => 'display' ));
\ No newline at end of file
+$gBitSystem->display( 'bitpackage:blogs/view_post_image.tpl' , null, [ 'display_mode' => 'display' ]);
\ No newline at end of file