PHP7 clean up dual static + object use of parseData, and create ->getParsedData & ::filterDataHash

9 files changed, 16 insertions, 16 deletions

diff --git a/BitBlog.php b/BitBlog.php
index 682db76..50d7c77 100644
--- a/BitBlog.php
+++ b/BitBlog.php
@@ -319,7 +319,7 @@ class BitBlog extends LibertyMime {
 			$parseHash['format_guid']   = $res['format_guid'];
 			$parseHash['content_id']    = $res['content_id'];
 			$parseHash['data'] 	= $res['data'];
-			$ret[$blogContentId]['parsed'] = $this->parseData( $parseHash );
+			$ret[$blogContentId]['parsed'] = self::parseDataHash( $parseHash );
 		}
 
 		LibertyContent::postGetList( $pParamHash );
diff --git a/BitBlogPost.php b/BitBlogPost.php
index f99b640..531e23c 100644
--- a/BitBlogPost.php
+++ b/BitBlogPost.php
@@ -227,6 +227,7 @@ class BitBlogPost extends LibertyMime {
 
 		$data = $pParamHash;
 		// preserve our split data if we are using to text fields cause it gets merged in verify
+		$data['data'] = $data['edit'];
 		$data['raw'] = $data['edit'];
 		$data['raw_more'] = (!empty($data['edit_body'])?$data['edit_body']:'');
 		$this->verify( $data );
@@ -260,8 +261,7 @@ class BitBlogPost extends LibertyMime {
 				$data['edit'] .= "...split...".$data['edit_body'];
 			}
 			*/
-			$data['parsed_data'] = $this->parseData( $data['edit'], (!empty($data['format_guid']) ? $data['format_guid'] : 'tikiwiki' ));
-			//$data['parsed_data'] = $this->parseData( $data );
+			$data['parsed_data'] = self::parseDataHash( $data );
 			// replace the split syntax with a horizontal rule
 			$data['parsed_data'] = preg_replace( LIBERTY_SPLIT_REGEX, "<hr />", $data['parsed_data'] );
 		}
