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

9 files changed, 11 insertions, 19 deletions

diff --git a/plugins/data.attachment.php b/plugins/data.attachment.php
index 1f662cb..d439b80 100644
--- a/plugins/data.attachment.php
+++ b/plugins/data.attachment.php
@@ -177,7 +177,7 @@ function data_attachment( $pData, $pParams, $pCommonObject, $pParseHash ) {
 		$parseHash['user_id']    = $pParseHash['user_id'];
 		$parseHash['no_cache']   = TRUE;
 		$parseHash['data']       = $wrapper['description'];
-		$wrapper['description_parsed'] = $pCommonObject->parseData( $parseHash );
+		$wrapper['description_parsed'] = LibertyContent::parseDataHash( $parseHash );
 	}
 
 	// pass stuff to the template
diff --git a/plugins/data.div.php b/plugins/data.div.php
index 4b0905a..f68ec11 100644
--- a/plugins/data.div.php
+++ b/plugins/data.div.php
@@ -86,7 +86,7 @@ function data_div( $pData, $pParams, $pCommonObject, $pParseHash ) {
 	$parseHash['user_id'] = $pParseHash['user_id'];
 	$parseHash['no_cache'] = TRUE;
 	$parseHash['data'] = $pData;
-	$ret = '<div '.( !empty( $class ) ? 'class="'.$class.'" ' : '' ).'style="'.$style.'">'.$pCommonObject->parseData( $parseHash ).'</div>';
+	$ret = '<div '.( !empty( $class ) ? 'class="'.$class.'" ' : '' ).'style="'.$style.'">'.LibertyContent::parseDataHash( $parseHash, $pCommonObject ).'</div>';
 	return $ret;
 }
 ?>
diff --git a/plugins/data.include.php b/plugins/data.include.php
index 1206491..4fa677d 100644
--- a/plugins/data.include.php
+++ b/plugins/data.include.php
@@ -78,12 +78,12 @@ function data_include($data, $params) {
 		require_once( WIKI_PKG_PATH.'BitPage.php');
 		$wp = new BitPage( $params['page_id'] );
 		if( $wp->load() ) {
-			$ret = $wp->parseData( $wp->mInfo );
+			$ret = $wp->getParsedData();
 		}
 	// load page by content_id
 	} elseif( isset( $params['content_id'] ) && is_numeric( $params['content_id'] ) ) {
 		if( $obj = LibertyBase::getLibertyObject( $params['content_id'] ) ) {
-			$ret = $obj->parseData();
+			$ret = $obj->getParsedData();
 		}
 	// load page by page_name
 	} elseif( isset( $params['page_name'] ) ) {
diff --git a/plugins/data.jstabs.php b/plugins/data.jstabs.php
index e226b23..5ddb38e 100644
--- a/plugins/data.jstabs.php
+++ b/plugins/data.jstabs.php
@@ -57,7 +57,7 @@ function data_jstabs( $pData, $pParams, $pCommonObject ) {
 				$parseHash['no_cache'] = TRUE;
 				$parseHash['data'] = $split[2];
 
-				$html .= smarty_block_jstab( $params, $pCommonObject->parseData( $parseHash ), $gBitSmarty, '' );
+				$html .= smarty_block_jstab( $params, LibertyContent::parseDataHash( $parseHash, $pCommonObject ), $gBitSmarty, '' );
 			}
 		}
 	}
diff --git a/plugins/data.pre.php b/plugins/data.pre.php
index 4835653..3d22b2a 100644
--- a/plugins/data.pre.php
+++ b/plugins/data.pre.php
@@ -86,7 +86,7 @@ function data_pre( $pData, $pParams, $pCommonObject, $pParseHash ) {
 	$parseHash['user_id'] = $pParseHash['user_id'];
 	$parseHash['no_cache'] = TRUE;
 	$parseHash['data'] = $pData;
-	$ret = '<pre '.( !empty( $class ) ? 'class="'.$class.'" ' : '' ).'style="'.$style.'">'.$pCommonObject->parseData( $parseHash ).'</pre>';
+	$ret = '<pre '.( !empty( $class ) ? 'class="'.$class.'" ' : '' ).'style="'.$style.'">'.LibertyContent::parseDataHash( $parseHash, $pCommonObject ).'</pre>';
 	return $ret;
 }
 ?>
