From cc3767c1b8a28c912b2edc21e6c2975f9a227485 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Fri, 11 Apr 2008 06:56:31 +0000
Subject: [PATCH] get SVG size

git-svn-id: file:///home/shish/svn/shimmie2/trunk@814 7f39781d-f577-437e-ae19-be835c7a54ca
---
 contrib/handle_svg/main.php  | 39 +++++++++++++++++++++++++++---------
 contrib/handle_svg/theme.php |  9 ++++-----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/contrib/handle_svg/main.php b/contrib/handle_svg/main.php
index 80d22a34..3dc1de01 100644
--- a/contrib/handle_svg/main.php
+++ b/contrib/handle_svg/main.php
@@ -14,10 +14,7 @@ class SVGFileHandler extends Extension {
 		if(is_a($event, 'DataUploadEvent') && $this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
 			$hash = $event->hash;
 			$ha = substr($hash, 0, 2);
-			if(!copy($event->tmpname, "images/$ha/$hash")) {
-				$event->veto("SVG Handler failed to move file from uploads to archive");
-				return;
-			}
+			if(!move_upload_to_archive($event)) return;
 			send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
 			$image = $this->create_image_from_data("images/$ha/$hash", $event->metadata);
 			if(is_null($image)) {
@@ -74,9 +71,9 @@ class SVGFileHandler extends Extension {
 
 		$image = new Image();
 
-		// FIXME: ugh, xml parsing :|
-		$image->width = 0;
-		$image->height = 0;
+		$msp = new MiniSVGParser($filename);
+		$image->width = $msp->width;
+		$image->height = $msp->height;
 		
 		$image->filesize  = $metadata['size'];
 		$image->hash      = $metadata['hash'];
@@ -89,9 +86,33 @@ class SVGFileHandler extends Extension {
 	}
 
 	private function check_contents($file) {
-		// FIXME: magic header?
-		return (file_exists($file));
+		if(!file_exists($file)) return false;
+		
+		$msp = new MiniSVGParser($file);
+		return $msp->valid;
 	}
 }
+
+class MiniSVGParser {
+	var $valid=false, $width=0, $height=0;
+
+	function MiniSVGParser($file) {
+		$xml_parser = xml_parser_create();
+		xml_set_element_handler($xml_parser, array($this, "startElement"), array($this, "endElement"));
+		$this->valid = xml_parse($xml_parser, file_get_contents($file), true);
+		xml_parser_free($xml_parser);
+	}
+
+	function startElement($parser, $name, $attrs) {
+		if($name == "SVG") {
+			$this->width = int_escape($attrs["WIDTH"]);
+			$this->height = int_escape($attrs["HEIGHT"]);
+		}
+	}
+
+	function endElement($parser, $name) {
+	}
+}
+
 add_event_listener(new SVGFileHandler());
 ?>
diff --git a/contrib/handle_svg/theme.php b/contrib/handle_svg/theme.php
index 89e0d212..86186537 100644
--- a/contrib/handle_svg/theme.php
+++ b/contrib/handle_svg/theme.php
@@ -2,12 +2,11 @@
 
 class SVGFileHandlerTheme extends Themelet {
 	public function display_image($page, $image) {
-		$link = make_link("get_svg/{$image->id}/{$image->id}.svg");
-		$ilink = $image->get_image_link();
-		// FIXME: object and embed have "height" and "width"
+		$ilink = make_link("get_svg/{$image->id}/{$image->id}.svg");
+//		$ilink = $image->get_image_link();
 		$html = "
-			<object data='$ilink' type='image/svg+xml' width='300' height='300'>
-			    <embed src='$ilink' type='image/svg+xml' width='300' height='300' />
+			<object data='$ilink' type='image/svg+xml' width='{$image->width}' height='{$image->height}'>
+			    <embed src='$ilink' type='image/svg+xml' width='{$image->width}' height='{$image->height}' />
 			</object>
 		";
 		$page->add_block(new Block("Image", $html, "main", 0));