author: Christian status: Not submitted upstream descr : Various enhancement for the main gallery script : o Show image count under each galery in main page o Show a link for archives (zip, tgzn bz2), with size --- original.old/www/index.php 2005-11-14 00:53:21.000000000 +0000 +++ original.new/www/index.php 2006-05-18 21:15:05.000000000 +0000 @@ -23,6 +23,27 @@ l10n::set("$root/l10n/".$sclang."/date.lang"); +// A nice short human readable function: +function human_readable( $number, $base=1024, + $suffixes=array( " B", " KB", " MB", " GB", " TB", " PB", " EB" ) ) +{ + $usesuf = 0; + $n = (float) $number; //Appears to be necessary to avoid rounding + while( $n >= $base ) { + $n /= (float) $base; + $usesuf++; + } + $places = 2 - floor( log10( $n ) ); + $places = max( $places, 0 ); + $retval = number_format( $n, $places, ".", "" ) . $suffixes[$usesuf]; + return $retval; +} +function get_file_size( $filename ) { + $s = filesize( $filename ); + if( $s != FALSE ) + return human_readable($s); + return "N/A"; +} # always get sorted directory entries @@ -132,7 +153,7 @@ $page->footer(); exit; //stop everything } - fwrite($fh, "
" . __('Comment from') . "$comment_name
\n",90); + fwrite($fh, "
" . __('Comment from') . " $comment_name
\n",90); fwrite($fh, "
$comment_data
\n",280); fwrite($fh, "\n"); @@ -238,19 +259,32 @@ } else { echo " href=\"$ThisScript?galerie=$foldername\">$foldername"; } + + $files = glob("galeries/$foldername/thumbs/*.jpg"); + echo "
".count($files)." photos - "; + + if (@$galerieday[$foldername]) { + echo ""; + echo "$monthname " . $galerieday[$foldername]; + echo "\n"; + } + if (@$galeriedesc[$foldername]) { - echo "" . $galeriedesc[$foldername]; + echo "
" . $galeriedesc[$foldername]; echo "\n"; } if (@$galerieauthor[$foldername]) { - echo "by " . $galerieauthor[$foldername]; + echo "photos :  " . $galerieauthor[$foldername]; echo "\n"; } + +/* if (@$galerieday[$foldername]) { echo ""; echo "$monthname " . $galerieday[$foldername]; echo "\n"; } +*/ echo "

\n"; $thisyear=$year; $thismonth=$month; @@ -351,7 +385,7 @@ echo $galeriedesc[$galerie] . "

\n"; } if ($galerieauthor[$galerie]) { - echo "

Author: "; + echo "

Photos : "; echo ""; echo $galerieauthor[$galerie] . "

\n"; } @@ -360,17 +394,31 @@ //and links to archived images: echo "\n

\n"; if (file_exists("$gallery_dir/$galerie/zip/mq.zip")) { - echo "[ " . __('zipped MQ images') . " ] "; + $f = "$gallery_dir/$galerie/zip/mq.zip"; + echo "[ " . __('zipped MQ images') . " (" . get_file_size($f) . ") ] "; } - if (file_exists("$gallery_dir/$galerie/zip/mq.tar.bz2")) { - echo "[ " . __('MQ images tarball') . " ] "; + if (file_exists("$gallery_dir/$galerie/bz2/mq.tar.bz2")) { + $f = "$gallery_dir/$galerie/bz2/mq.tar.bz2"; + echo "[ " . __('MQ images bz2 tarball') . " (" . get_file_size($f) . ") ] "; + } + if (file_exists("$gallery_dir/$galerie/tgz/mq.tgz")) { + $f = "$gallery_dir/$galerie/tgz/mq.tgz"; + echo "[ " . __('MQ images tarball') . " (" . get_file_size($f) . ") ] "; } + if (file_exists("$gallery_dir/$galerie/zip/hq.zip")) { - echo "[ " . __('zipped HQ images') . " ]"; + $f = "$gallery_dir/$galerie/zip/hq.zip"; + echo "[ " . __('zipped HQ images') . " (" . get_file_size($f) . ") ]"; } - if (file_exists("$gallery_dir/$galerie/zip/hq.tar.bz2")) { - echo "[ " . __('HQ images tarball') . " ]"; + if (file_exists("$gallery_dir/$galerie/bz2/hq.tar.bz2")) { + $f = "$gallery_dir/$galerie/bz2/hq.tar.bz2"; + echo "[ " . __('HQ images bz2 tarball') . " (" . get_file_size($f) . ") ]"; + } + if (file_exists("$gallery_dir/$galerie/tgz/hq.tgz")) { + $f = "$gallery_dir/$galerie/tgz/hq.tgz"; + echo "[ " . __('HQ images tarball') . " (" . get_file_size($f) . ") ]"; } + echo "

"; #######################