From ec14d16cbfd893bf5a290905b35fe9cfe5bd568a Mon Sep 17 00:00:00 2001
From: Cindy Li <cli@ocad.ca>
Date: Mon, 18 Oct 2010 14:45:51 +0000
Subject: [PATCH] Applied atutor changes for flowplayer and adapted content

---
 docs/home/classes/ContentUtility.class.php | 181 +++++++++++----------
 docs/home/course/content.php               |  12 +-
 2 files changed, 104 insertions(+), 89 deletions(-)

diff --git a/docs/home/classes/ContentUtility.class.php b/docs/home/classes/ContentUtility.class.php
index b1485d0..cb18256 100644
--- a/docs/home/classes/ContentUtility.class.php
+++ b/docs/home/classes/ContentUtility.class.php
@@ -142,46 +142,35 @@ class ContentUtility {
 		
 		$media_replace = array();
 		$media_matches = array();
+		$flowplayerholder_class = "atutor.flowplayerholder";  // style class used to play flowplayer medias
+		$flowplayerholder_def = '$f("*.'.$flowplayerholder_class.'"';   // javascript definition for atutor.flowplayerholder 
 		
-		// .flv (playing file via full URL)
-		preg_match_all("#\[media[0-9a-z\|]*\]http://([\w\./-]+)\.flv\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
-		$media_replace[] ="<a class=\"flowplayerholder\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"http://##MEDIA1##.flv\"></a>";
-		
-		// .flv (playing file from TR_content_dir)
+		// .flv
 		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+)\.flv\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
-		$media_replace[] ="<a class=\"flowplayerholder\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"".TR_BASE_HREF."get.php/".$content_base_href."##MEDIA1##.flv\"></a>";
-		
-		// .mp4 (playing file via full URL)
-		preg_match_all("#\[media[0-9a-z\|]*\]http://([\w\./-]+)\.mp4\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
-		$media_replace[] ="<a class=\"flowplayerholder\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"http://##MEDIA1##.mp4\"></a>";
+		$media_replace[] ="<object>\n".
+		                  "  <div>\n".
+		                  "    <a class=\"".$flowplayerholder_class."\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"##MEDIA1##.flv\"></a>\n".
+		                  "  </div>\n".
+		                  "  <div style=\"margin-top:-2em;\">\n".
+		                  "    <a href=\"##MEDIA1##.flv\">##MEDIA1##.flv</a>\n".
+		                  "  </div>\n".
+		                  "</object>";
 		
-		// .mp4 (playing file from TR_content_dir)
+		// .mp4
 		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+)\.mp4\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
-		$media_replace[] ="<a class=\"flowplayerholder\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"".TR_BASE_HREF."get.php/".$content_base_href."##MEDIA1##.mp4\"></a>";
-		
-		// .mov (playing file via full URL)
-		preg_match_all("#\[media[0-9a-z\|]*\]http://([\w\./-]+)\.mov\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
-		$media_replace[] ="<a class=\"flowplayerholder\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"http://##MEDIA1##.mov\"></a>";
-		
-		// .mov (playing file from TR_content_dir)
-		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+)\.mov\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
-		$media_replace[] ="<a class=\"flowplayerholder\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"".TR_BASE_HREF."get.php/".$content_base_href."##MEDIA1##.mov\"></a>";
-		
-		// .mp3 (playing file via full URL)
-		preg_match_all("#\[media[0-9a-z\|]*\]http://([\w\./-]+)\.mp3\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
-		$media_replace[] ="<a class=\"flowplayerholder\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"http://##MEDIA1##.mp3\"></a>";
-		
-		// .mp3 (playing file from TR_content_dir)
-		preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+)\.mp3\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
-		$media_replace[] ="<a class=\"flowplayerholder\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"".TR_BASE_HREF."get.php/".$content_base_href."##MEDIA1##.mp3\"></a>";
-		
-		$has_flv = false;
+		//$media_replace[] ="<a class=\"".$flowplayerholder_class."\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"".AT_BASE_HREF."get.php/".$_content_base_href."##MEDIA1##.mp4\"></a>";
+		$media_replace[] ="<object>\n".
+		                  "  <div>\n".
+		                  "    <a class=\"".$flowplayerholder_class."\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"##MEDIA1##.mp4\"></a>\n".
+		                  "  </div>\n".
+		                  "  <div style=\"margin-top:-2em;\">\n".
+		                  "    <a href=\"##MEDIA1##.mp4\">##MEDIA1##.mp4</a>\n".
+		                  "  </div>\n".
+		                  "</object>";
 		// Executing the replace
 		for ($i=0;$i<count($media_replace);$i++){
 			foreach($media_matches[$i] as $media)
 			{
-				if (is_array($media)) $has_flv = true;
-				
 				//find width and height for each matched media
 				if (preg_match("/\[media\|([0-9]*)\|([0-9]*)\]*/", $media[0], $matches)) 
 				{
@@ -204,25 +193,29 @@ class ContentUtility {
 			}
 		}
 		
-		if ($has_flv)
+		// Include the javascript only if:
+		// 1. $flowplayerholder_class is used but not defined
+		// 2. exclude from export common cartridge or content package
+		if (strpos($text, $flowplayerholder_class) 
+		    && !strpos($text, $flowplayerholder_def)
+		    && !strpos($_SERVER['PHP_SELF'], "ims_export.php"))
 		{
-			$text .= '
-			<script language="JavaScript">
-				$f("a.flowplayerholder", "'.TR_BASE_HREF.'include/jscripts/flowplayer/flowplayer-3.2.4.swf", { 
-		 		clip: { autoPlay: false },  
-		        plugins:  { 
-			        controls: { 
-			            buttons:true, 
-			            play: true,  
-			            scrubber: true, 
-				        autoHide:false
-			        }         
-			    }
-			});
-			</script>
-			';
+			$text .= '<script type="text/javascript">
+'.$flowplayerholder_def.', "'.TR_BASE_HREF.'include/jscripts/flowplayer/flowplayer-3.2.4.swf", { 
+  clip: { 
+  autoPlay: false,
+  baseUrl: \''.TR_BASE_HREF.'get.php/'.$content_base_href.'\'},
+  plugins:  { 
+    controls: { 
+      buttons:true, 
+      play: true,  
+      scrubber: true, 
+      autoHide:false
+    }         
+  }
+});
+</script>'."\n";
 		}
-		
 		return $text;		
 	}
 	
@@ -262,52 +255,75 @@ class ContentUtility {
 		$text = preg_replace("/(\[media\])([\s]*)(.*)(\[\/media\])/", '$1$3$4', $text);
 		$text = preg_replace("/(\[media\])(.*)([\s]*)(\[\/media\])/U", '$1$2$4', $text);
 		
-		$media_matches = Array();
+		$media_matches = array();
+		$media_replace = array();
 		
 		// First, we search though the text for all different kinds of media defined by media tags and store the results in $media_matches.
-        // Then the different replacements for the different media tags are stored in $media_replace.
-        // Lastly, we loop through all $media_matches / $media_replaces. (We choose $media_replace as index because $media_matches is multi-dimensioned.) It is important that for each $media_matches there is a $media_replace with the same index. For each media match we check the width/height, or we use the default value of 425x350. We then replace the height/width/media1/media2 parameter placeholders in $media_replace with the correct ones, before running a str_replace on $text, replacing the given media with its correct replacement.
-		
+		// Then the different replacements for the different media tags are stored in $media_replace.
+		// Lastly, we loop through all $media_matches / $media_replaces. (We choose $media_replace as index because $media_matches is multi-dimensioned.) It is important that for each $media_matches there is a $media_replace with the same index. For each media match we check the width/height, or we use the default value of 425x350. We then replace the height/width/media1/media2 parameter placeholders in $media_replace with the correct ones, before running a str_replace on $text, replacing the given media with its correct replacement.
+	
 		// youtube videos
-        preg_match_all("#\[media[0-9a-z\|]*\]http://([a-z0-9\.]*)?youtube.com/watch\?v=(.*)\[/media\]#iU",$text,$media_matches[1],PREG_SET_ORDER);
-        $media_replace[1] = '<object width="##WIDTH##" height="##HEIGHT##"><param name="movie" value="http://##MEDIA1##youtube.com/v/##MEDIA2##"></param><embed src="http://##MEDIA1##youtube.com/v/##MEDIA2##" type="application/x-shockwave-flash" width="##WIDTH##" height="##HEIGHT##"></embed></object>';
-				
+		preg_match_all("#\[media[0-9a-z\|]*\]http://([a-z0-9\.]*)?youtube.com/watch\?v=(.*)\[/media\]#iU",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] = '<object width="##WIDTH##" height="##HEIGHT##"><param name="movie" value="http://##MEDIA1##youtube.com/v/##MEDIA2##"></param><embed src="http://##MEDIA1##youtube.com/v/##MEDIA2##" type="application/x-shockwave-flash" width="##WIDTH##" height="##HEIGHT##"></embed></object>';
+		
 		// .mpg
-		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).mpg\[/media\]#i",$text,$media_matches[2],PREG_SET_ORDER);
-		$media_replace[2] = "<object data=\"##MEDIA1##.mpg\" type=\"video/mpeg\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.mpg\"><param name=\"autoplay\" value=\"false\"><param name=\"autoStart\" value=\"0\"><a href=\"##MEDIA1##.mpg\">##MEDIA1##.mpg</a></object>";
+		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).mpg\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] = "<object data=\"##MEDIA1##.mpg\" type=\"video/mpeg\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.mpg\"><param name=\"autoplay\" value=\"false\"><param name=\"autoStart\" value=\"0\"><a href=\"##MEDIA1##.mpg\">##MEDIA1##.mpg</a></object>";
 		
 		// .avi
