badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make parse_link_template public, and specific to the image it's called on

Browse source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@70 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-05-07 00:18:52 +00:00
parent 38410565f0
commit 0f0b7f77b5
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/image.class.php
View file

@ -90,22 +90,22 @@ class Image {
public function get_image_link() {
global $config;
return $this->parse_link_template($config->get_string('image_ilink'), $this);
return $this->parse_link_template($config->get_string('image_ilink'));
}
public function get_short_link() {
global $config;
return $this->parse_link_template($config->get_string('image_slink'), $this);
return $this->parse_link_template($config->get_string('image_slink'));
}
public function get_thumb_link() {
global $config;
return $this->parse_link_template($config->get_string('image_tlink'), $this);
return $this->parse_link_template($config->get_string('image_tlink'));
}
public function get_tooltip() {
global $config;
return $this->parse_link_template($config->get_string('image_tip'), $this);
return $this->parse_link_template($config->get_string('image_tip'));
}
public function get_image_filename() {
@ -135,7 +135,7 @@ class Image {
return $this->ext;
}
private function parse_link_template($tmpl, $img) {
public function parse_link_template($tmpl) {
global $config;
// don't bother hitting the database if it won't be used...
@ -143,20 +143,20 @@ class Image {
if(strpos($tmpl, '$tags') !== false) { // * stabs dynamically typed languages with a rusty spoon *
$safe_tags = preg_replace(
"/[^a-zA-Z0-9_\- ]/",
"", $img->get_tag_list());
"", $this->get_tag_list());
}
$base_href = $config->get_string('base_href');
$fname = $img->get_filename();
$fname = $this->get_filename();
$base_fname = strpos($fname, '.') ? substr($fname, 0, strrpos($fname, '.')) : $fname;
$tmpl = str_replace('$id', $img->id, $tmpl);
$tmpl = str_replace('$hash', $img->hash, $tmpl);
$tmpl = str_replace('$tags', $safe_tags, $tmpl);
$tmpl = str_replace('$base', $base_href, $tmpl);
$tmpl = str_replace('$ext', $img->ext, $tmpl);
$tmpl = str_replace('$size', "{$img->width}x{$img->height}", $tmpl);
$tmpl = str_replace('$filesize', to_shorthand_int($img->filesize), $tmpl);
$tmpl = str_replace('$id', $this->id, $tmpl);
$tmpl = str_replace('$hash', $this->hash, $tmpl);
$tmpl = str_replace('$tags', $safe_tags, $tmpl);
$tmpl = str_replace('$base', $base_href, $tmpl);
$tmpl = str_replace('$ext', $this->ext, $tmpl);
$tmpl = str_replace('$size', "{$this->width}x{$this->height}", $tmpl);
$tmpl = str_replace('$filesize', to_shorthand_int($this->filesize), $tmpl);
$tmpl = str_replace('$filename', $base_fname, $tmpl);
return $tmpl;