From: Cindy Li <cli@ocad.ca>
Date: Thu, 13 Oct 2011 16:47:00 +0000 (-0000)
Subject: http://atutor.ca/atutor/mantis/view.php?id=4894
X-Git-Tag: v1.2~1
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=acontent.git;a=commitdiff_plain;h=5cc4ff108fa80474c41183932b87b2bad0a7112e

http://atutor.ca/atutor/mantis/view.php?id=4894

The proper functioning of flowplayer requires flash to be installed. Coverts the [media] tag into flowplayer type only when the flash is available, otherwise, converts to a plain <a> link instead.
---

diff --git a/docs/home/classes/ContentUtility.class.php b/docs/home/classes/ContentUtility.class.php
index 1a217de..0baae42 100644
--- a/docs/home/classes/ContentUtility.class.php
+++ b/docs/home/classes/ContentUtility.class.php
@@ -147,26 +147,30 @@ class ContentUtility {
 		
 		// .flv
 		preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+)\.flv\[/media\]#i",$text,$media_matches[],PREG_SET_ORDER);
-		$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>";
+		
+		if (isset($_SESSION['flash']) && $_SESSION['flash'] == "yes") {
+			$media_replace[] = "<div>\n".
+		                       "  <a class=\"".$flowplayerholder_class."\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"##MEDIA1##.flv\"></a>\n".
+		                       "</div>\n";
+		} else {
+			$media_replace[] = "<div>\n".
+		                       "  <a href=\"##MEDIA1##.flv\">##MEDIA1##.flv</a>\n".
+		                       "</div>\n";
+		}
 		
 		// .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_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>";
+
+		if (isset($_SESSION['flash']) && $_SESSION['flash'] == "yes") {
+			$media_replace[] = "<div>\n".
+		                       "  <a class=\"".$flowplayerholder_class."\" style=\"display:block;width:##WIDTH##px;height:##HEIGHT##px;\" href=\"##MEDIA1##.mp4\"></a>\n".
+		                       "</div>\n";
+		} else {
+			$media_replace[] = "<div>\n".
+		                       "  <a href=\"##MEDIA1##.mp4\">##MEDIA1##.mp4</a>\n".
+		                       "</div>\n";
+		}
+		
 		// Executing the replace
 		for ($i=0;$i<count($media_replace);$i++){
 			foreach($media_matches[$i] as $media)