-		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).avi\[/media\]#i",$text,$media_matches[3],PREG_SET_ORDER);
-		$media_replace[3] = "<object data=\"##MEDIA1##.avi\" type=\"video/x-msvideo\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.avi\"><param name=\"autoplay\" value=\"false\"><param name=\"autoStart\" value=\"0\"><a href=\"##MEDIA1##.avi\">##MEDIA1##.avi</a></object>";
+		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).avi\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] = "<object data=\"##MEDIA1##.avi\" type=\"video/x-msvideo\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.avi\"><param name=\"autoplay\" value=\"false\"><param name=\"autoStart\" value=\"0\"><a href=\"##MEDIA1##.avi\">##MEDIA1##.avi</a></object>";
 		
 		// .wmv
-		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).wmv\[/media\]#i",$text,$media_matches[4],PREG_SET_ORDER);
-		$media_replace[4] = "<object data=\"##MEDIA1##.wmv\" type=\"video/x-ms-wmv\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.wmv\"><param name=\"autoplay\" value=\"false\"><param name=\"autoStart\" value=\"0\"><a href=\"##MEDIA1##.wmv\">##MEDIA1##.wmv</a></object>";
+		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).wmv\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] = "<object data=\"##MEDIA1##.wmv\" type=\"video/x-ms-wmv\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.wmv\"><param name=\"autoplay\" value=\"false\"><param name=\"autoStart\" value=\"0\"><a href=\"##MEDIA1##.wmv\">##MEDIA1##.wmv</a></object>";
+		
+		// .mov
+		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).mov\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] = "<object classid=\"clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B\" codebase=\"http://www.apple.com/qtactivex/qtplugin.cab\" width=\"##WIDTH##\" height=\"##HEIGHT##\">\n".
+		                   "  <param name=\"src\" value=\"##MEDIA1##.mov\">\n".
+		                   "  <param name=\"controller\" value=\"true\">\n".
+		                   "  <param name=\"autoplay\" value=\"false\">\n".
+		                   "  <!--[if gte IE 7] > <!-->\n".
+		                   "  <object type=\"video/quicktime\" data=\"##MEDIA1##.mov\" width=\"##WIDTH##\" height=\"##HEIGHT##\">\n".
+		                   "    <param name=\"controller\" value=\"true\">\n".
+		                   "    <param name=\"autoplay\" value=\"false\">\n".
+		                   "    <a href=\"##MEDIA1##.mov\">##MEDIA1##.mov</a>\n".
+		                   "  </object>\n".
+		                   "  <!--<![endif]-->\n".
+		                   "  <!--[if lt IE 7]>\n".
+		                   "  <a href=\"##MEDIA1##.mov\">##MEDIA1##.mov</a>\n".
+		                   "  <![endif]-->\n".
+		                   "</object>";
 		
 		// .swf
