fixed image size detection broken during code deduplication

[mirrors/DokuWiki-Plugin-SVGEdit.git] / syntax.php

diff --git a/syntax.php b/syntax.php
index c5bd599e4b683486f9c54fca5c703c96beca054f..6c920737740b3b804c6d1cce5e2a8450241a4878 100755 (executable)
--- a/syntax.php
+++ b/syntax.php
@@ -48,6 +48,23 @@ class syntax_plugin_svgedit extends DokuWiki_Syntax_Plugin {
         return array($type, $match); 
     }
 
+               function svg_base64_encode($svg) { //create base64 encoded svg for use as svglink in svg_format_embed
+                       return 'data:image/svg+xml;base64,'.base64_encode($svg).'" type="image/svg+xml';
+               }
+
+               function svg_format_embed($svglink, $alt, $svg_parameters) { //create xhtml code for svg embeding
+                               global $ID;
+
+                               //use object tag for stupid browsers (like firefox) - ugly (relies on browser identification)
+                               $is_webkit= preg_match('/webkit/', strtolower($_SERVER['HTTP_USER_AGENT']));
+                               if ($is_webkit)
+                                       $svgtag='img src';
+                               else
+                                       $svgtag='object '.$svg_parameters.' data';
+
+                               return '<a href="'.$svglink.'" type="image/svg+xml" /><'.$svgtag.'="'.$svglink.'" alt="'.$alt.'" type="image/svg+xml" /></a>'."<br />";
+               }
+
     function render($format, &$renderer, $data) {
                                if ($format!='xhtml') return;
                                global $ID;
@@ -59,28 +76,20 @@ class syntax_plugin_svgedit extends DokuWiki_Syntax_Plugin {
                                preg_match('/width="[0-9]+" height="[0-9]+"/', $data[1].rawWiki($svg_wiki_page), $_);
                                if(isset($_[0])) $svg_dimensions = $_[0];
 
-                               //use object tag for stupid browsers (like firefox) - ugly (relies on browser identification)
-                               $is_webkit= preg_match('/webkit/', strtolower($_SERVER['HTTP_USER_AGENT']));
-                               if ($is_webkit)
-                                       $svgtag='<img src="';
-                               else
-                                       $svgtag='<object '.$svg_dimensions.' data="';
-
-
                                if($data[0]==='<svg') {
-                                       $svgenc = 'data:image/svg+xml;base64,'.base64_encode($data[1]).'" type="image/svg+xml';
-                                       $renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" />'.$svgtag.$svgenc.'" alt="svg-image@'.$ID.'" /></a>'."<br />";
+                                       $svgenc = $this->svg_base64_encode($data[1]);
+                                       $renderer->doc .= $this->svg_format_embed($svgenc, 'svg-image@'.$ID, $svg_dimensions);
                                        return true;
                                }
                                if($data[0]==='{{sv') {
-                                       $svgenc = exportlink($svg_wiki_page,'svg');
-                                       $renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" />'.$svgtag.$svgenc.'" alt="image:'.htmlspecialchars($svg_wiki_page).'" type="image/svg+xml"/></a><br />';
+                                       $svglink = exportlink($svg_wiki_page,'svg');
+                                       $renderer->doc .= $this->svg_format_embed($svglink, 'image:'.htmlspecialchars($svg_wiki_page), $svg_dimensions);
                                        $renderer->doc .= html_wikilink($svg_wiki_page,'svg@'.$svg_wiki_page);
                return true;
                                }
                                if($data[0]==='{{SV') {
-                                       $svgenc = 'data:image/svg+xml;base64,'.base64_encode(rawWiki($svg_wiki_page)).'" type="image/svg+xml';
-                                       $renderer->doc .= '<a href="'.$svgenc.'" type="image/svg+xml" />'.$svgtag.$svgenc.'" alt="image:'.htmlspecialchars($svg_wiki_page).'" /></a><br />'; 
+                                       $svgenc = $this->svg_base64_encode(rawWiki($svg_wiki_page));
+                                       $renderer->doc .= $this->svg_format_embed($svgenc, 'image:'.htmlspecialchars($svg_wiki_page), $svg_dimensions);
                                        $renderer->doc .= html_wikilink($svg_wiki_page,'SVG@'.$svg_wiki_page);
                return true;
                                }