[Linpha-cvs] SF.net SVN: linpha: [4557] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4557] trunk/linpha2
|
From: <fan...@us...> - 2006-08-25 21:30:09
|
Revision: 4557 Author: fangehrn Date: 2006-08-25 14:29:33 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/linpha/?rev=4557&view=rev Log Message: ----------- 2006-08-25 flo * add exif autorotate support - db fields time_exif and rotate are saved during import - createThumbnail() and createImage() read this value and rotate automatically if necessary with this feature we should also be able to rotate images manually without having write permission to the file @todo what should happen if we later turn off autorot? @todo why does it not work with gdlib?! Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/admin/settings_all.php trunk/linpha2/get_image.php trunk/linpha2/get_thumb.php trunk/linpha2/install/sql/sql.data.php trunk/linpha2/install/sql/sql.mysql.php trunk/linpha2/install/sql/sql.oci8po.php trunk/linpha2/install/sql/sql.postgres.php trunk/linpha2/install/sql/sql.sqlite.php trunk/linpha2/lib/classes/image/gdlib/image.php trunk/linpha2/lib/classes/image/gdlib/thumbnail.php trunk/linpha2/lib/classes/image/imagemagick/image.php trunk/linpha2/lib/classes/image/imagemagick/thumbnail.php trunk/linpha2/lib/classes/linpha.image.class.php trunk/linpha2/lib/classes/linpha.import.class.php trunk/linpha2/lib/classes/linpha.metadata.class.php trunk/linpha2/lib/classes/linpha.sql.class.php trunk/linpha2/lib/include/basket_build_zip.php trunk/linpha2/templates/default/view_thumb.html.php trunk/linpha2/templates/default_old/index.php Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/ChangeLog 2006-08-25 21:29:33 UTC (rev 4557) @@ -1,3 +1,12 @@ +2006-08-25 flo + * add exif autorotate support + - db fields time_exif and rotate are saved during import + - createThumbnail() and createImage() read this value and rotate automatically if necessary + with this feature we should also be able to rotate images manually without having write permission + to the file + @todo what should happen if we later turn off autorot? + @todo why does it not work with gdlib?! + 2006-07-15 flo * fixed bracket support detection during installation if we use exec($str, $array_output=array(), $return_value=''); Modified: trunk/linpha2/admin/settings_all.php =================================================================== --- trunk/linpha2/admin/settings_all.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/admin/settings_all.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -7,7 +7,11 @@ 'sys_im_imagemagick_path', 'sys_im_use_imagemagick', 'sys_im_video_thumbnail', + 'sys_import_autoimport', + 'sys_import_exif', + 'sys_import_exif_autorot', + 'sys_image_exif', 'sys_image_iptc', 'sys_image_xmp', @@ -46,6 +50,8 @@ 'sys_im_use_imagemagick', 'sys_im_video_thumbnail', 'sys_import_autoimport', + 'sys_import_exif', + 'sys_import_exif_autorot', 'sys_image_exif', 'sys_image_iptc', 'sys_image_xmp', Modified: trunk/linpha2/get_image.php =================================================================== --- trunk/linpha2/get_image.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/get_image.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -41,10 +41,15 @@ $overrideSettings = Array(); if(isset($_GET['width']) && isset($_GET['height'])) { - $overrideSettings['max_width'] = $_GET['width']; - $overrideSettings['max_height'] = $_GET['height']; + $overrideSettings['max_width'] = intval($_GET['width']); + $overrideSettings['max_height'] = intval($_GET['height']); } + if(isset($_GET['rotate'])) + { + $overrideSettings['rotate'] = intval($_GET['rotate']); + } + include_once(LINPHA_DIR.'/lib/classes/linpha.class.php'); $linpha = new linpha(); $linpha->sql->startSession(); Modified: trunk/linpha2/get_thumb.php =================================================================== --- trunk/linpha2/get_thumb.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/get_thumb.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -40,7 +40,14 @@ $linpha->sql->startSession(); $thumbnail = new LinImage(); - if( ! $thumbnail->createThumbnail($_GET['id']) ) // returns false if no permission + + /** + * set necessary infos to display image if exists + * create thumbnail if not exists + * + * returns false if no permission + */ + if( ! $thumbnail->createThumbnail($_GET['id']) ) { throw new Exception("Error while creating thumbnail!<br />Error: ".$thumbnail->error_msg); } Modified: trunk/linpha2/install/sql/sql.data.php =================================================================== --- trunk/linpha2/install/sql/sql.data.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/install/sql/sql.data.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -31,7 +31,11 @@ 'sys_im_imagemagick_path' => $_SESSION['sys_im_convert_path'], 'sys_im_use_imagemagick' => $_SESSION['sys_im_use_convert'], 'sys_im_video_thumbnail' => '1', + 'sys_import_autoimport' => '1', + 'sys_import_exif' => '1', + 'sys_import_exif_autorot' => '1', + 'sys_image_exif' => '1', 'sys_image_iptc' => '0', 'sys_image_xmp' => '0', Modified: trunk/linpha2/install/sql/sql.mysql.php =================================================================== --- trunk/linpha2/install/sql/sql.mysql.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/install/sql/sql.mysql.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -67,6 +67,7 @@ "time_add INT NOT NULL default '0', " . "time_mod INT NOT NULL default '0', " . "time_exif INT NOT NULL default '0', " . + "rotate INT NOT NULL default '0', " . "stats_numbers INT NOT NULL default '0', " . "stats_views INT NOT NULL default '0', " . "stats_downloads INT NOT NULL default '0', " . Modified: trunk/linpha2/install/sql/sql.oci8po.php =================================================================== --- trunk/linpha2/install/sql/sql.oci8po.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/install/sql/sql.oci8po.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -62,6 +62,7 @@ "time_add NUMBER(12) DEFAULT '0', " . "time_mod NUMBER(12) DEFAULT '0', " . "time_exif NUMBER(12) DEFAULT '0', " . + "rotate NUMBER(12) DEFAULT '0', " . "stats_numbers NUMBER(10) DEFAULT '0', " . "stats_views NUMBER(10) DEFAULT '0', " . "stats_downloads NUMBER(10) DEFAULT '0'" . Modified: trunk/linpha2/install/sql/sql.postgres.php =================================================================== --- trunk/linpha2/install/sql/sql.postgres.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/install/sql/sql.postgres.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -62,6 +62,7 @@ "time_add INT NOT NULL default '0', " . "time_mod INT NOT NULL default '0', " . "time_exif INT NOT NULL default '0', " . + "rotate INT NOT NULL default '0', " . "stats_numbers INT NOT NULL default '0', " . "stats_views INT NOT NULL default '0', " . "stats_downloads INT NOT NULL default '0' " . Modified: trunk/linpha2/install/sql/sql.sqlite.php =================================================================== --- trunk/linpha2/install/sql/sql.sqlite.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/install/sql/sql.sqlite.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -62,6 +62,7 @@ "time_add INTEGER NOT NULL default '0', " . "time_mod INTEGER NOT NULL default '0', " . "time_exif INTEGER NOT NULL default '0', " . + "rotate INTEGER NOT NULL default '0', " . "stats_numbers INTEGER NOT NULL default '0', " . "stats_views INTEGER NOT NULL default '0', " . "stats_downloads INTEGER NOT NULL default '0' " . Modified: trunk/linpha2/lib/classes/image/gdlib/image.php =================================================================== --- trunk/linpha2/lib/classes/image/gdlib/image.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/lib/classes/image/gdlib/image.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -54,6 +54,15 @@ imagedestroy($src_image); /** + * rotate image + * @todo why does this not work?! + */ + if(function_exists('imagerotate') AND $this->rotate != "0") + { + imagerotate($scaled_image,$this->rotate,0); + } + +/** * save image */ imagejpeg($scaled_image,$this->output_file,$this->img_quality); Modified: trunk/linpha2/lib/classes/image/gdlib/thumbnail.php =================================================================== --- trunk/linpha2/lib/classes/image/gdlib/thumbnail.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/lib/classes/image/gdlib/thumbnail.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -58,13 +58,14 @@ /** * create image resources */ - switch($image_type) + switch($this->img_type) { case 1: $src_image = imagecreatefromgif($this->src_file); break; case 2: $src_image = imagecreatefromjpeg($this->src_file); break; case 3: $src_image = imagecreatefrompng($this->src_file); break; default: return false;; } + $scaled_image = imagecreatetruecolor($this->img_thumbsize, $this->img_thumbsize); /** @@ -84,6 +85,15 @@ imagedestroy($src_image); /** + * rotate image + * @todo why does this not work?! + */ + if(function_exists('imagerotate') AND $this->rotate != "0") + { + imagerotate($scaled_image,$this->rotate,0); + } + +/** * save image */ imagejpeg($scaled_image,$this->output_file,$this->img_quality); Modified: trunk/linpha2/lib/classes/image/imagemagick/image.php =================================================================== --- trunk/linpha2/lib/classes/image/imagemagick/image.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/lib/classes/image/imagemagick/image.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -27,15 +27,14 @@ $convert_str = $this->imagemagick_path.'convert'. - ' -quality '.$this->img_quality. - ' -size "'.$this->img_width.'x'.$this->img_height.'"'. // new size ' '.linEscapeString($this->src_file).'[0]'. // [0] -> take only first frame!!! ' -resize "'.$this->img_width.'x'.$this->img_height.'"'. // new size + ' -quality '.$this->img_quality. ' +profile "*"'. // delete all profiles ' -colorspace RGB'. // change colorspace always to RGB because all browsers only can display RGB images + ' -rotate '.$this->rotate. ' '.linEscapeString($this->output_file); LinFilesys::linExec( $convert_str ); - ?> \ No newline at end of file Modified: trunk/linpha2/lib/classes/image/imagemagick/thumbnail.php =================================================================== --- trunk/linpha2/lib/classes/image/imagemagick/thumbnail.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/lib/classes/image/imagemagick/thumbnail.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -58,12 +58,12 @@ } $convert_str = $this->imagemagick_path.'convert'. + ' '.linEscapeString( $this->src_file ).'[0]'. // [0] -> take only first frame!!! + ' -thumbnail "'.$w.'x'.$h.'"'. // new size and delete profiles, no need anymore for ' +profile "*"'. // delete all profiles ' -quality '.$this->img_quality. - ' -size '.$w.'x'.$h. // new size ' -crop '.$this->img_thumbsize.'x'.$this->img_thumbsize.'+'.$x.'+'.$y. // crop - ' '.linEscapeString( $this->src_file ).'[0]'. // [0] -> take only first frame!!! - ' -thumbnail "'.$w.'x'.$h.'"'. // new size and delete profiles, no need anymore for ' +profile "*"'. // delete all profiles ' -colorspace RGB'. // change colorspace always to RGB because all browsers only can display RGB images + ' -rotate '.$this->rotate. ' '.linEscapeString( $this->output_file ); LinFilesys::linExec( $convert_str ); Modified: trunk/linpha2/lib/classes/linpha.image.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.image.class.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/lib/classes/linpha.image.class.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -79,16 +79,13 @@ } /** - * rotate (printing, ...) + * update rotate (printing, ...) if applicable (no else() !! ) + * the rotate value from the database is read earlier */ if(isset($this->overrideSettings['rotate'])) { $this->rotate = $this->overrideSettings['rotate']; } - else - { - $this->rotate = 0; - } /** * watermark @@ -175,26 +172,27 @@ { /** * check for valid id + * and get img_type and rotate informations */ - $query = $GLOBALS['linpha']->db->Execute("SELECT id, img_type " . + $query = $GLOBALS['linpha']->db->Execute("SELECT id, img_type, rotate " . "FROM ".PREFIX."photos " . "WHERE id = '".LinSql::linAddslashes( $this->photo_id )."'"); - if( $query->EOF ) // not a sigle value returned + if( $query->EOF ) // not a single value returned { $this->error_msg = "wrong id supplied!"; return false; } - $data = $query->FetchRow(ADODB_FETCH_NUM); + $data = $query->FetchRow(); - if( ! LinSql::photoIsAllowed( $data['0'] ) ) + if( ! LinSql::photoIsAllowed( $data['id'] ) ) { $this->error_msg = "not permitted!"; return false; } - if($this->mode == 'img' && ! LinIdentify::isSupportedImage( $data['1'] ) ) + if($this->mode == 'img' && ! LinIdentify::isSupportedImage( $data['img_type'] ) ) { $this->error_msg = "only images possible!"; return false; @@ -209,7 +207,11 @@ $this->force = false; } - $this->img_type = $data['1']; + /** + * set additional informations + */ + $this->rotate = $data['rotate']; + $this->img_type = $data['img_type']; $this->setCachedInfos(); /** @@ -304,7 +306,6 @@ */ if( LinIdentify::isSupportedImage( $this->img_type ) ) { - $this->createThumbnailImage(); } /** @@ -325,7 +326,6 @@ $this->createThumbnailVideo(); } - if( ! file_exists( $this->output_file ) ) { return false; @@ -342,7 +342,7 @@ */ $this->img_thumbsize = $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_max']; $this->img_quality = 75; - + include(LINPHA_DIR.'/lib/classes/image/'.$this->image_tool.'/thumbnail.php'); } @@ -401,12 +401,12 @@ $this->overrideSettings = $overrideSettings; - if( ! $this->setFileInformation() ) + if( ! $this->setFileInformation() ) // will also do setCachedInfos() and setSourceFileInformation() { return false; } - if( ! $this->isCached ) + if( ! $this->isCached OR $this->force ) { /** * include the create image script Modified: trunk/linpha2/lib/classes/linpha.import.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.import.class.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/lib/classes/linpha.import.class.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -167,12 +167,12 @@ linSysLog(i18n("New").': '.htmlspecialchars($dirname.'/'.$filename,ENT_QUOTES).'<br />'); - list($md5sum,$file_type,$stats_number) = LinImport::getFileInformation($dirname,$filename); + list($md5sum,$file_type,$stats_number,$time_exif,$rotate) = LinImport::getFileInformation($dirname,$filename); $GLOBALS['linpha']->db->Execute("INSERT into ".PREFIX."photos ( " . - "parent_id , name, img_type , md5sum , time_add , time_mod , stats_numbers ) " . + "parent_id, name, img_type, md5sum, time_add, time_mod, time_exif, rotate, stats_numbers ) " . "VALUES ( '".$parent_id."' , '".$GLOBALS['linpha']->sql->linAddslashes($filename)."', " . - "'".$file_type."' , '".$md5sum."', '".time()."', '".time()."', '".$stats_number."' )"); + "'".$file_type."' , '".$md5sum."', '".time()."', '".filemtime($dirname.'/'.$filename)."', '".$time_exif."', '".$rotate."', '".$stats_number."' )"); /** * delete thumbnail if one exists with the same id @@ -271,7 +271,7 @@ */ function updateEntry( $id , $dirname , $filename ) { - list($md5sum,$file_type,$stats_number) = LinImport::getFileInformation($dirname,$filename); + list($md5sum,$file_type,$stats_number,$time_exif,$rotate) = LinImport::getFileInformation($dirname,$filename); $data = $GLOBALS['linpha']->db->GetRow("SELECT img_type, md5sum " . "FROM ".PREFIX."photos WHERE id = '".$id."'"); @@ -344,8 +344,14 @@ */ function getFileInformation($dirname,$filename) { + /** + * initial settings + * will be overwritten if necessary + */ $md5sum = ''; $stats_number = 0; + $time_exif = ""; + $rotate = "0"; $ext = LinFilesys::getFileExtFromPath($filename); if($filename{0} == '.') @@ -403,6 +409,31 @@ { $md5sum = md5_file($dirname.'/'.$filename); $stats_number = 1; + + /** + * exif date and exif rotate stuff + * globally turn off using 'sys_import_exif' if having problems with phpmeta + */ + if( $GLOBALS['linpha']->sql->config->value['sys_import_exif'] ) + { + include_once( LINPHA_DIR.'/lib/classes/phpmeta/EXIF.php' ); + $meta = get_EXIF_JPEG($dirname.'/'.$filename); + include_once(LINPHA_DIR.'/lib/classes/linpha.metadata.class.php'); + + /** + * get date + */ + $time_exif = MetaData::convertExifDateToUnix( $meta[0][34665]['Data'][0][36867]['Data'][0] ); + + /** + * get rotate information + * turn off exif autorotate using 'sys_import_exif_autorot' + */ + if( $GLOBALS['linpha']->sql->config->value['sys_import_exif_autorot'] ) + { + $rotate = MetaData::getRotationByExifTag( $meta[0][274]['Data'][0] ); + } + } } } else @@ -410,7 +441,7 @@ linSysLog('Error: what am i? '.htmlspecialchars($dirname.'/'.$filename,ENT_QUOTES).'<br />'); } - return array($md5sum,$file_type,$stats_number); + return array($md5sum,$file_type,$stats_number,$time_exif,$rotate); } /** Modified: trunk/linpha2/lib/classes/linpha.metadata.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.metadata.class.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/lib/classes/linpha.metadata.class.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -881,7 +881,96 @@ } return $str; } + + /** + * Autorotate Images via EXIF tag + * Most Images contain an orientation tag which shows if and how to rotate + * the images + * @param int exif rotation tag + * @return degrees to rotate + * @author bzrudi + */ + function getRotationByExifTag($rotation) + { + if(is_numeric($rotation)) + { + switch($rotation) + { + //No Rotation, No Flip Row 0 is at the visual top of the + //image, and column 0 is the visual left-hand side + case "1": + $rotate = "0"; + break; + //No Rotation, Flipped Horizontally Row 0 is at the visual + //top of the image,and column 0 is the visual right-hand side + case "2": + $rotate = "0"; + break; + //Rotated 180 degrees, No Flip Row 0 is at the visual + //bottom of the image, and column 0 is the visual right-hand side + case "3": + $rotate = "180"; + break; + //No Rotation, Flipped Vertically Row 0 is at the visual + //bottom of the image, and column 0 is the visual left-hand side + case "4": + $rotate = "0"; + break; + //Flipped Horizontally, Rotated 90 degrees counter clockwise + //Row 0 is at the visual left-hand side of of the image, + //and column 0 is the visual top + case "5": + $rotate = "0"; + break; + //No Flip, Rotated 90 degrees clockwise Row 0 is at the visual + //right-hand side of of the image, and column 0 is the visual top + case "6": + $rotate = "90"; + break; + //Flipped Horizontally, Rotated 90 degrees clockwise Row 0 is + //at the visual right-hand side of of the image, and + //column 0 is the visual bottom + case "7": + $rotate = "0"; + break; + //No Flip, Rotated 90 degrees counter clockwise Row 0 is at + //the visual left-hand side of of the image, and column 0 is + //the visual bottom + case "8": + $rotate = "-90"; + break; + default: + $rotate = "0"; + break; + } + } + else // no rotation data is found, default to "0" + { + $rotate = "0"; + } + return $rotate; + } // end function getRotationByExifTag() + + /** + * converts a exif date to a unix timestamp + * example: 2004:02:14 18:24:19 -> 11167594589 + * + * @author flo + * @param string $date + * @return int unix timestamp + */ + function convertExifDateToUnix( $date ) + { + $year=substr($date,0,4); + $month=substr($date,5,2); + $day=substr($date,8,2); + $hour=substr($date,11,2); + $min=substr($date,14,2); + $sec=substr($date,17,2); + return mktime($hour,$min,$sec,$month,$day,$year); + } + } // end class metadata Modified: trunk/linpha2/lib/classes/linpha.sql.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.sql.class.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/lib/classes/linpha.sql.class.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -646,7 +646,7 @@ } else { - $num = 1 + substr_count(TOP_DIR, '/'); + $num = 1 + substr_count(LINPHA_DIR, '/'); } /** Modified: trunk/linpha2/lib/include/basket_build_zip.php =================================================================== --- trunk/linpha2/lib/include/basket_build_zip.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/lib/include/basket_build_zip.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -47,7 +47,7 @@ $archive->startDownload(); /** - * no TOP_DIR because we've done a chdir(TOP_DIR)! + * no LINPHA_DIR because we've done a chdir(LINPHA_DIR)! */ /* * @todo Modified: trunk/linpha2/templates/default/view_thumb.html.php =================================================================== --- trunk/linpha2/templates/default/view_thumb.html.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/templates/default/view_thumb.html.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -62,9 +62,7 @@ ?> <div style="<?php echo $str_clear; ?>" class="imgdiv"> <?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['before']; ?> - <a href="<?php echo LINPHA_DIR.'/?cat=alb&id='.$value['id']; ?>"> - <img height="<?php echo ($GLOBALS['def_tn_size']-20); ?>" src="<?php echo LINPHA_DIR.'/get_thumb.php?id='.$value['id']; ?>" title="<?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['title']; ?>" class="img_thumbnail" /> - </a> + <a href="<?php echo LINPHA_DIR.'/?cat=alb&id='.$value['id']; ?>"><img height="<?php echo $GLOBALS['linpha']->sql->config->value['sys_style_thumb_size_display']; ?>" src="<?php echo LINPHA_DIR.'/get_thumb.php?id='.$value['id']; ?>" title="<?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['title']; ?>" class="img_thumbnail" /></a> <?php echo $GLOBALS['linpha']->template->output['thumb_infos'][$value['id']]['after']; ?> </div> <?php Modified: trunk/linpha2/templates/default_old/index.php =================================================================== --- trunk/linpha2/templates/default_old/index.php 2006-07-16 16:29:17 UTC (rev 4556) +++ trunk/linpha2/templates/default_old/index.php 2006-08-25 21:29:33 UTC (rev 4557) @@ -49,7 +49,7 @@ <div><a href="">Guestbook</a></div> </li> <li class="button"> - <div><a href=""><img src="<?php echo TOP_DIR.'/templates/default_old/images/slideshow.png'?>" alt="slideshow" /></a></div> + <div><a href=""><img src="<?php echo LINPHA_DIR.'/templates/default_old/images/slideshow.png'?>" alt="slideshow" /></a></div> </li> <li class="button"> <div><a href=""><img src="<?php echo LINPHA_DIR.'/templates/default_old/images/download.png'?>" alt="download" /></a></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