-		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).swf\[/media\]#i",$text,$media_matches[5],PREG_SET_ORDER);
-		$media_replace[5] = "<object type=\"application/x-shockwave-flash\" data=\"##MEDIA1##.swf\" width=\"##WIDTH##\" height=\"##HEIGHT##\">  <param name=\"movie\" value=\"##MEDIA1##.swf\"><param name=\"loop\" value=\"false\"><a href=\"##MEDIA1##.swf\">##MEDIA1##.swf</a></object>";
+		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).swf\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] = "<object type=\"application/x-shockwave-flash\" data=\"##MEDIA1##.swf\" width=\"##WIDTH##\" height=\"##HEIGHT##\">  <param name=\"movie\" value=\"##MEDIA1##.swf\"><param name=\"loop\" value=\"false\"><a href=\"##MEDIA1##.swf\">##MEDIA1##.swf</a></object>";
+	
+		// .mp3
+		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).mp3\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] = "<object type=\"audio/mpeg\" data=\"##MEDIA1##.mp3\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.mp3\"><param name=\"autoplay\" value=\"false\"><param name=\"autoStart\" value=\"0\"><a href=\"##MEDIA1##.mp3\">##MEDIA1##.mp3</a></object>";
 		
 		// .wav
-		preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).wav\[/media\]#i",$text,$media_matches[6],PREG_SET_ORDER);
-		$media_replace[6] ="<object type=\"audio/x-wav\" data=\"##MEDIA1##.wav\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.wav\"><param name=\"autoplay\" value=\"false\"><param name=\"autoStart\" value=\"0\"><a href=\"##MEDIA1##.wav\">##MEDIA1##.wav</a></object>";
+		preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).wav\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] ="<object type=\"audio/x-wav\" data=\"##MEDIA1##.wav\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.wav\"><param name=\"autoplay\" value=\"false\"><param name=\"autoStart\" value=\"0\"><a href=\"##MEDIA1##.wav\">##MEDIA1##.wav</a></object>";
 		
 		// .ogg
