diff options
author | Andreas Gohr <andi@splitbrain.org> | 2005-07-24 13:55:40 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2005-07-24 13:55:40 +0200 |
commit | 55efc227eaeb2d480ff22837b78f89766b07fe5f (patch) | |
tree | 76e2fa9c84c59e5cb99fb4ebf552cae69d1e46b4 /lib | |
parent | 8e8296e740fc329042d3b5ec74a6f9dd08f3254c (diff) | |
download | rpg-55efc227eaeb2d480ff22837b78f89766b07fe5f.tar.gz rpg-55efc227eaeb2d480ff22837b78f89766b07fe5f.tar.bz2 |
first step in Image metadata support
This adds a detail page for images, for JPEG files
additional metadata from EXIF and IPTC fields is shown
darcs-hash:20050724115540-7ad00-926601cd12a990e041943edc616360d8179d6c9f.gz
Diffstat (limited to 'lib')
-rw-r--r-- | lib/exe/detail.php | 47 | ||||
-rw-r--r-- | lib/exe/media.php | 2 | ||||
-rw-r--r-- | lib/tpl/default/design.css | 14 | ||||
-rw-r--r-- | lib/tpl/default/layout.css | 1 |
4 files changed, 62 insertions, 2 deletions
diff --git a/lib/exe/detail.php b/lib/exe/detail.php new file mode 100644 index 000000000..1c676323f --- /dev/null +++ b/lib/exe/detail.php @@ -0,0 +1,47 @@ +<?php + if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); + require_once(DOKU_INC.'inc/init.php'); + require_once(DOKU_INC.'inc/common.php'); + require_once(DOKU_INC.'inc/lang/en/lang.php'); + require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php'); + require_once(DOKU_INC.'inc/JpegMeta.php'); + require_once(DOKU_INC.'inc/html.php'); + require_once(DOKU_INC.'inc/template.php'); + require_once(DOKU_INC.'inc/auth.php'); + //close session + session_write_close(); + + $IMG = cleanID($_REQUEST['media']); + $ID = getID(); + + $ERROR = false; + // check image permissions + $AUTH = auth_quickaclcheck($IMG); + if($AUTH >= AUTH_READ){ + // check if image exists + $SRC = mediaFN($IMG); + if(!file_exists($SRC)){ + //doesn't exist! + + } + }else{ + // no auth + $ERROR = p_locale_xhtml('denied'); + } + + /*if(!$ERROR){ + // load EXIF/IPTC/image details + $INFO = array(); + $INFO['std'][''] + imagesize + }*/ + + + //start output and load template + header('Content-Type: text/html; charset=utf-8'); + include(DOKU_INC.'lib/tpl/'.$conf['template'].'/detail.php'); + + //restore old umask + umask($conf['oldumask']); + +?> diff --git a/lib/exe/media.php b/lib/exe/media.php index 27975a493..e824150f3 100644 --- a/lib/exe/media.php +++ b/lib/exe/media.php @@ -11,8 +11,6 @@ //close sesseion session_write_close(); - header('Content-Type: text/html; charset='.$lang['encoding']); - //get namespace to display (either direct or from deletion order) if($_REQUEST['delete']){ $DEL = cleanID($_REQUEST['delete']); diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 01840e8d6..81558b4d2 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -686,3 +686,17 @@ span.spell_wait { color: #0066cc; } +/* --------------- Image Details ----------------- */ + +div.img_big { + float: left; + margin-right: 0.5em; +} + +dl.img_tags dt { + font-weight: bold; + background-color: #dee7ec; +} +dl.img_tags dd { + background-color: #f5f5f5; +} diff --git a/lib/tpl/default/layout.css b/lib/tpl/default/layout.css index 45fed3d49..4bce31eb8 100644 --- a/lib/tpl/default/layout.css +++ b/lib/tpl/default/layout.css @@ -131,3 +131,4 @@ div.mediaref_footer { margin-top:1em; text-align:center; } + |