diff --git a/plugins/data.sort.php b/plugins/data.sort.php
index d9cb855..1b5a2b4 100644
--- a/plugins/data.sort.php
+++ b/plugins/data.sort.php
@@ -71,6 +71,6 @@ function data_sort( $pData, $pParams, $pCommonObject, $pParseHash ) {
 	$parseHash['user_id']    = $pParseHash['user_id'];
 	$parseHash['no_cache']   = TRUE;
 	$parseHash['data']       = trim( $pData );
-	return $pCommonObject->parseData( $parseHash );
+	return LibertyContent::parseDataHash( $parseHash, $pCommonObject );
 }
 ?>
diff --git a/plugins/data.span.php b/plugins/data.span.php
index 8be87fc..578f078 100644
--- a/plugins/data.span.php
+++ b/plugins/data.span.php
@@ -92,7 +92,7 @@ function data_span( $pData, $pParams, $pCommonObject ) {
 	$parseHash = $pCommonObject->mInfo;
 	$parseHash['no_cache'] = TRUE;
 	$parseHash['data'] = $pData;
-	$parsedData = $pCommonObject->parseData( $parseHash );
+	$parsedData = LibertyContent::parseDataHash( $parseHash, $pCommonObject );
 	$parsedData = preg_replace( '|<br\s*/?>$|', '', $parsedData );
 	return( '<span '.( !empty( $class ) ? 'class="'.$class.'" ' : '' ).'style="'.$style.'">'.$parsedData.'</span>' );
 }
diff --git a/plugins/data.textarea.php b/plugins/data.textarea.php
index 33083ab..8d407e4 100644
--- a/plugins/data.textarea.php
+++ b/plugins/data.textarea.php
@@ -100,7 +100,7 @@ function  data_textarea( $pData, $pParams, $pCommonObject ) {
 	$parseHash = $pCommonObject->mInfo;
 	$parseHash['no_cache'] = TRUE;
 	$parseHash['data'] = $pData;
-	$parsedData = $pCommonObject->parseData( $parseHash );
+	$parsedData = LibertyContent::parseDataHash( $parseHash, $pCommonObject );
 	return( '<textarea '.$attributes.( !empty( $class ) ? 'class="'.$class.'" ' : '' ).'style="'.$style.'">'.$parsedData.'</textarea>' );
 }
 ?>
diff --git a/plugins/format.tikiwiki.php b/plugins/format.tikiwiki.php
index cef9f7d..12e07a8 100644
--- a/plugins/format.tikiwiki.php
+++ b/plugins/format.tikiwiki.php
@@ -215,18 +215,10 @@ class TikiWikiParser extends BitBase {
 			require_once( WIKI_PKG_PATH.'BitPage.php' );
 		}
 
-		// if the object isn't loaded, we'll try and get the content prefs manually
-		if( !empty( $pCommonObject->mPrefs ) ) {
-			$contentPrefs = $pCommonObject->mPrefs;
-		} elseif( empty( $pCommonObject->mContentId ) && !empty( $contentId ) ) {
-			$contentPrefs = $pCommonObject->loadPreferences( $contentId );
-		}
-
+		
 		// only strip out html if needed
 		if( $gBitSystem->isFeatureActive( 'content_allow_html' ) || $gBitSystem->isFeatureActive( 'content_force_allow_html' )) {
 			// we allow html unconditionally with this parser
-		} elseif( !empty( $contentPrefs['content_enter_html'] )) {
-			// we allow html on a per page basis
 		} else {
 			// we are parsing this page and we either have no way of checking permissions or we have no need for html
 			$data = htmlspecialchars( $data, ENT_NOQUOTES, 'UTF-8' );
@@ -343,7 +335,7 @@ class TikiWikiParser extends BitBase {
 			}
 
 			// comments and anonymously created pages get nofollow
-			if( $pCommonObject && ( get_class( $pCommonObject ) == 'comments' || ( isset( $pCommonObject->mInfo['user_id'] ) &&  $pCommonObject->mInfo['user_id'] == ANONYMOUS_USER_ID ))) {
+			if( is_object( $pCommonObject ) && ( get_class( $pCommonObject ) == 'comments' || ( isset( $pCommonObject->mInfo['user_id'] ) &&  $pCommonObject->mInfo['user_id'] == ANONYMOUS_USER_ID ))) {
 				$attributes .= ' rel="nofollow" ';
 			}