Changed WrMap to use WrCommon.

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/trunk/extensions/wrmap@386 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wrmap.body.php b/wrmap.body.php
index ffe81b6abefc589e903ae24b062a309d645018af..0114a5aa4208a54e754e7ce2c17e4bc116dad29c 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -1,9 +1,7 @@
 <?php
-require_once dirname(__FILE__) . '/../wrgeo/wrgeo.body.php'; # for the function wrGeoGeoStringToGeo
 
 function wrMapParserFirstCallInit() {
        global $wgParser;
-       // global $wrGoogleMaps; // is this necessary?
        global $wgGoogleMapsKey;
        $wrGoogleMaps = new WrGoogleMaps($wgGoogleMapsKey);
        $wgParser->setHook('wrmap', 'wrmapParserHook');
@@ -12,32 +10,6 @@ function wrMapParserFirstCallInit() {
 }
 
 
-// Tool functions
-// --------------
-
-/// List of markers - used by the functions wrMapReplaceByMarker and wrMapAfterTidy
-$wrMapMarkerList = array();
-
-
-/// Returns a marker for a text and back-replaces the text in wrReportAfterTidy
-function wrMapReplaceByMarker($text, $marker = 'wrMapMarker') {
-       $marker = $marker . mt_rand(1e5, 1e7);
-       global $wrMapMarkerList;
-       $wrMapMarkerList[$marker] = $text;
-       return $marker;
-}
-
-
-/// Replaces the markers by its contents
-function wrMapParserAfterTidy(&$parser, &$text) {
-       // find markers in $text
-       // replace markers with actual output
-       global $wrMapMarkerList;
-       foreach ($wrMapMarkerList as $marker => $html) $text = str_replace($marker, $html, $text);
-       return true;
-}
-
-
 
 // Java script
 // -----------
@@ -144,7 +116,7 @@ class WrGoogleMaps {
                $output .= "}\n//]]>\n</script>\n";
                $output .= '<noscript><img alt="Landkarte mit Rodelbahnen" src="' . htmlspecialchars($staticLink) . "\" width=\"$staticSizeX\" height=\"$staticSizeY\" /></noscript>\n";
 
-               return wrMapReplaceByMarker($output);
+               return wrCommonReplaceByMarker($output, 'wrmap');
        }
        
        // returns a string that creates a map object called 'map'

diff --git a/wrmap.php b/wrmap.php
index e2f637b79dc8811eba66fb66bd296cfd01f66091..43485b6ddafc9e447317acb559d944cbb1a5be97 100644 (file)
--- a/wrmap.php
+++ b/wrmap.php
@@ -1,7 +1,11 @@
 <?php
+// This extension depends on
+// - wrcommon
+// - wrgeo (for wrGeoStringToGeo)
+
 $wgExtensionCredits['parserhook'][] = array(
        'name' => 'Winterrodeln Map',
-       'version' => '1.2.0',
+       'version' => '1.3.0',
        'author' =>'Philipp Spitzer', 
        'url' => 'http://www.winterrodeln.org', 
        'description' => 'This extension creates a map from coordinates and uses the GoogleMaps extension to do so.'
@@ -9,7 +13,7 @@ $wgExtensionCredits['parserhook'][] = array(
 
 
 $wgHooks['ParserFirstCallInit'][] = 'wrMapParserFirstCallInit';
-$wgHooks['ParserAfterTidy'][] = 'wrMapParserAfterTidy';
+$wgHooks['ParserAfterTidy'][] = 'wrCommonMarkerAfterTidy';
 
 
 require_once dirname(__FILE__) . '/wrmap.body.php';