-		preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).ogg\[/media\]#i",$text,$media_matches[7],PREG_SET_ORDER);
-		$media_replace[7] ="<object type=\"application/ogg\" data=\"##MEDIA1##.ogg\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.ogg\"><a href=\"##MEDIA1##.ogg\">##MEDIA1##.ogg</a></object>";
-
-        // .ogm
-        preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).ogm\[/media\]#i",$text,$media_matches[8],PREG_SET_ORDER);
-        $media_replace[8] ="<object type=\"application/ogm\" data=\"##MEDIA1##.ogm\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.ogm\"><a href=\"##MEDIA1##.ogg\">##MEDIA1##.ogm</a></object>";
+		preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).ogg\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] ="<object type=\"application/ogg\" data=\"##MEDIA1##.ogg\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.ogg\"><a href=\"##MEDIA1##.ogg\">##MEDIA1##.ogg</a></object>";
+		
+		// .ogm
+		preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).ogm\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] ="<object type=\"application/ogm\" data=\"##MEDIA1##.ogm\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.ogm\"><a href=\"##MEDIA1##.ogg\">##MEDIA1##.ogm</a></object>";
 		
 		// .mid
-		preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).mid\[/media\]#i",$text,$media_matches[9],PREG_SET_ORDER);
-		$media_replace[9] ="<object type=\"application/x-midi\" data=\"##MEDIA1##.mid\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.mid\"><a href=\"##MEDIA1##.mid\">##MEDIA1##.mid</a></object>";
+		preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).mid\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
+		$media_replace[] ="<object type=\"application/x-midi\" data=\"##MEDIA1##.mid\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.mid\"><a href=\"##MEDIA1##.mid\">##MEDIA1##.mid</a></object>";
 		
 		$text = preg_replace("#\[media[0-9a-z\|]*\](.+[^\s\"]+).mid\[/media\]#i", "<object type=\"application/x-midi\" data=\"\\1.mid\" width=\"".$width."\" height=\"".$height."\"><param name=\"src\" value=\"\\1.mid\"><a href=\"\\1.mid\">\\1.mid</a></object>", $text);
 	
 		// Executing the replace
