From d8b7dde9aee27461a97a441808a23129be2d497b Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Fri, 21 Apr 2006 12:44:55 +0000 Subject: [PATCH] Guess what: More media manager improvements. Is anybody even reading this? I could write poems and stuff here. Or why not even use this functionality as my daily blog. There are dozens of means to not get heard. You're reading this? Well. Have a nice weekend. :-) --- docs/NEWS | 9 ++- include/functions.inc.php | 2 +- include/functions_entries.inc.php | 2 +- include/functions_images.inc.php | 78 +++++++++++++++---- include/functions_trackbacks.inc.php | 5 +- include/tpl/config_local.inc.php | 7 ++ lang/UTF-8/serendipity_lang_bg.inc.php | 3 + lang/UTF-8/serendipity_lang_cn.inc.php | 5 +- lang/UTF-8/serendipity_lang_cs.inc.php | 5 +- lang/UTF-8/serendipity_lang_cz.inc.php | 5 +- lang/UTF-8/serendipity_lang_da.inc.php | 5 +- lang/UTF-8/serendipity_lang_de.inc.php | 5 +- lang/UTF-8/serendipity_lang_en.inc.php | 5 +- lang/UTF-8/serendipity_lang_es.inc.php | 5 +- lang/UTF-8/serendipity_lang_fa.inc.php | 5 +- lang/UTF-8/serendipity_lang_fi.inc.php | 5 +- lang/UTF-8/serendipity_lang_fr.inc.php | 5 +- lang/UTF-8/serendipity_lang_hu.inc.php | 3 + lang/UTF-8/serendipity_lang_is.inc.php | 5 +- lang/UTF-8/serendipity_lang_it.inc.php | 3 + lang/UTF-8/serendipity_lang_ja.inc.php | 5 +- lang/UTF-8/serendipity_lang_ko.inc.php | 5 +- lang/UTF-8/serendipity_lang_nl.inc.php | 5 +- lang/UTF-8/serendipity_lang_no.inc.php | 5 +- lang/UTF-8/serendipity_lang_pt.inc.php | 5 +- lang/UTF-8/serendipity_lang_pt_PT.inc.php | 3 + lang/UTF-8/serendipity_lang_ro.inc.php | 3 + lang/UTF-8/serendipity_lang_ru.inc.php | 5 +- lang/UTF-8/serendipity_lang_se.inc.php | 3 + lang/UTF-8/serendipity_lang_ta.inc.php | 3 + lang/UTF-8/serendipity_lang_tn.inc.php | 5 +- lang/UTF-8/serendipity_lang_tr.inc.php | 3 + lang/UTF-8/serendipity_lang_tw.inc.php | 5 +- lang/UTF-8/serendipity_lang_zh.inc.php | 5 +- lang/addlang.txt | 6 +- lang/plugin_lang.php | 3 + lang/serendipity_lang_bg.inc.php | 3 + lang/serendipity_lang_cn.inc.php | 3 + lang/serendipity_lang_cs.inc.php | 3 + lang/serendipity_lang_cz.inc.php | 3 + lang/serendipity_lang_da.inc.php | 3 + lang/serendipity_lang_de.inc.php | 3 + lang/serendipity_lang_en.inc.php | 3 + lang/serendipity_lang_es.inc.php | 3 + lang/serendipity_lang_fa.inc.php | 3 + lang/serendipity_lang_fi.inc.php | 3 + lang/serendipity_lang_fr.inc.php | 3 + lang/serendipity_lang_hu.inc.php | 3 + lang/serendipity_lang_is.inc.php | 3 + lang/serendipity_lang_it.inc.php | 3 + lang/serendipity_lang_ja.inc.php | 3 + lang/serendipity_lang_ko.inc.php | 3 + lang/serendipity_lang_nl.inc.php | 3 + lang/serendipity_lang_no.inc.php | 3 + lang/serendipity_lang_pt.inc.php | 3 + lang/serendipity_lang_pt_PT.inc.php | 3 + lang/serendipity_lang_ro.inc.php | 3 + lang/serendipity_lang_ru.inc.php | 3 + lang/serendipity_lang_se.inc.php | 3 + lang/serendipity_lang_ta.inc.php | 3 + lang/serendipity_lang_tn.inc.php | 3 + lang/serendipity_lang_tr.inc.php | 3 + lang/serendipity_lang_tw.inc.php | 3 + lang/serendipity_lang_zh.inc.php | 3 + .../serendipity_event_trackexits.php | 4 +- .../serendipity_plugin_entrylinks.php | 2 +- serendipity_admin_image_selector.php | 76 ++++++++++++++++++ templates/default/admin/media_items.tpl | 9 +++ templates/default/admin/media_showitem.tpl | 9 +++ 69 files changed, 372 insertions(+), 48 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index c145e95..55a5f5c 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -42,12 +42,13 @@ Version 1.1-alpha4() through serendipity_admin_image_selector.php?serendipity[image]=X - Integrate imageselectorplus plugin options for giving a target to links - - TODO: - New option for image_Selector to save a specific sized version - (?fid=XXX&targetSize=XX) - - Track referrers by image selector and store as property + (?serendipity[image]=X&serendipity[step]=showItem + &serendipity[resizeWidth]=X&serendipity[resizeHeight]=Y + - Track referrers by image selector and show them on detail + page + TODO: - Move/rename images/directories (browse serendipity_entries to fix up image paths [using ]. Also move ALL images of a directory, like when moving s9y installations. Put diff --git a/include/functions.inc.php b/include/functions.inc.php index 2fb28ff..2ceb05c 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -521,7 +521,7 @@ function serendipity_sendMail($to, $subject, $message, $fromMail, $headers = NUL function serendipity_fetchReferences($id) { global $serendipity; - $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id = '" . (int)$id . "'"; + $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id = '" . (int)$id . "' AND type = ''"; return serendipity_db_query($query); } diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php index c97f68f..95433e8 100644 --- a/include/functions_entries.inc.php +++ b/include/functions_entries.inc.php @@ -1226,7 +1226,7 @@ function serendipity_deleteEntry($id) { serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entrycat WHERE entryid=$id"); serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entryproperties WHERE entryid=$id"); serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}comments WHERE entry_id=$id"); - serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id'"); + serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id' AND type = ''"); serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}permalinks WHERE entry_id='$id'"); } diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php index 57a2e02..83b42e2 100644 --- a/include/functions_images.inc.php +++ b/include/functions_images.inc.php @@ -577,9 +577,11 @@ function serendipity_insertImageInDatabase($filename, $directory, $authorid = 0, * @param string The directory to the image file * @param string The target size of the thumbnail (2-dimensional array width,height) * @param string Name of the thumbnail + * @param bool Store thumbnail in temporary place? + * @param bool Force enlarging of small images? * @return array The result size of the thumbnail */ -function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumbname = false) { +function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumbname = false, $is_temporary = false, $force_resize = false) { global $serendipity; if ($size === false) { @@ -596,27 +598,43 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb $infile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $file; - $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $f . '.' . $thumbname . '.' . $suf; + if ($is_temporary) { + $temppath = dirname($thumbname); + if (!is_dir($temppath)) { + @mkdir($temppath); + } + $outfile = $thumbname; + } else { + $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $f . '.' . $thumbname . '.' . $suf; + } $fdim = @serendipity_getimagesize($infile, '', $suf); if (isset($fdim['noimage'])) { $r = array(0, 0); } else { if ($serendipity['magick'] !== true) { - $r = serendipity_resize_image_gd($infile, $outfile, $size); + if (is_array($size)) { + $r = serendipity_resize_image_gd($infile, $outfile, $size['width'], $size['height']); + } else { + $r = serendipity_resize_image_gd($infile, $outfile, $size); + } } else { - $r = array($size, $size); - $newSize = $size . 'x' . $size; + if (is_array($size)) { + $r = $size; + } else { + $r = array('width' => $size, 'height' => $size); + } + $newSize = $r['width'] . 'x' . $r['height']; if ($fdim['mime'] == 'application/pdf') { $cmd = escapeshellcmd($serendipity['convert']) . ' -antialias -flatten -scale '. serendipity_escapeshellarg($newSize) .' '. serendipity_escapeshellarg($infile) .' '. serendipity_escapeshellarg($outfile . '.png'); } else { - if ( serendipity_ini_bool(ini_get('safe_mode')) === false ) { + if (!$force_resize && serendipity_ini_bool(ini_get('safe_mode')) === false) { $newSize .= '>'; // Tell imagemagick to not enlarge small images, only works if safe_mode is off (safe_mode turns > in to \>) } $cmd = escapeshellcmd($serendipity['convert']) . ' -antialias -resize '. serendipity_escapeshellarg($newSize) .' '. serendipity_escapeshellarg($infile) .' '. serendipity_escapeshellarg($outfile); } exec($cmd, $output, $result); - if ( $result != 0 ) { + if ($result != 0) { echo '
'. sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'
'; $r = false; // return failure } else { @@ -1198,6 +1216,12 @@ function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newh $newheight = $newsizes[1]; } + if (is_null($newwidth)) { + $newsizes = serendipity_calculate_aspect_size($width, $height, null, $newheight); + $newwidth = $newsizes[0]; + $newheight = $newsizes[1]; + } + $out = imagecreatetruecolor($newwidth, $newheight); /* Attempt to copy transparency information, this really only works for PNG */ @@ -1225,27 +1249,45 @@ function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newh * @param int Target width * @return int Target height */ -function serendipity_calculate_aspect_size($width, $height, $newwidth) { +function serendipity_calculate_aspect_size($width, $height, $orig_newwidth, $orig_newheight = null) { // calculate aspect ratio - $div_width = $width / $newwidth; - $div_height = $height / $newwidth; + if (!is_null($orig_newheight)) { + $div_width = $width / $orig_newheight; + $div_height = $height / $orig_newheight; + } else { + $div_width = $width / $orig_newwidth; + $div_height = $height / $orig_newwidth; + } if ($div_width <= 1 && $div_height <= 1) { // do not scale small images where both sides are smaller than the thumbnail dimensions $newheight = $height; $newwidth = $width; - } elseif ($div_width >= $div_height) { + } elseif (is_null($orig_newheight) && $div_width >= $div_height) { // max width - calculate height, keep width as scaling base $newheight = round($height / $div_width); // make sure the height is at least 1 pixel for extreme images $newheight = ($newheight >= 1 ? $newheight : 1); - } else { + $newwidth = $orig_newwidth; + } elseif (is_null($orig_newwidth) && $div_width >= $div_height) { + // max width - calculate height, keep width as scaling base + $newwidth = round($width / $div_height); + // make sure the height is at least 1 pixel for extreme images + $newwidth = ($newwidth >= 1 ? $newwidth : 1); + $newheight = $orig_newheight; + } elseif (is_null($orig_newheight)) { // max height - calculate width, keep height as scaling base - $newheight = $newwidth; + $newheight = $orig_newwidth; $newwidth = round($width / $div_height); // make sure the width is at least 1 pixel for extreme images $newwidth = ($newwidth >= 1 ? $newwidth : 1); + } else { + // max height - calculate width, keep height as scaling base + $newwidth = $orig_newheight; + $newheight = round($height / $div_width); + // make sure the width is at least 1 pixel for extreme images + $newheight = ($newheight >= 1 ? $newheight : 1); } return array($newwidth, $newheight); @@ -2100,6 +2142,16 @@ function serendipity_parseMediaProperties(&$dprops, &$keywords, &$media, &$props $keywords = explode(';', $serendipity['mediaKeywords']); } + $media['references'] = serendipity_db_query("SELECT link, name + FROM {$serendipity['dbPrefix']}references + WHERE entry_id = " . $media['id'] . " + AND type = 'media' + ORDER BY name DESC + LIMIT 15", false, 'assoc'); + if (!is_array($media['references'])) { + $media['references'] = false; + } + foreach($dprops AS $prop) { $type = 'input'; $parts = explode(':', trim($prop)); diff --git a/include/functions_trackbacks.inc.php b/include/functions_trackbacks.inc.php index 83f3bb9..975b5b9 100644 --- a/include/functions_trackbacks.inc.php +++ b/include/functions_trackbacks.inc.php @@ -455,7 +455,8 @@ function serendipity_handle_references($id, $author, $title, $text) { $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references WHERE entry_id = '". (int)$tmpid ."' - AND link = '" . serendipity_db_escape_string($locations[$i]) . "'"; + AND link = '" . serendipity_db_escape_string($locations[$i]) . "' + AND type = ''"; $row = serendipity_db_query($query, true, 'num'); if ($row[0] > 0) { @@ -467,7 +468,7 @@ function serendipity_handle_references($id, $author, $title, $text) { $checked_locations[$locations[$i]] = true; // Store trackbacked link so that no further trackbacks will be sent to the same link } } - serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . (int)$tmpid . "'"); + serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . (int)$tmpid . "' AND type = ''"); for ($i = 0; $i < $j; ++$i) { $query = "INSERT INTO {$serendipity['dbPrefix']}references (entry_id, name, link) VALUES("; diff --git a/include/tpl/config_local.inc.php b/include/tpl/config_local.inc.php index df46aad..87159f7 100644 --- a/include/tpl/config_local.inc.php +++ b/include/tpl/config_local.inc.php @@ -535,6 +535,13 @@ 'permission' => 'siteConfiguration', 'default' => true), + array('var' => 'dynamicResize', + 'title' => MEDIA_DYN_RESIZE, + 'description' => MEDIA_DYN_RESIZE_DESC, + 'type' => 'bool', + 'permission' => 'siteConfiguration', + 'default' => false), + array('var' => 'mediaExif', 'title' => MEDIA_EXIF, 'description' => MEDIA_EXIF_DESC, diff --git a/lang/UTF-8/serendipity_lang_bg.inc.php b/lang/UTF-8/serendipity_lang_bg.inc.php index 4b329a9..bf45c46 100644 --- a/lang/UTF-8/serendipity_lang_bg.inc.php +++ b/lang/UTF-8/serendipity_lang_bg.inc.php @@ -850,3 +850,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_cn.inc.php b/lang/UTF-8/serendipity_lang_cn.inc.php index d72e553..d92473f 100644 --- a/lang/UTF-8/serendipity_lang_cn.inc.php +++ b/lang/UTF-8/serendipity_lang_cn.inc.php @@ -1,4 +1,4 @@ - @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_cz.inc.php b/lang/UTF-8/serendipity_lang_cz.inc.php index ff38470..552217a 100644 --- a/lang/UTF-8/serendipity_lang_cz.inc.php +++ b/lang/UTF-8/serendipity_lang_cz.inc.php @@ -1,4 +1,4 @@ - @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_da.inc.php b/lang/UTF-8/serendipity_lang_da.inc.php index 6626c65..9d5b74e 100644 --- a/lang/UTF-8/serendipity_lang_da.inc.php +++ b/lang/UTF-8/serendipity_lang_da.inc.php @@ -1,4 +1,4 @@ - @@ -864,3 +864,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php index 88d1375..f0baba4 100644 --- a/lang/UTF-8/serendipity_lang_de.inc.php +++ b/lang/UTF-8/serendipity_lang_de.inc.php @@ -1,4 +1,4 @@ -, @@ -880,3 +880,6 @@ Melvin TODO [20060128]: What spanish word do we use for "referrers" ?? @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_fa.inc.php b/lang/UTF-8/serendipity_lang_fa.inc.php index 93039e0..80c3c8e 100644 --- a/lang/UTF-8/serendipity_lang_fa.inc.php +++ b/lang/UTF-8/serendipity_lang_fa.inc.php @@ -1,4 +1,4 @@ - @@ -864,3 +864,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_fi.inc.php b/lang/UTF-8/serendipity_lang_fi.inc.php index 1e3c1f4..4f0db46 100644 --- a/lang/UTF-8/serendipity_lang_fi.inc.php +++ b/lang/UTF-8/serendipity_lang_fi.inc.php @@ -1,4 +1,4 @@ - @@ -862,3 +862,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_fr.inc.php b/lang/UTF-8/serendipity_lang_fr.inc.php index 6bc7e2a..bcf9b77 100644 --- a/lang/UTF-8/serendipity_lang_fr.inc.php +++ b/lang/UTF-8/serendipity_lang_fr.inc.php @@ -1,4 +1,4 @@ - @@ -869,3 +869,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_hu.inc.php b/lang/UTF-8/serendipity_lang_hu.inc.php index 568506f..cb2ab92 100644 --- a/lang/UTF-8/serendipity_lang_hu.inc.php +++ b/lang/UTF-8/serendipity_lang_hu.inc.php @@ -863,3 +863,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_is.inc.php b/lang/UTF-8/serendipity_lang_is.inc.php index ae391aa..4e09b65 100644 --- a/lang/UTF-8/serendipity_lang_is.inc.php +++ b/lang/UTF-8/serendipity_lang_is.inc.php @@ -1,4 +1,4 @@ - @@ -863,3 +863,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_it.inc.php b/lang/UTF-8/serendipity_lang_it.inc.php index b9ec78d..0969edc 100644 --- a/lang/UTF-8/serendipity_lang_it.inc.php +++ b/lang/UTF-8/serendipity_lang_it.inc.php @@ -866,3 +866,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_ja.inc.php b/lang/UTF-8/serendipity_lang_ja.inc.php index fce1ca5..3937c1a 100644 --- a/lang/UTF-8/serendipity_lang_ja.inc.php +++ b/lang/UTF-8/serendipity_lang_ja.inc.php @@ -1,4 +1,4 @@ -, 2004-2005. @@ -866,3 +866,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_ko.inc.php b/lang/UTF-8/serendipity_lang_ko.inc.php index 2c9769a..b9df8ee 100644 --- a/lang/UTF-8/serendipity_lang_ko.inc.php +++ b/lang/UTF-8/serendipity_lang_ko.inc.php @@ -1,4 +1,4 @@ - @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_nl.inc.php b/lang/UTF-8/serendipity_lang_nl.inc.php index 4dd82d2..54a0686 100644 --- a/lang/UTF-8/serendipity_lang_nl.inc.php +++ b/lang/UTF-8/serendipity_lang_nl.inc.php @@ -1,4 +1,4 @@ - @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_no.inc.php b/lang/UTF-8/serendipity_lang_no.inc.php index b6727a5..c409782 100644 --- a/lang/UTF-8/serendipity_lang_no.inc.php +++ b/lang/UTF-8/serendipity_lang_no.inc.php @@ -1,4 +1,4 @@ - @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_pt.inc.php b/lang/UTF-8/serendipity_lang_pt.inc.php index 7476d00..49e845f 100644 --- a/lang/UTF-8/serendipity_lang_pt.inc.php +++ b/lang/UTF-8/serendipity_lang_pt.inc.php @@ -1,4 +1,4 @@ - @@ -867,3 +867,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_pt_PT.inc.php b/lang/UTF-8/serendipity_lang_pt_PT.inc.php index c850e97..b8ece4e 100644 --- a/lang/UTF-8/serendipity_lang_pt_PT.inc.php +++ b/lang/UTF-8/serendipity_lang_pt_PT.inc.php @@ -870,3 +870,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_ro.inc.php b/lang/UTF-8/serendipity_lang_ro.inc.php index ef03ca5..0a35b06 100644 --- a/lang/UTF-8/serendipity_lang_ro.inc.php +++ b/lang/UTF-8/serendipity_lang_ro.inc.php @@ -863,3 +863,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_ru.inc.php b/lang/UTF-8/serendipity_lang_ru.inc.php index 463ba30..4f91949 100644 --- a/lang/UTF-8/serendipity_lang_ru.inc.php +++ b/lang/UTF-8/serendipity_lang_ru.inc.php @@ -1,4 +1,4 @@ - @@ -866,3 +866,6 @@ $i18n_filename_to = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_se.inc.php b/lang/UTF-8/serendipity_lang_se.inc.php index cf4d040..b3c85dd 100644 --- a/lang/UTF-8/serendipity_lang_se.inc.php +++ b/lang/UTF-8/serendipity_lang_se.inc.php @@ -862,3 +862,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_ta.inc.php b/lang/UTF-8/serendipity_lang_ta.inc.php index 21fb260..d5f5ee0 100644 --- a/lang/UTF-8/serendipity_lang_ta.inc.php +++ b/lang/UTF-8/serendipity_lang_ta.inc.php @@ -862,3 +862,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_tn.inc.php b/lang/UTF-8/serendipity_lang_tn.inc.php index 17b4011..6398b51 100644 --- a/lang/UTF-8/serendipity_lang_tn.inc.php +++ b/lang/UTF-8/serendipity_lang_tn.inc.php @@ -1,4 +1,4 @@ - @@ -865,3 +865,6 @@ $i18n_unknown = 'tw'; @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_tr.inc.php b/lang/UTF-8/serendipity_lang_tr.inc.php index 34d6298..f847b23 100644 --- a/lang/UTF-8/serendipity_lang_tr.inc.php +++ b/lang/UTF-8/serendipity_lang_tr.inc.php @@ -866,3 +866,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_tw.inc.php b/lang/UTF-8/serendipity_lang_tw.inc.php index b84ea92..11c4794 100644 --- a/lang/UTF-8/serendipity_lang_tw.inc.php +++ b/lang/UTF-8/serendipity_lang_tw.inc.php @@ -1,4 +1,4 @@ - @@ -865,3 +865,6 @@ $i18n_unknown = 'tw'; @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/UTF-8/serendipity_lang_zh.inc.php b/lang/UTF-8/serendipity_lang_zh.inc.php index e21809b..a21b640 100644 --- a/lang/UTF-8/serendipity_lang_zh.inc.php +++ b/lang/UTF-8/serendipity_lang_zh.inc.php @@ -1,4 +1,4 @@ - $constants) { @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php index 497867e..ebb90d7 100644 --- a/lang/serendipity_lang_bg.inc.php +++ b/lang/serendipity_lang_bg.inc.php @@ -850,3 +850,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php index 8814708..c7b1c44 100644 --- a/lang/serendipity_lang_cn.inc.php +++ b/lang/serendipity_lang_cn.inc.php @@ -863,3 +863,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php index a7fc7e3..04a4006 100644 --- a/lang/serendipity_lang_cs.inc.php +++ b/lang/serendipity_lang_cs.inc.php @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php index fb09c23..465868a 100644 --- a/lang/serendipity_lang_cz.inc.php +++ b/lang/serendipity_lang_cz.inc.php @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php index 1769849..f31c818 100644 --- a/lang/serendipity_lang_da.inc.php +++ b/lang/serendipity_lang_da.inc.php @@ -864,3 +864,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php index 9949345..2bc1c8f 100644 --- a/lang/serendipity_lang_de.inc.php +++ b/lang/serendipity_lang_de.inc.php @@ -863,3 +863,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php index 35ba0bb..64c7dcd 100644 --- a/lang/serendipity_lang_en.inc.php +++ b/lang/serendipity_lang_en.inc.php @@ -862,3 +862,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php index cb49967..d314bd7 100644 --- a/lang/serendipity_lang_es.inc.php +++ b/lang/serendipity_lang_es.inc.php @@ -880,3 +880,6 @@ Melvin TODO [20060128]: What spanish word do we use for "referrers" ?? @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php index b2e68be..f2a665d 100644 --- a/lang/serendipity_lang_fa.inc.php +++ b/lang/serendipity_lang_fa.inc.php @@ -864,3 +864,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php index 1e57a0e..6c6f5b8 100644 --- a/lang/serendipity_lang_fi.inc.php +++ b/lang/serendipity_lang_fi.inc.php @@ -862,3 +862,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php index c86f291..bf9dc70 100644 --- a/lang/serendipity_lang_fr.inc.php +++ b/lang/serendipity_lang_fr.inc.php @@ -869,3 +869,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_hu.inc.php b/lang/serendipity_lang_hu.inc.php index 6b3ddf0..99ffe59 100644 --- a/lang/serendipity_lang_hu.inc.php +++ b/lang/serendipity_lang_hu.inc.php @@ -863,3 +863,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php index e02a3a2..96b9773 100644 --- a/lang/serendipity_lang_is.inc.php +++ b/lang/serendipity_lang_is.inc.php @@ -863,3 +863,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php index aa8e1ba..338a0f1 100644 --- a/lang/serendipity_lang_it.inc.php +++ b/lang/serendipity_lang_it.inc.php @@ -866,3 +866,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php index 7d889a5..595fc7e 100644 --- a/lang/serendipity_lang_ja.inc.php +++ b/lang/serendipity_lang_ja.inc.php @@ -866,3 +866,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php index 300ad4a..e541fb1 100644 --- a/lang/serendipity_lang_ko.inc.php +++ b/lang/serendipity_lang_ko.inc.php @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php index 8e58982..106dc66 100644 --- a/lang/serendipity_lang_nl.inc.php +++ b/lang/serendipity_lang_nl.inc.php @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php index 79fd0c5..35883f5 100644 --- a/lang/serendipity_lang_no.inc.php +++ b/lang/serendipity_lang_no.inc.php @@ -865,3 +865,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php index ab4961b..0c03a54 100644 --- a/lang/serendipity_lang_pt.inc.php +++ b/lang/serendipity_lang_pt.inc.php @@ -867,3 +867,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php index b655840..ebd7f20 100644 --- a/lang/serendipity_lang_pt_PT.inc.php +++ b/lang/serendipity_lang_pt_PT.inc.php @@ -870,3 +870,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php index ef03ca5..0a35b06 100644 --- a/lang/serendipity_lang_ro.inc.php +++ b/lang/serendipity_lang_ro.inc.php @@ -863,3 +863,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php index 0ded5b8..da5f43a 100644 --- a/lang/serendipity_lang_ru.inc.php +++ b/lang/serendipity_lang_ru.inc.php @@ -866,3 +866,6 @@ $i18n_filename_to = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php index ca67be7..8b1b529 100644 --- a/lang/serendipity_lang_se.inc.php +++ b/lang/serendipity_lang_se.inc.php @@ -862,3 +862,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_ta.inc.php b/lang/serendipity_lang_ta.inc.php index 21fb260..d5f5ee0 100644 --- a/lang/serendipity_lang_ta.inc.php +++ b/lang/serendipity_lang_ta.inc.php @@ -862,3 +862,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php index 224cb66..f8de0b0 100644 --- a/lang/serendipity_lang_tn.inc.php +++ b/lang/serendipity_lang_tn.inc.php @@ -865,3 +865,6 @@ $i18n_unknown = 'tw'; @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_tr.inc.php b/lang/serendipity_lang_tr.inc.php index 34d6298..f847b23 100644 --- a/lang/serendipity_lang_tr.inc.php +++ b/lang/serendipity_lang_tr.inc.php @@ -866,3 +866,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php index 7ed95cb..7c426ed 100644 --- a/lang/serendipity_lang_tw.inc.php +++ b/lang/serendipity_lang_tw.inc.php @@ -865,3 +865,6 @@ $i18n_unknown = 'tw'; @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php index 46248de..ddefb4a 100644 --- a/lang/serendipity_lang_zh.inc.php +++ b/lang/serendipity_lang_zh.inc.php @@ -863,3 +863,6 @@ @define('MEDIA_ENTRY', 'Isolated Entry'); @define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)'); +@define('MEDIA_DYN_RESIZE', 'Allow dynamic image resizing?'); +@define('MEDIA_DYN_RESIZE_DESC', 'If enabled, the media selector can return images in any requested size via a GET variable. The results are cached, and thus can create a large filebase if you make intensive use of it.'); + diff --git a/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php b/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php index 545de7e..f9bc64d 100644 --- a/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php +++ b/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php @@ -113,7 +113,7 @@ class serendipity_event_trackexits extends serendipity_event if (empty($serendipity['encodeExitsCallback_entry_id'])) { $this->links = array(); } else { - $this->links = serendipity_db_query("SELECT id, link FROM {$serendipity['dbPrefix']}references WHERE entry_id = {$serendipity['encodeExitsCallback_entry_id']}", false, 'both', false, 'link', 'id'); + $this->links = serendipity_db_query("SELECT id, link FROM {$serendipity['dbPrefix']}references WHERE entry_id = {$serendipity['encodeExitsCallback_entry_id']} AND type = ''", false, 'both', false, 'link', 'id'); } foreach ($this->markup_elements as $temp) { @@ -191,7 +191,7 @@ class serendipity_event_trackexits extends serendipity_event $is_out = (stristr($buffer[0], 'onmouseout=') !== false ? true : false); $link = ''; - + if (is_array($this->links) && !empty($this->links[$url])) { return sprintf( $link, diff --git a/plugins/serendipity_plugin_entrylinks/serendipity_plugin_entrylinks.php b/plugins/serendipity_plugin_entrylinks/serendipity_plugin_entrylinks.php index f619c82..02225cf 100644 --- a/plugins/serendipity_plugin_entrylinks/serendipity_plugin_entrylinks.php +++ b/plugins/serendipity_plugin_entrylinks/serendipity_plugin_entrylinks.php @@ -141,7 +141,7 @@ class serendipity_plugin_entrylinks extends serendipity_plugin } } - $references = serendipity_db_query("SELECT link, max(name) as name FROM {$serendipity['dbPrefix']}references WHERE entry_id = " . $id . " GROUP BY link"); + $references = serendipity_db_query("SELECT link, max(name) as name FROM {$serendipity['dbPrefix']}references WHERE entry_id = " . $id . " AND type = '' GROUP BY link"); if (is_array($references)) { $links = '