From 46a21be0eb66f244b82a03399151673ceb409e2c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 2 Jan 2012 00:32:32 +0000 Subject: updated to latest DokuWiki version (including mediamanager, etc) --- detail.php | 72 ++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 28 deletions(-) (limited to 'detail.php') diff --git a/detail.php b/detail.php index 500890114..13ba1b9da 100755 --- a/detail.php +++ b/detail.php @@ -2,12 +2,14 @@ /** * DokuWiki Image Detail Page * - * @author Andreas Gohr - * @author Anika Henke + * @author Andreas Gohr + * @author Anika Henke + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) */ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ ?> @@ -20,7 +22,9 @@ if (!defined('DOKU_INC')) die(); [] - + + + @@ -40,30 +44,32 @@ if (!defined('DOKU_INC')) die();
'.$lang['img_date'].':
'.dformat($t).'
'; - - $t = tpl_img_getTag('File.Name'); - if($t) print '
'.$lang['img_fname'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit')); - if($t) print '
'.$lang['img_artist'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright')); - if($t) print '
'.$lang['img_copyr'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag('File.Format'); - if($t) print '
'.$lang['img_format'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag('File.NiceSize'); - if($t) print '
'.$lang['img_fsize'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag('Simple.Camera'); - if($t) print '
'.$lang['img_camera'].':
'.hsc($t).'
'; - - $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject')); - if($t) print '
'.$lang['img_keywords'].':
'.hsc($t).'
'; - + $config_files = getConfigFiles('mediameta'); + foreach ($config_files as $config_file) { + if(@file_exists($config_file)) { + include($config_file); + } + } + + foreach($fields as $key => $tag){ + $t = array(); + if (!empty($tag[0])) { + $t = array($tag[0]); + } + if(is_array($tag[3])) { + $t = array_merge($t,$tag[3]); + } + $value = tpl_img_getTag($t); + if ($value) { + echo '
'.$lang[$tag[1]].':
'; + if ($tag[2] == 'date') { + echo dformat($value); + } else { + echo hsc($value); + } + echo '
'; + } + } ?>
@@ -71,7 +77,17 @@ if (!defined('DOKU_INC')) die();
-

←

+

+ = AUTH_UPLOAD) && function_exists('media_managerURL')) { + $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); + echo ''.$lang['img_manager'].'
'; + } + ?> + ← +

-- cgit v1.2.3