L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged Howard's changes from HEAD

Browse Source
This commit is contained in:
moodler
2004-08-27 15:50:18 +00:00
parent aff55f17a2
commit 19dd3171b1
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/weblib.php
+4 -4
View File
@@ -623,7 +623,7 @@ function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL
break;
case FORMAT_WIKI:
$text = wiki_to_html($text);
$text = wiki_to_html($text,$courseid);
$text = rebuildnolinktag($text);
if (!isset($options->noclean)) {
$text = clean_text($text, $format);
@@ -908,14 +908,14 @@ function text_to_html($text, $smiley=true, $para=true, $newlines=true) {
}
}
function wiki_to_html($text) {
function wiki_to_html($text,$courseid) {
/// Given Wiki formatted text, make it into XHTML using external function
global $CFG, $course;
global $CFG;
require_once("$CFG->libdir/wiki.php");
$wiki = new Wiki;
return $wiki->format($text);
return $wiki->format($text,$courseid);
}
function markdown_to_html($text) {
lib/wiki.php
+8 -6
View File
@@ -54,6 +54,7 @@ class Wiki {
var $spelling_on;
var $list_backtrack;
var $output; // output buffer
var $courseid;
function close_block( $state ) {
// provide appropriate closure for block according to state
@@ -270,23 +271,23 @@ class Wiki {
" <a href=\"".$CFG->wwwroot."/mod/\\1/view.php?id=\\2\">\\3</a> ", $line );
// Replace picture resource link
global $course; // This is a bit risky - it won't work everywhere
// global $course; // This is a bit risky - it won't work everywhere
if ($CFG->slasharguments) {
$line = eregi_replace( "/([a-zA-Z0-9./_-]+)(png|gif|jpg)\(([^)]+)\)",
"<img src=\"$CFG->wwwroot/file.php/$course->id/\\1\\2\" alt=\"\\3\" />", $line );
"<img src=\"$CFG->wwwroot/file.php/$this->courseid/\\1\\2\" alt=\"\\3\" />", $line );
} else {
$line = eregi_replace( "/([a-zA-Z0-9./_-]+)(png|gif|jpg)\(([^)]+)\)",
"<img src=\"$CFG->wwwroot/file.php\?file=$course->id/\\1\\2\" alt=\"\\3\" />", $line );
"<img src=\"$CFG->wwwroot/file.php\?file=$this->courseid/\\1\\2\" alt=\"\\3\" />", $line );
}
// Replace everything else resource link
if ($CFG->slasharguments) {
$line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)",
"<a href=\"$CFG->wwwroot/file.php/$course->id/\\1\" >\\2</a>", $line );
"<a href=\"$CFG->wwwroot/file.php/$this->courseid/\\1\" >\\2</a>", $line );
} else {
$line = eregi_replace( "file:/([[:alnum:]/._-]+)\(([^)]+)\)",
"<a href=\"$CFG->wwwroot/file.php\?file=$course->id/\\1\" >\\2</a>", $line );
"<a href=\"$CFG->wwwroot/file.php\?file=$this->courseid/\\1\" >\\2</a>", $line );
}
replace_smilies( $line );
@@ -327,7 +328,7 @@ class Wiki {
}
function format( $content ) {
function format( $content, $courseid ) {
// main entry point for processing TikiText
// $content is string containing text with Tiki formatting
// return: string containing XHTML formatting
@@ -339,6 +340,7 @@ class Wiki {
$this->list_depth = 0;
$this->list_backtrack = array();
$this->spelling_on = false;
$this->courseid = $courseid;
// split content into array of single lines
$lines = explode( "\n",$content );