Changeset 756
- Timestamp:
- 12/29/07 16:16:52 (11 months ago)
- Location:
- team/michiel/input_formats
- Files:
-
- 200 added
- 2 modified
-
common/mvblog_admin.php (modified) (3 diffs)
-
common/mvblog_common.php (modified) (3 diffs)
-
lib (added)
-
lib/Text (added)
-
lib/Text/Wiki (added)
-
lib/Text/Wiki.php (added)
-
lib/Text/Wiki/Default.php (added)
-
lib/Text/Wiki/Mediawiki.php (added)
-
lib/Text/Wiki/Parse (added)
-
lib/Text/Wiki/Parse.php (added)
-
lib/Text/Wiki/Parse/Default (added)
-
lib/Text/Wiki/Parse/Default/Anchor.php (added)
-
lib/Text/Wiki/Parse/Default/Blockquote.php (added)
-
lib/Text/Wiki/Parse/Default/Bold.php (added)
-
lib/Text/Wiki/Parse/Default/Break.php (added)
-
lib/Text/Wiki/Parse/Default/Center.php (added)
-
lib/Text/Wiki/Parse/Default/Code.php (added)
-
lib/Text/Wiki/Parse/Default/Colortext.php (added)
-
lib/Text/Wiki/Parse/Default/Deflist.php (added)
-
lib/Text/Wiki/Parse/Default/Delimiter.php (added)
-
lib/Text/Wiki/Parse/Default/Embed.php (added)
-
lib/Text/Wiki/Parse/Default/Emphasis.php (added)
-
lib/Text/Wiki/Parse/Default/Freelink.php (added)
-
lib/Text/Wiki/Parse/Default/Function.php (added)
-
lib/Text/Wiki/Parse/Default/Heading.php (added)
-
lib/Text/Wiki/Parse/Default/Horiz.php (added)
-
lib/Text/Wiki/Parse/Default/Html.php (added)
-
lib/Text/Wiki/Parse/Default/Image.php (added)
-
lib/Text/Wiki/Parse/Default/Include.php (added)
-
lib/Text/Wiki/Parse/Default/Interwiki.php (added)
-
lib/Text/Wiki/Parse/Default/Italic.php (added)
-
lib/Text/Wiki/Parse/Default/List.php (added)
-
lib/Text/Wiki/Parse/Default/Newline.php (added)
-
lib/Text/Wiki/Parse/Default/Paragraph.php (added)
-
lib/Text/Wiki/Parse/Default/Phplookup.php (added)
-
lib/Text/Wiki/Parse/Default/Prefilter.php (added)
-
lib/Text/Wiki/Parse/Default/Raw.php (added)
-
lib/Text/Wiki/Parse/Default/Revise.php (added)
-
lib/Text/Wiki/Parse/Default/Smiley.php (added)
-
lib/Text/Wiki/Parse/Default/Strong.php (added)
-
lib/Text/Wiki/Parse/Default/Subscript.php (added)
-
lib/Text/Wiki/Parse/Default/Superscript.php (added)
-
lib/Text/Wiki/Parse/Default/Table.php (added)
-
lib/Text/Wiki/Parse/Default/Tighten.php (added)
-
lib/Text/Wiki/Parse/Default/Toc.php (added)
-
lib/Text/Wiki/Parse/Default/Tt.php (added)
-
lib/Text/Wiki/Parse/Default/Underline.php (added)
-
lib/Text/Wiki/Parse/Default/Url.php (added)
-
lib/Text/Wiki/Parse/Default/Wikilink.php (added)
-
lib/Text/Wiki/Parse/Mediawiki (added)
-
lib/Text/Wiki/Parse/Mediawiki/Deflist.php (added)
-
lib/Text/Wiki/Parse/Mediawiki/Emphasis.php (added)
-
lib/Text/Wiki/Parse/Mediawiki/Heading.php (added)
-
lib/Text/Wiki/Parse/Mediawiki/List.php (added)
-
lib/Text/Wiki/Parse/Mediawiki/Raw.php (added)
-
lib/Text/Wiki/Parse/Mediawiki/Table.php (added)
-
lib/Text/Wiki/Parse/Mediawiki/Url.php (added)
-
lib/Text/Wiki/Parse/Mediawiki/Wikilink.php (added)
-
lib/Text/Wiki/Render (added)
-
lib/Text/Wiki/Render.php (added)
-
lib/Text/Wiki/Render/Latex (added)
-
lib/Text/Wiki/Render/Latex.php (added)
-
lib/Text/Wiki/Render/Latex/Anchor.php (added)
-
lib/Text/Wiki/Render/Latex/Blockquote.php (added)
-
lib/Text/Wiki/Render/Latex/Bold.php (added)
-
lib/Text/Wiki/Render/Latex/Box.php (added)
-
lib/Text/Wiki/Render/Latex/Break.php (added)
-
lib/Text/Wiki/Render/Latex/Center.php (added)
-
lib/Text/Wiki/Render/Latex/Code.php (added)
-
lib/Text/Wiki/Render/Latex/Colortext.php (added)
-
lib/Text/Wiki/Render/Latex/Deflist.php (added)
-
lib/Text/Wiki/Render/Latex/Delimiter.php (added)
-
lib/Text/Wiki/Render/Latex/Embed.php (added)
-
lib/Text/Wiki/Render/Latex/Emphasis.php (added)
-
lib/Text/Wiki/Render/Latex/Font.php (added)
-
lib/Text/Wiki/Render/Latex/Freelink.php (added)
-
lib/Text/Wiki/Render/Latex/Function.php (added)
-
lib/Text/Wiki/Render/Latex/Heading.php (added)
-
lib/Text/Wiki/Render/Latex/Horiz.php (added)
-
lib/Text/Wiki/Render/Latex/Html.php (added)
-
lib/Text/Wiki/Render/Latex/Image.php (added)
-
lib/Text/Wiki/Render/Latex/Include.php (added)
-
lib/Text/Wiki/Render/Latex/Interwiki.php (added)
-
lib/Text/Wiki/Render/Latex/Italic.php (added)
-
lib/Text/Wiki/Render/Latex/List.php (added)
-
lib/Text/Wiki/Render/Latex/Newline.php (added)
-
lib/Text/Wiki/Render/Latex/Page.php (added)
-
lib/Text/Wiki/Render/Latex/Paragraph.php (added)
-
lib/Text/Wiki/Render/Latex/Phplookup.php (added)
-
lib/Text/Wiki/Render/Latex/Plugin.php (added)
-
lib/Text/Wiki/Render/Latex/Prefilter.php (added)
-
lib/Text/Wiki/Render/Latex/Preformatted.php (added)
-
lib/Text/Wiki/Render/Latex/Raw.php (added)
-
lib/Text/Wiki/Render/Latex/Revise.php (added)
-
lib/Text/Wiki/Render/Latex/Smiley.php (added)
-
lib/Text/Wiki/Render/Latex/Specialchar.php (added)
-
lib/Text/Wiki/Render/Latex/Strong.php (added)
-
lib/Text/Wiki/Render/Latex/Subscript.php (added)
-
lib/Text/Wiki/Render/Latex/Superscript.php (added)
-
lib/Text/Wiki/Render/Latex/Table.php (added)
-
lib/Text/Wiki/Render/Latex/Tighten.php (added)
-
lib/Text/Wiki/Render/Latex/Titlebar.php (added)
-
lib/Text/Wiki/Render/Latex/Toc.php (added)
-
lib/Text/Wiki/Render/Latex/Tt.php (added)
-
lib/Text/Wiki/Render/Latex/Underline.php (added)
-
lib/Text/Wiki/Render/Latex/Url.php (added)
-
lib/Text/Wiki/Render/Latex/Wikilink.php (added)
-
lib/Text/Wiki/Render/Plain (added)
-
lib/Text/Wiki/Render/Plain.php (added)
-
lib/Text/Wiki/Render/Plain/Anchor.php (added)
-
lib/Text/Wiki/Render/Plain/Blockquote.php (added)
-
lib/Text/Wiki/Render/Plain/Bold.php (added)
-
lib/Text/Wiki/Render/Plain/Box.php (added)
-
lib/Text/Wiki/Render/Plain/Break.php (added)
-
lib/Text/Wiki/Render/Plain/Center.php (added)
-
lib/Text/Wiki/Render/Plain/Code.php (added)
-
lib/Text/Wiki/Render/Plain/Colortext.php (added)
-
lib/Text/Wiki/Render/Plain/Deflist.php (added)
-
lib/Text/Wiki/Render/Plain/Delimiter.php (added)
-
lib/Text/Wiki/Render/Plain/Embed.php (added)
-
lib/Text/Wiki/Render/Plain/Emphasis.php (added)
-
lib/Text/Wiki/Render/Plain/Font.php (added)
-
lib/Text/Wiki/Render/Plain/Freelink.php (added)
-
lib/Text/Wiki/Render/Plain/Function.php (added)
-
lib/Text/Wiki/Render/Plain/Heading.php (added)
-
lib/Text/Wiki/Render/Plain/Horiz.php (added)
-
lib/Text/Wiki/Render/Plain/Html.php (added)
-
lib/Text/Wiki/Render/Plain/Image.php (added)
-
lib/Text/Wiki/Render/Plain/Include.php (added)
-
lib/Text/Wiki/Render/Plain/Interwiki.php (added)
-
lib/Text/Wiki/Render/Plain/Italic.php (added)
-
lib/Text/Wiki/Render/Plain/List.php (added)
-
lib/Text/Wiki/Render/Plain/Newline.php (added)
-
lib/Text/Wiki/Render/Plain/Page.php (added)
-
lib/Text/Wiki/Render/Plain/Paragraph.php (added)
-
lib/Text/Wiki/Render/Plain/Phplookup.php (added)
-
lib/Text/Wiki/Render/Plain/Plugin.php (added)
-
lib/Text/Wiki/Render/Plain/Prefilter.php (added)
-
lib/Text/Wiki/Render/Plain/Preformatted.php (added)
-
lib/Text/Wiki/Render/Plain/Raw.php (added)
-
lib/Text/Wiki/Render/Plain/Revise.php (added)
-
lib/Text/Wiki/Render/Plain/Smiley.php (added)
-
lib/Text/Wiki/Render/Plain/Specialchar.php (added)
-
lib/Text/Wiki/Render/Plain/Strong.php (added)
-
lib/Text/Wiki/Render/Plain/Subscript.php (added)
-
lib/Text/Wiki/Render/Plain/Superscript.php (added)
-
lib/Text/Wiki/Render/Plain/Table.php (added)
-
lib/Text/Wiki/Render/Plain/Tighten.php (added)
-
lib/Text/Wiki/Render/Plain/Titlebar.php (added)
-
lib/Text/Wiki/Render/Plain/Toc.php (added)
-
lib/Text/Wiki/Render/Plain/Tt.php (added)
-
lib/Text/Wiki/Render/Plain/Underline.php (added)
-
lib/Text/Wiki/Render/Plain/Url.php (added)
-
lib/Text/Wiki/Render/Plain/Wikilink.php (added)
-
lib/Text/Wiki/Render/Xhtml (added)
-
lib/Text/Wiki/Render/Xhtml.php (added)
-
lib/Text/Wiki/Render/Xhtml/Address.php (added)
-
lib/Text/Wiki/Render/Xhtml/Anchor.php (added)
-
lib/Text/Wiki/Render/Xhtml/Blockquote.php (added)
-
lib/Text/Wiki/Render/Xhtml/Bold.php (added)
-
lib/Text/Wiki/Render/Xhtml/Box.php (added)
-
lib/Text/Wiki/Render/Xhtml/Break.php (added)
-
lib/Text/Wiki/Render/Xhtml/Center.php (added)
-
lib/Text/Wiki/Render/Xhtml/Code.php (added)
-
lib/Text/Wiki/Render/Xhtml/Colortext.php (added)
-
lib/Text/Wiki/Render/Xhtml/Deflist.php (added)
-
lib/Text/Wiki/Render/Xhtml/Delimiter.php (added)
-
lib/Text/Wiki/Render/Xhtml/Embed.php (added)
-
lib/Text/Wiki/Render/Xhtml/Emphasis.php (added)
-
lib/Text/Wiki/Render/Xhtml/Font.php (added)
-
lib/Text/Wiki/Render/Xhtml/Freelink.php (added)
-
lib/Text/Wiki/Render/Xhtml/Function.php (added)
-
lib/Text/Wiki/Render/Xhtml/Heading.php (added)
-
lib/Text/Wiki/Render/Xhtml/Horiz.php (added)
-
lib/Text/Wiki/Render/Xhtml/Html.php (added)
-
lib/Text/Wiki/Render/Xhtml/Image.php (added)
-
lib/Text/Wiki/Render/Xhtml/Include.php (added)
-
lib/Text/Wiki/Render/Xhtml/Interwiki.php (added)
-
lib/Text/Wiki/Render/Xhtml/Italic.php (added)
-
lib/Text/Wiki/Render/Xhtml/List.php (added)
-
lib/Text/Wiki/Render/Xhtml/Newline.php (added)
-
lib/Text/Wiki/Render/Xhtml/Page.php (added)
-
lib/Text/Wiki/Render/Xhtml/Paragraph.php (added)
-
lib/Text/Wiki/Render/Xhtml/Phplookup.php (added)
-
lib/Text/Wiki/Render/Xhtml/Plugin.php (added)
-
lib/Text/Wiki/Render/Xhtml/Prefilter.php (added)
-
lib/Text/Wiki/Render/Xhtml/Preformatted.php (added)
-
lib/Text/Wiki/Render/Xhtml/Raw.php (added)
-
lib/Text/Wiki/Render/Xhtml/Revise.php (added)
-
lib/Text/Wiki/Render/Xhtml/Smiley.php (added)
-
lib/Text/Wiki/Render/Xhtml/Specialchar.php (added)
-
lib/Text/Wiki/Render/Xhtml/Strong.php (added)
-
lib/Text/Wiki/Render/Xhtml/Subscript.php (added)
-
lib/Text/Wiki/Render/Xhtml/Superscript.php (added)
-
lib/Text/Wiki/Render/Xhtml/Table.php (added)
-
lib/Text/Wiki/Render/Xhtml/Tighten.php (added)
-
lib/Text/Wiki/Render/Xhtml/Titlebar.php (added)
-
lib/Text/Wiki/Render/Xhtml/Toc.php (added)
-
lib/Text/Wiki/Render/Xhtml/Tt.php (added)
-
lib/Text/Wiki/Render/Xhtml/Underline.php (added)
-
lib/Text/Wiki/Render/Xhtml/Url.php (added)
-
lib/Text/Wiki/Render/Xhtml/Wikilink.php (added)
Legend:
- Unmodified
- Added
- Removed
-
team/michiel/input_formats/common/mvblog_admin.php
r755 r756 1293 1293 //put all known dossiers in $this->dossiers array 1294 1294 $this->_get_dossiers(); 1295 //only HTML and BBCODE can be handled by tinymce 1296 if (in_array($post["postformat"], array("HTML", "BBC")) && $this->settings["wysiwyg"]) 1297 $autoload = 1; 1298 else 1299 $autoload = 0; 1295 1300 ?> 1296 1301 <script language="javascript" type="text/javascript" src="../tiny_mce/tiny_mce_gzip.js"></script> … … 1306 1311 <?php 1307 1312 echo sprintf("<script language=\"javascript\" type=\"text/javascript\" src=\"../common/tinymce_conf.js.php?mode=%s&autoload=%d\"></script>\n", 1308 $post["postformat"], $ this->settings["wysiwyg"]);1313 $post["postformat"], $autoload); 1309 1314 ?> 1310 1315 <script language="javascript" type="text/javascript" src="../common/tinymce_filemanager.js"></script> … … 1798 1803 <option value="HTML"<?php if ($settings["defaultpostformat"] == "HTML") echo " selected=\"selected\""; ?>>HTML</option> 1799 1804 <option value="BBC"<?php if ($settings["defaultpostformat"] == "BBC") echo " selected=\"selected\""; ?>>BBCode</option> 1805 <option value="MW"<?php if ($settings["defaultpostformat"] == "MW") echo " selected=\"selected\""; ?>>MediaWiki</option> 1800 1806 </select> 1801 1807 </td> -
team/michiel/input_formats/common/mvblog_common.php
r754 r756 407 407 * - BBC: bbcode - uses internal bbcode parser 408 408 * - HTML: html sourcecode - no processing is done 409 * - MW: MediaWiki sourcecode - uses PEAR::Text_Wiki_Mediawiki 409 410 * 410 411 * @param string $body The raw body data … … 416 417 case "BBC": 417 418 $body = $this->parse_bbcode($body); 419 break; 420 case "MW": 421 $body = $this->parse_mediawiki($body); 418 422 break; 419 423 } … … 489 493 } 490 494 return(stripslashes($string)); 495 } 496 /* }}} */ 497 /* parse_mediawiki {{{ */ 498 /** 499 * Parse Mediawiki formatted string into XHTML. 500 * This function uses PEAR::Text_Wiki and PEAR::Text_Wiki_Mediawiki. 501 * Because all plugins for Text_Wiki are alpha we include these 2 packages 502 * in the MvBlog sources. 503 * 504 * @param string $data The mediawiki source 505 * @return string XHTML representation of the wiki source 506 */ 507 public function parse_mediawiki($data) { 508 //add our PEAR directory to the include path 509 set_include_path(get_include_path().PATH_SEPARATOR.dirname(__FILE__)."/../lib/"); 510 //include the PEAR files 511 require_once("Text/Wiki.php"); 512 //wiki object 513 $wiki =& Text_Wiki::singleton("Mediawiki"); 514 $xhtml = $wiki->transform($data, "Xhtml"); 515 unset($wiki); 516 return $xhtml; 491 517 } 492 518 /* }}} */
