[BACK]Return to pgallery.sh CVS log [TXT] [DIR] Up to [Paefchen] / scripts / pgallery / src

Diff for /scripts/pgallery/src/pgallery.sh between versions 1.14 and 1.17

version 1.14, 2012/08/29 13:36:01 version 1.17, 2012/08/29 14:44:04
Line 5 Line 5
 # can do whatever you want with this stuff. If we meet some day, and you think  # can do whatever you want with this stuff. If we meet some day, and you think
 # this stuff is worth it, you can buy me a beer in return Aron Schlesinger  # this stuff is worth it, you can buy me a beer in return Aron Schlesinger
 #  #
# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.13 2012/08/29 12:41:06 as Exp $# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.16 2012/08/29 14:15:50 as Exp $
 #  #
   
 ARG_TITLE="PGallery"  ARG_TITLE="PGallery"
Line 33  BIN_EXIFTRAN="/usr/local/bin/exiftran" Line 33  BIN_EXIFTRAN="/usr/local/bin/exiftran"
 BIN_EXIF="/usr/local/bin/exif"  BIN_EXIF="/usr/local/bin/exif"
   
 MKAKEFILE=".htmakefile"  MKAKEFILE=".htmakefile"
VERSION="pgallery-1.2"VERSION="pgallery-1.3"
   
 #  #
 # usage()  # usage()
Line 94  get_my_path() Line 94  get_my_path()
 html_header()  html_header()
 {  {
         cat <<HTML          cat <<HTML
   <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">  <html xmlns="http://www.w3.org/1999/xhtml">
 <head>  <head>
         <title>$ARG_TITLE</title>          <title>$ARG_TITLE</title>
                <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
                <style type="text/css">        <style type="text/css">
                <!--        <!--
 body {  body {
         background-color: #464646;          background-color: #464646;
         background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAABYB\          background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAABYB\
Line 429  MAIL Line 430  MAIL
 get_exif_desc()  get_exif_desc()
 {  {
         img=$1          img=$1
        $BIN_EXIF --ifd=0 --tag=0x010e -m $img 2> /dev/null | iconv -t ISO-8859-1 -f UTF-8 | while read line        $BIN_EXIF --ifd=0 --tag=0x010e -m $img 2> /dev/null | while read line
         do          do
                 echo "$line<br />"                  echo "$line<br />"
         done          done
Line 488  get_exif_info() Line 489  get_exif_info()
                         exifinfo="$exifinfo$exif "                          exifinfo="$exifinfo$exif "
                 fi                  fi
         done          done
        echo $exifinfo | sed -E -e 's/ mm /mm /' -e 's/ sec./s/' -e 's/ ISO / ISO/' -e 's/ ISO(\/| )/ \1/'        echo $exifinfo | sed -E -e 's/ mm /mm /' -e 's/ se(c|k)./s/' -e 's/ ISO / ISO/' -e 's/ ISO(\/| )/ \1/'
 }  }
   
 #  #
Line 583  then Line 584  then
         done              done    
 fi  fi
   
   # paras from iso to utf-8
   for n in $(set | awk -F= '{print $1}')
   do
           echo "$n" | grep -q '^ARG_' || continue
           eval "$n=\"\$(echo \"\$$n\" | iconv -f ISO-8859-1 -t UTF-8)\""
   done
   
 # fix url  # fix url
 if [ "$ARG_URL" != "" ]  if [ "$ARG_URL" != "" ]
 then  then
Line 747  do Line 755  do
         ) > $imglink          ) > $imglink
 done  done
 echo  echo
   
   # .htaccess
   if [ -f .htaccess ]
   then
           grep -q 'AddCharset UTF-8 .html' < .htaccess || echo "AddCharset UTF-8 .html" >> .htaccess
   else
           echo "AddCharset UTF-8 .html" > .htaccess
   fi
   
 test "$ARG_MAILTO" = "" && exit 0  test "$ARG_MAILTO" = "" && exit 0
   
Removed from v.1.14  
changed lines
  Added in v.1.17