phpwiki-checkins Mailing List for PhpWiki (Page 160)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7217
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7217&view=rev
Author:   vargenau
Date:     2009-10-17 15:45:24 +0000 (Sat, 17 Oct 2009)

Log Message:
-----------
Remove unused xml plugin syntax (better use Wikicreole plugin syntax)

Modified Paths:
--------------
    trunk/TODO
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/lib/IniConfig.php
    trunk/lib/InlineParser.php

Modified: trunk/TODO
===================================================================

--- trunk/TODO	2009-10-17 15:19:39 UTC (rev 7216)
+++ trunk/TODO	2009-10-17 15:45:24 UTC (rev 7217)
@@ -27,10 +27,6 @@
 TODO for 1.4.0:
 architecture:
 * Optimization: try template_lite or try simple regex replacements as before.
-* Evaluate some xml syntax for plugins (as in MediaWiki): 
-  <IncludePages pages=<plugin-list BackLinks/> />
-  <BackLink include_self=false />
-  And/or fix PLUGIN_MARKUP_MAP aliases which break the InlineParser.
 * Fix postgresql stored procedures.
 * Move serialized data from page_data / version_data to seperate SQL columns.
 * WikiDB hooks. (?)

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2009-10-17 15:19:39 UTC (rev 7216)
+++ trunk/config/config-default.ini	2009-10-17 15:45:24 UTC (rev 7217)
@@ -154,7 +154,6 @@
 ENABLE_MARKUP_COLOR = true
 DISABLE_MARKUP_WIKIWORD = false
 ENABLE_MARKUP_DIVSPAN = false
-PLUGIN_MARKUP_MAP = ""
 
 ; these not:
 ; DBAUTH_AUTH_DSN =

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2009-10-17 15:19:39 UTC (rev 7216)
+++ trunk/config/config-dist.ini	2009-10-17 15:45:24 UTC (rev 7217)
@@ -1047,11 +1047,6 @@
 ; Enable &lt;div&gt; and &lt;span&gt; HTML blocks and attributes. Experimental. Not yet working.
 ;ENABLE_MARKUP_DIVSPAN = true
 
-; Plugin shortcuts: Enable <xml> syntax mapped to a plugin invocation. (as in mediawiki)
-; <name arg=value>body</name> or <name /> => <?plugin pluginname arg=value body ?>
-; This breaks the InlineParser.
-;PLUGIN_MARKUP_MAP = "html:RawHtml dot:GraphViz toc:CreateToc amath:AsciiMath richtable:RichTable include:IncludePage tex:TexToPng"
-
 ;==========================================================================
 ; Part Six: URL options.
 ;==========================================================================

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2009-10-17 15:19:39 UTC (rev 7216)
+++ trunk/lib/IniConfig.php	2009-10-17 15:45:24 UTC (rev 7217)
@@ -155,7 +155,7 @@
          'PLUGIN_CACHED_DATABASE', 'PLUGIN_CACHED_FILENAME_PREFIX',
          'PLUGIN_CACHED_HIGHWATER', 'PLUGIN_CACHED_LOWWATER', 'PLUGIN_CACHED_MAXLIFETIME',
          'PLUGIN_CACHED_MAXARGLEN', 'PLUGIN_CACHED_IMGTYPES',
-         'WYSIWYG_BACKEND', 'PLUGIN_MARKUP_MAP',
+         'WYSIWYG_BACKEND',
          // extra logic:
          'SERVER_NAME','SERVER_PORT','SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH',
 	 'EXTERNAL_HTML2PDF_PAGELIST', 'PLUGIN_CACHED_CACHE_DIR'
@@ -423,18 +423,6 @@
                in_array(DATABASE_TYPE, array('SQL','ADODB','PDO')) ? 2 : 0);
     }
 
-    global $PLUGIN_MARKUP_MAP;
-    $PLUGIN_MARKUP_MAP = array();
-    if (defined('PLUGIN_MARKUP_MAP') and trim(PLUGIN_MARKUP_MAP) != "") {
-	$_map = preg_split('/\s+/', PLUGIN_MARKUP_MAP);
-	foreach ($_map as $v) {
-	    list($xml,$plugin) = split(':', $v);
-	    if (!empty($xml) and !empty($plugin))
-	        $PLUGIN_MARKUP_MAP[$xml] = $plugin;
-	}
-	unset($_map); unset($xml); unset($plugin); unset($v);
-    }
-
     if (empty($rs['TEMP_DIR'])) {
 	$rs['TEMP_DIR'] = "/tmp";
 	if (getenv("TEMP"))

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009-10-17 15:19:39 UTC (rev 7216)
+++ trunk/lib/InlineParser.php	2009-10-17 15:45:24 UTC (rev 7217)
@@ -937,43 +937,6 @@
     }
 }
 
-// Special version for plugins in xml syntax 
-// <name arg=value>body</name> or <name /> => < ? plugin pluginname arg=value body ? >
-// PLUGIN_MARKUP_MAP = "html:RawHtml dot:GraphViz toc:CreateToc amath:AsciiMath richtable:RichTable include:IncludePage tex:TexToPng"
-class Markup_xml_plugin extends BalancedMarkup
-{
-    //var $_start_regexp = "<(?: ".join('|',PLUGIN_MARKUP_MAP)." )(?: \s[^>]*)>";
-
-    function getStartRegexp () {
-	global $PLUGIN_MARKUP_MAP;
-        static $_start_regexp;
-        if ($_start_regexp) return $_start_regexp;
-        if (empty($PLUGIN_MARKUP_MAP))
-            return '';
-        //"<(?: html|dot|toc|amath|richtable|include|tex )(?: \s[^>]*)>"
-	$_start_regexp = "<(?: ".join('|',array_keys($PLUGIN_MARKUP_MAP))." )(?: \s[^>]* | / )>";
-        return $_start_regexp;
-    }
-    function getEndRegexp ($match) {
-        return "<\\/" . $match . '>';
-    }
-    function markup ($match, $body) {
-	global $PLUGIN_MARKUP_MAP;
-        $name = substr($match,2,-2); 
-	$vars = '';
-        if (preg_match('/^(\S+)\|(.*)$/', $name, $_m)) {
-            $name = $_m[1];
-            $vars = $_m[2]; //str_replace(' ', '&', $_m[2]);
-        }
-        if (!isset($PLUGIN_MARKUP_MAP[$name])) {
-            trigger_error("No plugin for $name $vars defined.", E_USER_WARNING);
-            return "";
-        }
-        $plugin = $PLUGIN_MARKUP_MAP[$name];
-	return new Cached_PluginInvocation("<"."?plugin $plugin $vars $body ?".">");
-    }
-}
-
 /**
  *  Mediawiki <nowiki>
  *  <nowiki>...</nowiki>
@@ -1198,9 +1161,6 @@
         // Markup_wikicreole_preformatted must be before Markup_template_plugin
         $this->_addMarkup(new Markup_wikicreole_preformatted);
         $this->_addMarkup(new Markup_template_plugin);
-        // This does not work yet
-        if (0 and PLUGIN_MARKUP_MAP and !$non_default)
-            $this->_addMarkup(new Markup_xml_plugin);
     }
 
     function _addMarkup ($markup) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

phpwiki-checkins Mailing List for PhpWiki (Page 160)

phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.