@@ -989,7 +989,7 @@ class BitBlogPost extends LibertyMime {
 				// support for ...split... and auto split
 				if( !empty( $pListHash['full_data'] ) ) {
 					$parseHash['data'] = $res['data'];
-					$res['parsed'] = $this->parseData( $parseHash );
+					$res['parsed'] = self::parseDataHash( $parseHash );
 				} else {
 					$parseHash['data'] = $res['data'];
 					$parseHash['no_cache'] = TRUE;
@@ -1004,7 +1004,7 @@ class BitBlogPost extends LibertyMime {
 				if( !empty( $res['crosspost_note'] ) ){
 					$res['crosspost_note_raw'] = $parseHash['data'] = $res['crosspost_note'];
 					$parseHash['no_cache'] = TRUE;
-					$res['crosspost_note'] = $this->parseData( $parseHash );
+					$res['crosspost_note'] = self::parseDataHash( $parseHash );
 				}
 
 				$ret[] = $res;
diff --git a/blogs_rss.php b/blogs_rss.php
index 6931629..6a7fd44 100644
--- a/blogs_rss.php
+++ b/blogs_rss.php
@@ -80,7 +80,7 @@ if( !$gBitUser->hasPermission( 'p_blogs_view' ) ) {
 			if (isset($userName)){
 				$rss->title = $userName."'s Posts in ".$rss->title;
 			}
-			$rss->description = $gBlog->parseData();
+			$rss->description = $gBlog->getParsedData();
 		}
 	}
 	$feeds = $blogPost->getList( $listHash );
diff --git a/crosspost.php b/crosspost.php
index df0b26e..5ef2186 100644
--- a/crosspost.php
+++ b/crosspost.php
@@ -65,7 +65,7 @@ if( !empty( $_REQUEST['action']) && ($_REQUEST['action'] == 'remove') && $gConte
 
 $post_id = $gContent->mPostId;
 $gBitSmarty->assign('post_id', $gContent->mPostId );
-$parsed_data = $gContent->parseData();
+$parsed_data = $gContent->getParsedData();
 $gBitSmarty->assign('parsed_data', $parsed_data);
 $gBitSmarty->assign('post_info', $gContent->mInfo );
 
diff --git a/display_bitblogpost_inc.php b/display_bitblogpost_inc.php
index 6463381..c44b094 100644
--- a/display_bitblogpost_inc.php
+++ b/display_bitblogpost_inc.php
@@ -63,7 +63,7 @@ $gBitSmarty->assign('post_id', $gContent->mPostId);
 
 //Build absolute URI for this
 if ( empty( $_REQUEST['format'] ) || $_REQUEST['format'] == "full" || $_REQUEST['format'] == "data" ){
-	$parsed_data = $gContent->parseData();
+	$parsed_data = $gContent->getParsedData();
 	if ($gBitSystem->isFeatureActive( 'blog_posts_comments' ) ) {
 		$comments_return_url = $_SERVER['SCRIPT_NAME']."?post_id=".$gContent->mPostId;
 		$commentsParentId = $gContent->mContentId;
@@ -71,11 +71,10 @@ if ( empty( $_REQUEST['format'] ) || $_REQUEST['format'] == "full" || $_REQUEST[
 	}
 	$extendedTitle = isset($gContent->mInfo['blogtitle']) ? ' - '.$gContent->mInfo['blogtitle'] : NULL;
 	$gBitSystem->setBrowserTitle($gContent->mInfo['title'].$extendedTitle);
-}else{
+} else {
 	// if the format requested is not the full post or the readmore data we default to just the first half of the post
-	$data = ( $_REQUEST['format'] != "more" )?$gContent->mInfo['raw']:$gContent->mInfo['raw_more'];
-	$data = preg_replace( LIBERTY_SPLIT_REGEX, "", $data);
-	$parsed_data = $gContent->parseData( $data, ($gContent->getField('format_guid') ? $gContent->getField('format_guid') : 'tikiwiki') );	
+	$parseHash['data'] = preg_replace( LIBERTY_SPLIT_REGEX, "", ( $_REQUEST['format'] != "more" )?$gContent->mInfo['raw']:$gContent->mInfo['raw_more']);
+	$parsed_data = LibertyContent::parseDataHash( $parseHash, $gContent );	
 }
 
 $gBitSmarty->assign('parsed_data', $parsed_data);
diff --git a/edit.php b/edit.php
index c4328e2..2b2d6ea 100644
--- a/edit.php
+++ b/edit.php
@@ -30,7 +30,8 @@ if (isset($_REQUEST['preview'])) {
 	//all this should prolly be moved to a BitBlog::preparePreview method and the tpls cleaned - but this works for now -wjames5
 	$gBitSmarty->assign('title', $_REQUEST["title"]);
 	$gBitSmarty->assign('edit', $_REQUEST["edit"]);
-	$gBitSmarty->assign('parsed', $gContent->parseData( $_REQUEST["edit"], $_REQUEST["format_guid"]));
+	$_REQUEST['data'] = $_REQUEST['edit']; // needed for parseDataHash
+	$gBitSmarty->assign('parsed', LibertyContent::parseDataHash( $_REQUEST );
 	$gBitSmarty->assign('user_name', $gBitUser->getDisplayName());
 	$gBitSmarty->assign('created', $gBitSystem->getUTCTime());
 	$gBitSmarty->assign('use_find', isset($_REQUEST["use_find"]) ? 'y' : 'n');
diff --git a/post.php b/post.php
index 262ba21..6657d66 100644
--- a/post.php
+++ b/post.php
@@ -98,7 +98,7 @@ if (isset($_REQUEST["preview"])) {
 			die;
 		}
 		
-		$parsed_data = $gContent->parseData( $gContent->getField('data'), ($gContent->getField('format_guid') ? $gContent->getField('format_guid') : 'tikiwiki') );
+		$parsed_data = $gContent->getParsedData();
 
 		$gBitSmarty->assign( 'title', $gContent->getTitle('title') );
 		$gBitSmarty->assign( 'trackbacks_to', explode(',', $gContent->getField('trackbacks_to')) );
diff --git a/print_blog_post.php b/print_blog_post.php
index f6ac253..ce96ad0 100644
--- a/print_blog_post.php
+++ b/print_blog_post.php
@@ -53,7 +53,7 @@ $offset = $_REQUEST["offset"];
 $sort_mode = $_REQUEST["sort_mode"];
 $find = $_REQUEST["find"];
 
-$gBitSmarty->assign( 'parsed_data', $gContent->parseData() );
+$gBitSmarty->assign( 'parsed_data', $gContent->getParsedData() );
 
 $gBitSystem->verifyPermission( 'p_blogs_view' );
 
diff --git a/send_post.php b/send_post.php
index 777cad8..2abd390 100644
--- a/send_post.php
+++ b/send_post.php
@@ -43,7 +43,7 @@ $uri2 = httpPrefix(). $parts['path'] . '/' . $gContent->mInfo['post_id'];
 $gBitSmarty->assign('uri', $uri);
 $gBitSmarty->assign('uri2', $uri2);
 
-$gBitSmarty->assign( 'parsed_data', $gContent->parseData() );
+$gBitSmarty->assign( 'parsed_data', $gContent->getParsedData() );
 
 if ($gBitSystem->isFeatureActive( 'blog_posts_comments' )) {
 	$comments_vars = array(