-		for ($i=1;$i<=count($media_replace);$i++){
+		for ($i=0;$i<count($media_replace);$i++){
 			foreach($media_matches[$i] as $media)
 			{
 				
@@ -743,13 +759,6 @@ class ContentUtility {
 		include_once(TR_INCLUDE_PATH.'classes/DAO/DAO.class.php');
 		$dao = new DAO();
 		
-		// All a4a resources have "&" converted to "&amp;". To match content with resources, 
-        // need the same conversion on content. 
-        $content = convertAmp($content);
-        
-        // keep &lt; (content saved in plain text format) as it is instead of &amp;lt;
-        $content = str_replace('&amp;lt;', '&lt;', $content);
-        
         $video_exts = array("mpg", "avi", "wmv", "mov", "swf", "mp4", "flv");
         
         $audio_exts = array("mp3", "wav", "ogg", "mid");
@@ -781,6 +790,13 @@ class ContentUtility {
 				return array($has_text_alternative, $has_audio_alternative, $has_visual_alternative, $has_sign_lang_alternative);
 			}
 		}
+		// All a4a resources have "&" converted to "&amp;". To match content with resources, 
+        // need the same conversion on content. 
+        $content = convertAmp($content);
+        
+        // keep &lt; (content saved in plain text format) as it is instead of &amp;lt;
+        $content = str_replace('&amp;lt;', '&lt;', $content);
+        
 		// get all relations between primary resources and their alternatives
         $sql = "SELECT DISTINCT c.content_path, pr.resource, ";
         
@@ -860,7 +876,6 @@ class ContentUtility {
                         // use default media size for video medias
                         $target = '[media]'.$row['secondary_resource'].'[/media]';
                     }
-                    $target = ContentUtility::embedFLV(ContentUtility::embedMedia($target));
                 }
 				// a text primary to be replaced by a visual alternative 
 				else if (in_array($ext, $txt_exts))
diff --git a/docs/home/course/content.php b/docs/home/course/content.php
index b38de92..dc19d6d 100644
--- a/docs/home/course/content.php
+++ b/docs/home/course/content.php
@@ -195,20 +195,20 @@ if ($content_row['text'] == '' && empty($content_test_ids)){
 	$msg->addInfo('NO_PAGE_CONTENT');
 	$savant->assign('body', '');
 } else {
-    $content = ContentUtility::formatContent($content_row['text'], $content_row['formatting']);
-
     // find whether the body has alternatives defined
 	list($has_text_alternative, $has_audio_alternative, $has_visual_alternative, $has_sign_lang_alternative)
-	= ContentUtility::applyAlternatives($cid, $content, true);
+	= ContentUtility::applyAlternatives($cid, $content_row['text'], true);
 
 	// apply alternatives
 	if (intval($_GET['alternative']) > 0) {
-		$content = ContentUtility::applyAlternatives($cid, $content, false, intval($_GET['alternative']));
+		$content = ContentUtility::applyAlternatives($cid, $content_row['text'], false, intval($_GET['alternative']));
 	} else {
-		$content = ContentUtility::applyAlternatives($cid, $content);
+		$content = $content_row['text'];
 	}
 
-	$content_array = ContentUtility::getContentTable($content);
+    $content = ContentUtility::formatContent($content, $content_row['formatting']);
+
+	$content_array = ContentUtility::getContentTable($content, $content_row['formatting']);
 	
 	$savant->assign('content_table', $content_array[0]);
 	$savant->assign('body', $content_array[1]);
-- 
2.17.1