return $text; \r
}\r
\r
+ /*\r
+ * This function converts the youtube playable url used in <object> tag (for instance: http://www.youtube.com/v/a0ryB0m0MiM)\r
+ * to youtube url that is used to browse (for instance: http://www.youtube.com/watch?v=a0ryB0m0MiM)\r
+ * @param: youtube playable URL. For instance, http://www.youtube.com/v/a0ryB0m0MiM\r
+ * @return: if the param is a youtube playable url, return the according youtube URL used to browse. \r
+ * For instance: http://www.youtube.com/watch?v=a0ryB0m0MiM\r
+ * Otherwise, return the original send-in parameter.\r
+ */\r
+ function convertYoutubePlayURLToWatchURL($youtube_playURL) {\r
+ return preg_replace("/(http:\/\/[a-z0-9\.]*)?youtube.com\/v\/(.*)/",\r
+ "\\1youtube.com/watch?v=\\2", $youtube_playURL);\r
+ }\r
+\r
+ /*\r
+ * This function converts the youtube url that is used to browse (for instance: http://www.youtube.com/watch?v=a0ryB0m0MiM)\r
+ * to youtube playable url used in <object> tag (for instance: http://www.youtube.com/v/a0ryB0m0MiM)\r
+ * @param: the youtube URL used to browse. \r
+ * For instance: http://www.youtube.com/watch?v=a0ryB0m0MiM\r
+ * @return: if the param is a youtube url used to browse, return the according youtube playable URL. \r
+ * For instance, http://www.youtube.com/v/a0ryB0m0MiM\r
+ * Otherwise, return the original send-in parameter.\r
+ */\r
+ function convertYoutubeWatchURLToPlayURL($youtube_watchURL) {\r
+ return preg_replace("/(http:\/\/[a-z0-9\.]*)?youtube.com\/watch\?v=(.*)/",\r
+ "\\1youtube.com/v/\\2", $youtube_watchURL);\r
+ }\r
+\r
public static function embedMedia($text) {\r
if (preg_match("/\[media(\|[0-9]+\|[0-9]+)?\]*/", $text)==0){\r
return $text;\r
\r
$media_matches = Array();\r
\r
- /*\r
- First, we search though the text for all different kinds of media defined by media tags and store the results in $media_matches.\r
- \r
- Then the different replacements for the different media tags are stored in $media_replace.\r
- \r
- 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.\r
- \r
- */\r
+ // First, we search though the text for all different kinds of media defined by media tags and store the results in $media_matches.\r
+ // Then the different replacements for the different media tags are stored in $media_replace.\r
+ // 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.\r
\r
// youtube videos\r
- preg_match_all("#\[media[0-9a-z\|]*\]http://([a-z0-9\.]*)?youtube.com/watch\?v=([a-z0-9_-]+)\[/media\]#i",$text,$media_matches[1],PREG_SET_ORDER);\r
-
$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>';
\r- \r
+ preg_match_all("#\[media[0-9a-z\|]*\]http://([a-z0-9\.]*)?youtube.com/watch\?v=(.*)\[/media\]#iU",$text,$media_matches[1],PREG_SET_ORDER);\r
+ $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>';\r
+ \r
// .mpg\r
preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).mpg\[/media\]#i",$text,$media_matches[2],PREG_SET_ORDER);\r
$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>";\r
preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).wmv\[/media\]#i",$text,$media_matches[4],PREG_SET_ORDER);\r
$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>";\r
\r
- // .mov\r
- preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).mov\[/media\]#i",$text,$media_matches[5],PREG_SET_ORDER);\r
- $media_replace[5] = "<object classid=\"clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B\" codebase=\"http://www.apple.com/qtactivex/qtplugin.cab\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"src\" value=\"##MEDIA1##.mov\"><param name=\"controller\" value=\"true\"><param name=\"autoplay\" value=\"false\"><!--[if gte IE 7]> <!--><object type=\"video/quicktime\" data=\"##MEDIA1##.mov\" width=\"##WIDTH##\" height=\"##HEIGHT##\"><param name=\"controller\" value=\"true\"><param name=\"autoplay\" value=\"false\"><a href=\"##MEDIA1##.mov\">##MEDIA1##.mov</a></object><!--<![endif]--><!--[if lt IE 7]><a href=\"##MEDIA1##.mov\">##MEDIA1##.mov</a><![endif]--></object>";\r
- \r
// .swf\r
- preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).swf\[/media\]#i",$text,$media_matches[6],PREG_SET_ORDER);\r
- $media_replace[6] = "<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>";\r
- \r
- // .mp3\r
- preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).mp3\[/media\]#i",$text,$media_matches[7],PREG_SET_ORDER);\r
- $media_replace[7] = "<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>";\r
+ preg_match_all("#\[media[0-9a-z\|]*\]([.\w\d]+[^\s\"]+).swf\[/media\]#i",$text,$media_matches[5],PREG_SET_ORDER);\r
+ $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>";\r
\r
// .wav\r
- preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).wav\[/media\]#i",$text,$media_matches[8],PREG_SET_ORDER);\r
- $media_replace[
8] ="<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>";
\r+ preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).wav\[/media\]#i",$text,$media_matches[6],PREG_SET_ORDER);\r
+ $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>";
\r \r
// .ogg\r
- preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).ogg\[/media\]#i",$text,$media_matches[9],PREG_SET_ORDER);\r
- $media_replace[9] ="<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>";\r
+ preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).ogg\[/media\]#i",$text,$media_matches[7],PREG_SET_ORDER);\r
+ $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>";\r
+\r
+ // .ogm\r
+ preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).ogm\[/media\]#i",$text,$media_matches[8],PREG_SET_ORDER);\r
+ $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>";\r
\r
// .mid\r
- preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).mid\[/media\]#i",$text,$media_matches[10],PREG_SET_ORDER);\r
- $media_replace[
10] ="<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>";
\r+ preg_match_all("#\[media[0-9a-z\|]*\](.+[^\s\"]+).mid\[/media\]#i",$text,$media_matches[9],PREG_SET_ORDER);\r
+ $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>";
\r \r
$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);\r
\r
$input);\r
} else {\r
$input = preg_replace\r
- ("/(\[\?\])$term(\[\/\?\])/i",\r
- '\\2<sup><a class="tooltip" href="'.$_base_path.'glossary/index.php?g_cid='.$_SESSION['s_cid'].htmlentities(SEP).'w='.urlencode($original_term).'#term" title="'.addslashes($original_term).': '.$def.'"><span style="color: blue; text-decoration: none;font-size:small; font-weight:bolder;">?</span></a></sup>',$input);\r
+ ("/(\[\?\])$term(\[\/\?\])/i",\r
+ '\\2<sup><a class="tooltip" href="'.$_base_path.'mods/_core/glossary/index.php?g_cid='.$_SESSION['s_cid'].htmlentities(SEP).'w='.urlencode($original_term).'#term" title="'.addslashes($original_term).': '.$def.'">?</a></sup>',$input);\r
}\r
}\r
} else if (!$user_glossary) {\r
include_once(TR_INCLUDE_PATH.'classes/DAO/DAO.class.php');\r
$dao = new DAO();\r
\r
- $video_exts = array("mpg", "avi", "wmv", "mov", "swf", "mp3", "wav", "ogg", "mid", "mp4", "flv");\r
+ // All a4a resources have "&" converted to "&". To match content with resources, \r
+ // need the same conversion on content. \r
+ $content = convertAmp($content);\r
+ \r
+ // keep < (content saved in plain text format) as it is instead of &lt;\r
+ $content = str_replace('&lt;', '<', $content);\r
+ \r
+ $video_exts = array("mpg", "avi", "wmv", "mov", "swf", "mp4", "flv");\r
+ \r
+ $audio_exts = array("mp3", "wav", "ogg", "mid");\r
+ $audio_width = 425;\r
+ $audio_height = 27;\r
+\r
$txt_exts = array("txt", "html", "htm");\r
$image_exts = array("gif", "bmp", "png", "jpg", "jpeg", "png", "tif");\r
$only_on_secondary_type = intval($only_on_secondary_type);\r
return array($has_text_alternative, $has_audio_alternative, $has_visual_alternative, $has_sign_lang_alternative);\r
}\r
}\r
- \r
// get all relations between primary resources and their alternatives\r
- $sql = "SELECT c.content_path, pr.resource, prt.type_id primary_type, sr.secondary_resource, srt.type_id secondary_type\r
+ $sql = "SELECT DISTINCT c.content_path, pr.resource, ";\r
+ \r
+ // ignore primary resource type if the request is on particular secondary type.\r
+ // otherwise, if the primary resource is defined with multiple primary types, \r
+ // the primary resource would be replaced/appended multiple times.\r
+ if ($only_on_secondary_type == 0) {\r
+ $sql .= "prt.type_id primary_type, ";\r
+ }\r
+ $sql .= "sr.secondary_resource, srt.type_id secondary_type\r
FROM ".TABLE_PREFIX."primary_resources pr, ".\r
TABLE_PREFIX."primary_resources_types prt,".\r
TABLE_PREFIX."secondary_resources sr,".\r
}\r
}\r
\r
- foreach ($rows as $row) \r
+ foreach ($rows as $row) {\r
+ $alternative_rows[] = $row;\r
+ \r
+ $youtube_playURL = ContentUtility::convertYoutubeWatchURLToPlayURL($row['resource']);\r
+ \r
+ if ($row['resource'] <> $youtube_playURL) {\r
+ $row['resource'] = $youtube_playURL;\r
+ $alternative_rows[] = $row;\r
+ }\r
+ }\r
+\r
+ foreach ($alternative_rows as $row) \r
{\r
if ($info_only || $only_on_secondary_type ||\r
($_SESSION['prefs']['PREF_USE_ALTERNATIVE_TO_TEXT']==1 && $row['primary_type']==3 &&\r
$ext = substr($row['secondary_resource'], strrpos($row['secondary_resource'], '.')+1);\r
\r
// alternative is video\r
- if (in_array($ext, $video_exts))\r
- $target = '[media]'.$row['secondary_resource'].'[/media]';\r
+ if (in_array($ext, $video_exts)|| in_array($ext, $audio_exts) || \r
+ preg_match("/http:\/\/.*youtube.com\/watch.*/", $row['secondary_resource'])) {\r
+ if (in_array($ext, $audio_exts)) {\r
+ // display audio medias in a smaller width/height (425 * 27)\r
+ // A hack for now to handle audio media player size\r
+ $target = '[media|'.$audio_width.'|'.$audio_height.']'.$row['secondary_resource'].'[/media]';\r
+ } else {\r
+ // use default media size for video medias\r
+ $target = '[media]'.$row['secondary_resource'].'[/media]';\r
+ }\r
+ $target = ContentUtility::embedFLV(ContentUtility::embedMedia($target));\r
+ }\r
// a text primary to be replaced by a visual alternative \r
else if (in_array($ext, $txt_exts))\r
{\r
if (($row['primary_type']==3 && $_SESSION['prefs']['PREF_ALT_TO_TEXT_APPEND_OR_REPLACE'] == 'replace') ||\r
($row['primary_type']==1 && $_SESSION['prefs']['PREF_ALT_TO_AUDIO_APPEND_OR_REPLACE']=='replace') ||\r
($row['primary_type']==4 && $_SESSION['prefs']['PREF_ALT_TO_VISUAL_APPEND_OR_REPLACE']=='replace'))\r
- $pattern_replace_to = '${1}'.$target.'${3}';\r
- else\r
- $pattern_replace_to = '${1}${2}'.$target.'${3}';\r
- \r
- // *** Alternative replace/append starts from here ***\r
- $img_processed = false; // The indicator to tell the source image is found (or not) \r
- // and processed (or not) in an <img> tag. If found and processed, \r
- // SKIP the found/process for <a> tag because the source is a image\r
- // and <a> is very likely the tag wrapping around <img>\r
+ $pattern_replace_to = '${1}'."\n".$target."\n".'${3}';\r
+ else\r
+ $pattern_replace_to = '${1}${2}'."<br /><br />\n".$target."\n".'${3}';\r
\r
- // append/replace target alternative to [media]source[/media]\r
- if (preg_match("/".preg_quote("[media").".*".preg_quote("]".$row['resource']."[/media]", "/")."/sU", $content))\r
- {\r
+ // *** Alternative replace/append starts from here ***\r
+ $processed = false; // one primary resource is only processed once \r
+ \r
+ // append/replace target alternative to [media]source[/media]\r
+ if (!$processed && preg_match("/".preg_quote("[media").".*".preg_quote("]".$row['resource']."[/media]", "/")."/sU", $content))\r
+ {\r
+ $processed = true;\r
if (!$info_only) {\r
$content = preg_replace("/(.*)(".preg_quote("[media").".*".preg_quote("]".$row['resource']."[/media]", "/").")(.*)/sU", \r
$pattern_replace_to, $content);\r
}\r
\r
// append/replace target alternative to <img ... src="source" ...></a>\r
- if (preg_match("/\<img.*src=\"".preg_quote($row['resource'], "/")."\".*\/\>/sU", $content))\r
- {\r
- $img_processed = true;\r
+ if (
!$processed && preg_match("/\<img.*src=\"".preg_quote($row['resource'], "/")."\".*\/\>/sU", $content))
\r+ {\r
+ $processed = true;\r
if (!$info_only) {\r
$content = preg_replace("/(.*)(\<img.*src=\"".preg_quote($row['resource'], "/")."\".*\/\>)(.*)/sU", \r
$pattern_replace_to, $content);\r
}\r
}\r
\r
- // append/replace target alternative to <a>...source...</a> or <a ...source...>...</a>\r
- // skip this "if" when the source object has been processed in aboved <img> tag\r
- if (!$img_processed && preg_match("/\<a.*".preg_quote($row['resource'], "/").".*\<\/a\>/sU", $content))\r
- {\r
- if (!$info_only) {\r
- $content = preg_replace("/(.*)(\<a.*".preg_quote($row['resource'], "/").".*\<\/a\>)(.*)/sU", \r
+ // append/replace target alternative to <object ... source ...></object>\r
+ if (!$processed && preg_match("/\<object.*".preg_quote($row['resource'], "/").".*\<\/object\>/sU", $content))\r
+ {\r
+ $processed = true;\r
+ if (!$info_only) {\r
+ $content = preg_replace("/(.*)(\<object.*".preg_quote($row['resource'], "/").".*\<\/object\>)(.*)/sU", \r
$pattern_replace_to, $content);\r
} else {\r
if ($row['secondary_type'] == 1) $has_audio_alternative = true;\r
}\r
}\r
\r
- // append/replace target alternative to <object ... source ...></object>\r
- if (preg_match("/\<object.*".preg_quote($row['resource'], "/").".*\<\/object\>/sU", $content))\r
- {\r
- if (!$info_only) {\r
- $content = preg_replace("/(.*)(\<object.*".preg_quote($row['resource'], "/").".*\<\/object\>)(.*)/sU", \r
+ // append/replace target alternative to <a>...source...</a> or <a ...source...>...</a>\r
+ // skip this "if" when the source object has been processed in aboved <img> tag\r
+ if (!$processed && preg_match("/\<a.*".preg_quote($row['resource'], "/").".*\<\/a\>/sU", $content))\r
+ {\r
+ $processed = true;\r
+ if (!$info_only) {\r
+ $content = preg_replace("/(.*)(\<a.*".preg_quote($row['resource'], "/").".*\<\/a\>)(.*)/sU",\r
$pattern_replace_to, $content);\r
} else {\r
if ($row['secondary_type'] == 1) $has_audio_alternative = true;\r
}\r
\r
// append/replace target alternative to <embed ... source ...>\r
- if (preg_match("/\<embed.*".preg_quote($row['resource'], "/").".*\>/sU", $content))\r
- {\r
+ if (!$processed && preg_match("/\<embed.*".preg_quote($row['resource'], "/").".*\>/sU", $content))\r
+ {\r
+ $processed = true;\r
if (!$info_only) {\r
$content = preg_replace("/(.*)(\<embed.*".preg_quote($row['resource'], "/").".*\>)(.*)/sU", \r
$pattern_replace_to, $content);\r
$msg->addInfo('NO_PAGE_CONTENT');
$savant->assign('body', '');
} else {
- // find whether the body has alternatives defined
+ $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_row['text'], true);
+ = ContentUtility::applyAlternatives($cid, $content, true);
// apply alternatives
if (intval($_GET['alternative']) > 0) {
- $content = ContentUtility::applyAlternatives($cid, $content_row['text'], false, intval($_GET['alternative']));
+ $content = ContentUtility::applyAlternatives($cid, $content, false, intval($_GET['alternative']));
} else {
- $content = ContentUtility::applyAlternatives($cid, $content_row['text']);
+ $content = ContentUtility::applyAlternatives($cid, $content);
}
-
- $content = ContentUtility::formatContent($content, $content_row['formatting']);
$content_array = ContentUtility::getContentTable($content);
return false;
}
+/*
+ * Parse the primary resources out of the content and save into db.
+ * Clean up the removed primary resources from db.
+ * @param: $cid: content id
+ * @param: $content
+ * @return: none
+ */
+function populate_a4a($cid, $content, $formatting){
+ global $db, $my_files;
+
+ include_once(AT_INCLUDE_PATH.'classes/A4a/A4a.class.php');
+ include_once(AT_INCLUDE_PATH.'classes/XML/XML_HTMLSax/XML_HTMLSax.php'); /* for XML_HTMLSax */
+ include_once(AT_INCLUDE_PATH.'classes/ContentOutputParser.class.php'); /* for parser */
+
+ $body = format_content($content, $formatting,array());
+
+ $handler = new ContentOutputParser();
+ $parser = new XML_HTMLSax();
+ $parser->set_object($handler);
+ $parser->set_element_handler('openHandler','closeHandler');
+
+ $my_files = array();
+ $parser->parse($body);
+ $my_files = array_unique($my_files);
+
+ foreach ($my_files as $file) {
+ /* filter out full urls */
+ $url_parts = @parse_url($file);
+
+ // file should be relative to content
+ if ((substr($file, 0, 1) == '/')) {
+ continue;
+ }
+
+ // The URL of the movie from youtube.com has been converted above in embed_media().
+ // For example: http://www.youtube.com/watch?v=a0ryB0m0MiM is converted to
+ // http://www.youtube.com/v/a0ryB0m0MiM to make it playable. This creates the problem
+ // that the parsed-out url (http://www.youtube.com/v/a0ryB0m0MiM) does not match with
+ // the URL saved in content table (http://www.youtube.com/watch?v=a0ryB0m0MiM).
+ // The code below is to convert the URL back to original.
+ $file = convertYoutubePlayURLToWatchURL($file);
+
+ $resources[] = convertAmp($file); // converts & to &
+ }
+
+ if (count($resources) == 0) return;
+
+ $a4a = new A4a($cid);
+ $db_primary_resources = $a4a->getPrimaryResources();
+
+ // clean up the removed resources
+ foreach ($db_primary_resources as $primary_rid=>$db_resource){
+ //if this file from our table is not found in the $resource, then it's not used.
+ if(in_array($db_resource['resource'], $resources)===false){
+ $a4a->deletePrimaryResource($primary_rid);
+ }
+ }
+
+ // insert the new resources
+ foreach($resources as $primary_resource)
+ {
+ if (!$a4a->getPrimaryResourceByName($primary_resource)){
+ $a4a->setPrimaryResource($cid, $primary_resource, $_SESSION['lang']);
+ }
+ }
+}
+
// save all changes to the DB
function save_changes($redir, $current_tab) {
global $contentManager, $addslashes, $msg, $_course_id, $_content_id;
// }
// if (!$msg->containsErrors()) {
+ $orig_body_text = $_POST['body_text']; // used to populate a4a tables
// $_POST['title'] = $addslashes($_POST['title']);
// $_POST['body_text'] = $addslashes($_POST['body_text']);
// $_POST['head'] = $addslashes($_POST['head']);
$_POST['_cid'] = $cid;
$_REQUEST['_cid'] = $cid;
}
+ // re-populate a4a tables based on the new content
+ populate_a4a($cid, $orig_body_text, $_POST['formatting']);
if ($cid == 0) return;
// }
require_once(TR_INCLUDE_PATH.'footer.inc.php');
exit;
}
-/**
- * This function returns the preview link of the given file
- * @param $file the file location in "file manager"
- * @return the relative URL to preview the file
- */
-function get_preview_link($file)
-{
- global $content_row, $_course_id;
-
- if (substr($file, 0 , 7) == 'http://' || substr($file, 0 , 8) == 'https://') {
- return $file;
- } else {
- if (defined('TR_FORCE_GET_FILE') && TR_FORCE_GET_FILE) {
- $get_file = 'get.php/';
- } else {
- $get_file = 'content/' . $_course_id . '/';
- }
- }
-
- return $get_file.$content_row['content_path'].'/'.$file;
-}
/**
* When the file name is a remote URL, this function reduces the full URL
if ($secondary_resource['type_id'] == $alternative_type)
{
echo ' <div id="'.$pid.'_'.$alternative_type.'">'."\n";
- echo ' <a href="'.get_preview_link($secondary_resource['secondary_resource']).'" title="'._AT('new_window').'" target="_new">'.get_display_filename($secondary_resource['secondary_resource']).'</a><br />'."\n";
+ echo ' <a href="'.$secondary_resource['secondary_resource'].'" title="'._AT('new_window').'" target="_new">'.get_display_filename($secondary_resource['secondary_resource']).'</a><br />'."\n";
echo ' <a href="#" onclick="trans.utility.poptastic(\''.TR_BASE_HREF.'file_manager/index.php?framed=1'. SEP.'popup=1'. SEP.'cp='. $content_row['content_path'].SEP.'_cid='.$content_id.SEP.'pid='.$pid.SEP.'a_type='.$alternative_type.'\');return false;" title="'._AT('new_window').'">'."\n";
echo ' <img src="'.TR_BASE_HREF.'images/alter.png" border="0" title="'._AT('alter').'" alt="'._AT('alter').'" />'."\n";
echo ' </a>'."\n";
}
// Main program
-require(TR_INCLUDE_PATH.'lib/resources_parser.inc.php');
+global $db, $content_row;
+populate_a4a($cid, $_POST['body_text'], $_POST['formatting']);
+
+include_once(AT_INCLUDE_PATH.'classes/A4a/A4a.class.php');
-if (count($resources)==0)
+$a4a = new A4a($cid);
+$primary_resources = $a4a->getPrimaryResources();
+
+if (count($primary_resources)==0)
{
echo '<p>'. _AT('No_resources'). '</p>';
}
echo ' </thead>'."\n";
echo ' <tbody>';
- foreach($resources as $primary_resource)
+ foreach($primary_resources as $primary_resource_id => $primary_resource_row)
{
- // check whether the primary resource is in the table
- $sql = "SELECT * FROM ".TABLE_PREFIX."primary_resources
- WHERE content_id = ".$cid."
- AND language_code = '".$_SESSION['lang']."'
- AND resource='".$primary_resource."'";
-// $primary_result = mysql_query($sql, $db);
- $existing_primary_resource = $dao->execute($sql);
-
- // insert primary resource if it's not in db
- if (!is_array($existing_primary_resource))
-// if (mysql_num_rows($primary_result) == 0)
- {
- $sql = "INSERT INTO ".TABLE_PREFIX."primary_resources (content_id, resource, language_code)
- VALUES (".$cid.", '".$primary_resource."', '".$_SESSION['lang']."')";
-// $result = mysql_query($sql, $db);
- $dao->execute($sql);
- $primary_resource_id = mysql_insert_id();
- }
- else
- {
- // get primary resource id
-// $primary_resource_row = mysql_fetch_assoc($primary_result);
- $primary_resource_id = $existing_primary_resource[0]['primary_resource_id'];
- }
+ $primary_resource = $primary_resource_row['resource'];
$sql = "SELECT prt.type_id, rt.type
FROM ".TABLE_PREFIX."primary_resources pr, ".
TABLE_PREFIX."resource_types rt
WHERE pr.content_id = ".$cid."
AND pr.language_code = '".$_SESSION['lang']."'
- AND pr.resource='".$primary_resource."'
+ AND pr.primary_resource_id='".$primary_resource_id."'
AND pr.primary_resource_id = prt.primary_resource_id
AND prt.type_id = rt.type_id";
// $primary_type_result = mysql_query($sql, $db);
TABLE_PREFIX."secondary_resources_types srt
WHERE pr.content_id = ".$cid."
AND pr.language_code = '".$_SESSION['lang']."'
- AND pr.resource='".$primary_resource."'
+ AND pr.primary_resource_id='".$primary_resource_id."'
AND pr.primary_resource_id = sr.primary_resource_id
AND sr.secondary_resource_id = srt.secondary_resource_id";
// $secondary_result = mysql_query($sql, $db);
// table cell "original resource"
echo ' <td headers="header1">'."\n";
- echo ' <a href="'.get_preview_link($primary_resource).'" title="'._AT('new_window').'" target="_new">'.get_display_filename($primary_resource).'</a>'."\n";
+ echo ' <a href="'.$primary_resource.'" title="'._AT('new_window').'" target="_new">'.get_display_filename($primary_resource).'</a>'."\n";
echo ' </td>'."\n";
// table cell "original resource type"
require_once(TR_INCLUDE_PATH.'classes/zipfile.class.php'); /* for zipfile */
require_once(TR_INCLUDE_PATH.'classes/vcard.php'); /* for vcard */
require_once(TR_INCLUDE_PATH.'classes/XML/XML_HTMLSax/XML_HTMLSax.php'); /* for XML_HTMLSax */
+require_once(TR_INCLUDE_PATH.'classes/ContentOutputParser.class.php'); /* to retrieve content resources/medias from at_content[text] */
require_once(TR_INCLUDE_PATH.'../home/imscc/include/ims_template.inc.php'); /* for ims templates + print_organizations() */
if (isset($_POST['cancel'])) {
$zipfile = new zipfile();
$zipfile->create_dir('resources/');
-/*
- the following resources are to be identified:
- even if some of these can't be images, they can still be files in the content dir.
- theoretically the only urls we wouldn't deal with would be for a <!DOCTYPE and <form>
-
- img => src
- a => href // ignore if href doesn't exist (ie. <a name>)
- object => data | classid // probably only want data
- applet => classid | archive // whatever these two are should double check to see if it's a valid file (not a dir)
- link => href
- script => src
- form => action
- input => src
- iframe => src
-
-*/
-class MyHandler {
- function MyHandler(){}
- function openHandler(& $parser,$name,$attrs) {
- global $my_files;
-
- $name = strtolower($name);
- $attrs = array_change_key_case($attrs, CASE_LOWER);
-
- $elements = array( 'img' => 'src',
- 'a' => 'href',
- 'object' => array('data', 'classid'),
- 'applet' => array('classid', 'archive'),
- 'link' => 'href',
- 'script' => 'src',
- 'form' => 'action',
- 'input' => 'src',
- 'iframe' => 'src',
- 'embed' => 'src',
- 'param' => 'value');
-
- /* check if this attribute specifies the files in different ways: (ie. java) */
- if (is_array($elements[$name])) {
- $items = $elements[$name];
-
- foreach ($items as $item) {
- if ($attrs[$item] != '') {
-
- /* some attributes allow a listing of files to include seperated by commas (ie. applet->archive). */
- if (strpos($attrs[$item], ',') !== false) {
- $files = explode(',', $attrs[$item]);
- foreach ($files as $file) {
- $my_files[] = trim($file);
- }
- } else {
- $my_files[] = $attrs[$item];
- }
- }
- }
- } else if (isset($elements[$name]) && ($attrs[$elements[$name]] != '')) {
- //hack, if param[name]=src or none <param> tag, extract. Skip all other <param> attributes.
- if ($name!='param' || $attrs['name']=='src'){
- //skip glossary.html, tweak to accomodate atutor imscp; also skip repeated entries.
- //skip javascript: links, void();, #, mailto:
- if (strpos($attrs[$elements[$name]], 'glossary.html')===false
- && !in_array($attrs[$elements[$name]], $my_files)
- && $attrs[$elements[$name]]!='#'
- && strpos($attrs[$elements[$name]], 'javascript:')===false
- && strpos($attrs[$elements[$name]], 'mailto:')===false
- && strpos($attrs[$elements[$name]], 'void(')===false
- ){
- $my_files[] = $attrs[$elements[$name]];
- }
- }
- }
- }
- function closeHandler(& $parser,$name) { }
-}
-
/* get all the content */
$content = array();
$paths = array();
$top_content_parent_id = 0;
-$handler=new MyHandler();
+$handler=new ContentOutputParser();
$parser = new XML_HTMLSax();
$parser->set_object($handler);
$parser->set_element_handler('openHandler','closeHandler');
}
}
+ /**
+ * A hack to fix youtube links. one uses youtube.com?watch=xxx, the other uses youtube.com/v/xxx,
+ * in which both points to the same file, but needed different links to play.
+ * in A4a, these youtube links are always stored as "?watch=xxx", however, output.inc.php converted
+ * these to /v/xxx for rendering purposes. Convert it back if youtube exists in url.
+ * http://atutor.ca/atutor/mantis/view.php?id=4548
+ * @harris 9/30/2010
+ */
+ if (strpos($file, 'youtube.com')!==false){
+ //apply the conversion before linking the alternatives. Otherwise it will not be added.
+ $file = convert_youtube_playURL_to_watchURL($file);
+ }
// If this file has a4a alternatives, link it.
if (isset($a4a_xml_array[$file]) || isset($a4a_secondary_files[$file])){
//if this is an array, meaning that it has more than 1 alternatives, print all
$ims_template_xml['header'] = '<?xml version="1.0" encoding="{COURSE_PRIMARY_LANGUAGE_CHARSET}"?>
-<!--This is an ATutor 1.0 Common Cartridge document-->
-<!--Created from the ATutor Content Package Generator - http://www.atutor.ca-->
-<manifest identifier="MANIFEST-2415ad93fc44817acbe40edfd1ffb1ee" xmlns="http://www.imsglobal.org/xsd/imscc/imscp_v1p1" xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_rootv1p2p1" xmlns:lomimscc="http://ltsc.ieee.org/xsd/imscc/LOM" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adlcp="http://www.adlnet.org/xsd/adlcp_rootv1p2" xsi:schemaLocation="http://www.imsglobal.org/xsd/imscc/imscp_v1p1 imscp_v1p2_localised.xsd http://ltsc.ieee.org/xsd/imscc/LOM domainProfile_1/lomLoose_localised.xsd">
- <metadata>
+<!--This is an AContent IMS Common Cartridge 1.0 document-->
+<!--Created from the AContent Content Package Generator - http://www.atutor.ca-->
+<manifest identifier="MANIFEST-'.md5($cid).'"
+xmlns="http://www.imsglobal.org/xsd/imscc/imscp_v1p1"
+xmlns:imsmd="http://ltsc.ieee.org/xsd/imscc/LOM"
+xmlns:lomimscc="http://ltsc.ieee.org/xsd/imscc/LOM"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://www.imsglobal.org/xsd/imscc/imscp_v1p1 http://www.imsglobal.org/profile/cc/ccv1p0/derived_schema/imscp_v1p2_localised.xsd http://ltsc.ieee.org/xsd/imscc/LOM http://www.imsglobal.org/profile/cc/ccv1p0/derived_schema/domainProfile_1/lomLoose_localised.xsd" version="IMS Common Cartridge 1.0.0"> <metadata>
<schema>IMS Common Cartridge</schema>
<schemaversion>1.0.0</schemaversion>
<lomimscc:lom>
return $pri_resources;
}
+ //get primary resource by resource name
+ function getPrimaryResourceByName($resource_name){
+ if ($resource_name==''){
+ return array();
+ }
+
+ include_once(TR_INCLUDE_PATH.'classes/DAO/PrimaryResourcesDAO.class.php');
+ $primaryResourcesDAO = new PrimaryResourcesDAO();
+ $pri_resources = $primaryResourcesDAO->getByResourceName($this->cid, $_SESSION['lang'], $resource_name);
+ return $pri_resources;
+ }
+
// Get primary resources types
function getPrimaryResourcesTypes($pri_resource_id=0){
}
+ /**
+ * Delete this primary resource and all its associated secondary resources
+ * @param int primary resournce id
+ */
+ function deletePrimaryResource($primary_rid){
+ include_once(TR_INCLUDE_PATH.'classes/DAO/PrimaryResourcesDAO.class.php');
+ $primaryResourcesDAO = new PrimaryResourcesDAO();
+ $primaryResourcesDAO->DeleteByResourceID($primary_rid);
+ }
+
// Delete all materials associated with this content
function deleteA4a(){
include_once(TR_INCLUDE_PATH.'classes/DAO/PrimaryResourcesDAO.class.php');
$primaryResourcesDAO = new PrimaryResourcesDAO();
$rows = $primaryResourcesDAO->Delete($this->cid);
- }
+ }
}
?>
\ No newline at end of file
foreach($resources as $rid => $prop){
$resources_types = parent::getPrimaryResourcesTypes($rid);
+ if (empty($resources_types)){
+ //if there are no resource types, then don't use it.
+ continue;
+ }
$temp = array();
$secondary_array = array();
foreach($resources_types as $rtid){
global $addslashes;
$content_id = intval($content_id);
- $file_name = $addslashes($file_name);
+ $file_name = $addslashes(convertAmp($file_name));
$lang = $addslashes($lang);
$sql = "INSERT INTO ".TABLE_PREFIX."primary_resources
return $this->execute($sql);
}
+ /**
+ * Delete rows by using resource id
+ * @access public
+ * @param $resourceID: primary resource ID
+ * @return true or false
+ * @author Harris Wong
+ * @date Oct 6, 2010
+ */
+ function DeleteByResourceID($resourceID){
+ // Delete all secondary a4a
+ $sql = 'DELETE c, d FROM '.TABLE_PREFIX.'secondary_resources c LEFT JOIN '.TABLE_PREFIX."secondary_resources_types d ON c.secondary_resource_id=d.secondary_resource_id WHERE primary_resource_id=$resourceID";
+ $result = $this->execute($sql);
+
+ // If successful, remove all primary resources
+ if ($result){
+ $sql = 'DELETE a, b FROM '.TABLE_PREFIX.'primary_resources a LEFT JOIN '.TABLE_PREFIX."primary_resources_types b ON a.primary_resource_id=b.primary_resource_id WHERE a.primary_resource_id=$resourceID";
+ return $this->execute($sql);
+ }
+ }
+
/**
* Return rows by content_id
* @access public
*/
public function getByContent($cid)
{
- $sql = 'SELECT * FROM '.TABLE_PREFIX.'primary_resources WHERE content_id='.$cid;
+ $sql = 'SELECT * FROM '.TABLE_PREFIX.'primary_resources WHERE content_id='.$cid.' ORDER BY primary_resource_id';;
return $this->execute($sql);
}
+
+ /**
+ * Return rows by primary resource name
+ * @access public
+ * @param $cid: the content id
+ * @param $lang: the language code.
+ * @param $resourceName: primary resource name
+ * @return table rows
+ * @author Harris Wong
+ * @date Oct 6, 2010
+ */
+ public function getByResourceName($cid, $lang, $resource_name){
+ $sql = "SELECT * FROM ".TABLE_PREFIX."primary_resources
+ WHERE content_id=".$cid."
+ AND language_code = '".$lang."'
+ AND resource='".$resource_name."'";
+ return $this->execute($sql);
+ }
}
?>
\ No newline at end of file
$mime['mpeg'] = array('video/mpeg', 'video');\r
$mime['mpg'] = array('video/mpeg', 'video');\r
$mime['mpe'] = array('video/mpeg', 'video');\r
+$mime['mp4'] = array('video/mp4', 'video');\r
$mime['qt'] = array('video/quicktime', 'qt');\r
$mime['mov'] = array('video/quicktime', 'qt');\r
$mime['wmv'] = array('video/x-ms-wmv', 'video');\r
continue;
}
+ // The URL of the movie from youtube.com has been converted above in embed_media().
+ // For example: http://www.youtube.com/watch?v=a0ryB0m0MiM is converted to
+ // http://www.youtube.com/v/a0ryB0m0MiM to make it playable. This creates the problem
+ // that the parsed-out url (http://www.youtube.com/v/a0ryB0m0MiM) does not match with
+ // the URL saved in content table (http://www.youtube.com/watch?v=a0ryB0m0MiM).
+ // The code below is to convert the URL back to original.
+ $file = preg_replace("/(http:\/\/[a-z0-9\.]*)?youtube.com\/v\/(.*)/",
+ "\\1youtube.com/watch?v=\\2", $file);
+
$resources[$i] = $file;
$i++;
}
}
}
+//set the timezone, php 5.3+ problem. http://atutor.ca/atutor/mantis/view.php?id=4409
+date_default_timezone_set('UTC');
+
// define as constants. more constants are defined in include/constants.inc.php
define('EMAIL', $_config['contact_email']);
define('SITE_NAME', $_config['site_name']);
return $rows[0]['dir_name'];
}
+/**
+ * Convert all '&' to '&' from the input
+ * @param string any string input, mainly URLs.
+ * @return input with & replaced to '&'
+ * @author Harris Wong
+ * @date Oct 7, 2010
+ */
+function convertAmp($input){
+ $input = str_replace('&', '&', $input); //convert everything to '&' first
+ return str_replace('&', '&', $input);
+}
+
?>
projects / acontent.git / commitdiff