--- \flickr-tag\flickr-tag\FlickrTagEngine.php Mon Sep 28 01:11:11 2009 UTC +++ \flickr-tag-youngwhan\FlickrTagEngine.php Mon Sep 28 00:39:40 2009 UTC @@ -84,6 +84,8 @@ // get size and limit defaults, then process overrides if given $size = $this->isPhotoSize($this->optionGet($mode . "_size")); $limit = $this->isDisplayLimit($this->optionGet($mode . "_limit")); + // [dan] Adding Actual Size + $actualsize = $this->isPhotoActualSize($this->optionGet($mode . "_actualsize")); $p = strpos($param, "("); @@ -123,7 +125,7 @@ if(! $r) return $this->error("Bad call to display set '" . $param . "'"); - return $this->renderPhotos($r['photoset'], $mode, $tag_attrs, $size, $limit); + return $this->renderPhotos($r['photoset'], $mode, $tag_attrs, $size, $limit, $actualsize); case "tag": $tags = null; @@ -178,7 +180,7 @@ if(! $r) return $this->error("Call to display tag query '" . $tags . "' failed."); - return $this->renderPhotos($r['photos'], $mode, $tag_attrs, $size, $limit); + return $this->renderPhotos($r['photos'], $mode, $tag_attrs, $size, $limit, $actualsize); case "photostream": $params = array( @@ -211,7 +213,7 @@ if(! $r) return $this->error("Bad call to display photostream"); - return $this->renderPhotos($r['photos'], $mode, $tag_attrs, $size, $limit); + return $this->renderPhotos($r['photos'], $mode, $tag_attrs, $size, $limit, $actualsize); case "photo": if(! $param) @@ -228,7 +230,7 @@ if(! $r) return $this->error("Call to display photo '" . $param . "' failed."); - return $this->renderPhotos($r['photo'], $mode, $tag_attrs, $size, $limit); + return $this->renderPhotos($r['photo'], $mode, $tag_attrs, $size, $limit, $actualsize); case "group": $group = null; @@ -292,11 +294,11 @@ if(! $r) return $this->error("Call to display group with ID '" . $params['group_id'] . "' failed."); - return $this->renderPhotos($r['photos'], $mode, $tag_attrs, $size, $limit); + return $this->renderPhotos($r['photos'], $mode, $tag_attrs, $size, $limit, $actualsize); } } - function renderPhotos($result, $mode, $tag_attrs, $size, $limit) { + function renderPhotos($result, $mode, $tag_attrs, $size, $limit, $actualsize) { $html = '

'; // if we get a single photo back as a result, we need to wrap it in an array (HACK) @@ -366,7 +368,8 @@ case "lightbox": case "lightbox_plugin": $title .= ' view on flickr»'; - $a_url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret'] . ".jpg"; + /* $a_url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret'] . ".jpg";*/ + $a_url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret']. $actualsize . ".jpg"; $rel = "lightbox" . ((count($i) > 1) ? "[" . $lightbox_uid . "]" : "");