diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index 83cd9d56..beda9596 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -35,20 +35,6 @@ class IcoFileHandler extends Extension {
}
}
- public function onPageRequest(PageRequestEvent $event) {
- global $page;
- if($event->page_matches("get_ico")) {
- $id = int_escape($event->get_arg(0));
- $image = Image::by_id($id);
- $hash = $image->hash;
- $ha = substr($hash, 0, 2);
-
- $page->set_type("image/x-icon");
- $page->set_mode("data");
- $page->set_data(file_get_contents("images/$ha/$hash"));
- }
- }
-
/**
* @param string $ext
* @return bool
@@ -67,13 +53,15 @@ class IcoFileHandler extends Extension {
$image = new Image();
$fp = fopen($filename, "r");
- $header = unpack("snull/stype/scount", fread($fp, 6));
+ $header = unpack("Snull/Stype/Scount", fread($fp, 6));
- $subheader = unpack("cwidth/cheight/ccolours/cnull/splanes/sbpp/lsize/loffset", fread($fp, 16));
+ $subheader = unpack("Cwidth/Cheight/Ccolours/Cnull/Splanes/Sbpp/Lsize/loffset", fread($fp, 16));
fclose($fp);
- $image->width = $subheader['width'];
- $image->height = $subheader['height'];
+ $width = $subheader['width'];
+ $height = $subheader['height'];
+ $image->width = $width == 0 ? 256 : $width;
+ $image->height = $height == 0 ? 256 : $height;
$image->filesize = $metadata['size'];
$image->hash = $metadata['hash'];
@@ -92,7 +80,7 @@ class IcoFileHandler extends Extension {
private function check_contents($file) {
if(!file_exists($file)) return false;
$fp = fopen($file, "r");
- $header = unpack("snull/stype/scount", fread($fp, 6));
+ $header = unpack("Snull/Stype/Scount", fread($fp, 6));
fclose($fp);
return ($header['null'] == 0 && ($header['type'] == 0 || $header['type'] == 1));
}
diff --git a/ext/handle_ico/test.php b/ext/handle_ico/test.php
index b019eed0..fa130100 100644
--- a/ext/handle_ico/test.php
+++ b/ext/handle_ico/test.php
@@ -4,7 +4,6 @@ class IcoHandlerTest extends ShimmiePHPUnitTestCase {
$this->log_in_as_user();
$image_id = $this->post_image("lib/static/favicon.ico", "shimmie favicon");
$this->get_page("post/view/$image_id"); // test for no crash
- $this->get_page("get_ico/$image_id"); // test for no crash
# FIXME: test that the thumb works
# FIXME: test that it gets displayed properly
diff --git a/ext/handle_ico/theme.php b/ext/handle_ico/theme.php
index aa092709..36daa9c2 100644
--- a/ext/handle_ico/theme.php
+++ b/ext/handle_ico/theme.php
@@ -2,9 +2,10 @@
class IcoFileHandlerTheme extends Themelet {
public function display_image(Page $page, Image $image) {
- $ilink = make_link("get_ico/{$image->id}/{$image->id}.ico");
+ $ilink = $image->get_image_link();
$html = "
- 
+
";
$page->add_block(new Block("Image", $html, "main", 10));
}
diff --git a/ext/handle_pixel/script.js b/ext/handle_pixel/script.js
index b85094cc..e127e42f 100644
--- a/ext/handle_pixel/script.js
+++ b/ext/handle_pixel/script.js
@@ -1,5 +1,7 @@
$(function() {
- function zoom(zoom_type) {
+ function zoom(zoom_type, save_cookie) {
+ save_cookie = save_cookie === undefined ? true : save_cookie;
+
var img = $('.shm-main-image');
if(zoom_type == "full") {
@@ -21,14 +23,21 @@ $(function() {
$(".shm-zoomer").val(zoom_type);
- Cookies.set("ui-image-zoom", zoom_type, {expires: 365});
+ if (save_cookie) {
+ Cookies.set("ui-image-zoom", zoom_type, {expires: 365});
+ }
}
$(".shm-zoomer").change(function(e) {
zoom(this.options[this.selectedIndex].value);
});
+ $(window).resize(function(e) {
+ $(".shm-zoomer").each(function (e) {
+ zoom(this.options[this.selectedIndex].value, false)
+ });
+ });
- $(".shm-main-image").click(function(e) {
+ $("img.shm-main-image").click(function(e) {
switch(Cookies.get("ui-image-zoom")) {
case "full": zoom("width"); break;
default: zoom("full"); break;
diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index 872d59d4..6db9ad1d 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -101,6 +101,9 @@ class MiniSVGParser {
/** @var int */
public $height=0;
+ /** @var int */
+ private $xml_depth=0;
+
/** @param string $file */
function __construct($file) {
$xml_parser = xml_parser_create();
@@ -110,13 +113,15 @@ class MiniSVGParser {
}
function startElement($parser, $name, $attrs) {
- if($name == "SVG") {
+ if($name == "SVG" && $this->xml_depth == 0) {
$this->width = int_escape($attrs["WIDTH"]);
$this->height = int_escape($attrs["HEIGHT"]);
}
+ $this->xml_depth++;
}
function endElement($parser, $name) {
+ $this->xml_depth--;
}
}
diff --git a/ext/handle_svg/theme.php b/ext/handle_svg/theme.php
index 76d76aa3..8e87ee1d 100644
--- a/ext/handle_svg/theme.php
+++ b/ext/handle_svg/theme.php
@@ -5,8 +5,8 @@ class SVGFileHandlerTheme extends Themelet {
$ilink = make_link("get_svg/{$image->id}/{$image->id}.svg");
// $ilink = $image->get_image_link();
$html = "
-