Changeset 38603

Timestamp:

10/20/10 14:59:04 (3 years ago)

Author:

sho

Message:

supported tDiary 3.x or ruby 1.9.x.

Files:

• platform/tdiary/util/posttdiary/posttdiary-ex.rb (modified) (19 diffs)

platform/tdiary/util/posttdiary/posttdiary-ex.rb

@@ -1 +1 @@
 #!/usr/bin/env ruby
-$KCODE= 'u'
 #
-# posttdiary-ex: update tDiary via e-mail. $Revision: 1.6.2.4 $
+# posttdiary-ex: update tDiary via e-mail. $Revision: 1.2 $
 #
 # Copyright (C) 2002, All right reserved by TADA Tadashi <sho@spc.gr.jp>
 # You can redistribute it and/or modify it under GPL2.
 #
-# 2007.9.22: v.1.66: Modified by K.Sakurai (http://ks.nwr.jp)
+# 2010.10.19: v.1.71: Modified by K.Sakurai (http://ks.nwr.jp)
 #  Acknowledgements:
-#   * Based on posttdiary.rb v1.2 by TADA.
+#   * Based on posttdiary.rb & tdiary.rb by TADA.
 #   * Some codes partially imported from Enikki Plugin Ex. : 
 #     http://shimoi.s26.xrea.com/hiki/hiki.cgi?TdiaryEnikkiEx
@@ -16 +15 @@
 #   * Thanks to tamo (http://tamo.tdiary.net) for image-POSTing codes & testing.
 #
+
+# language setup for tdiary.conf (for both @data_path & @tdiary_dirname)
+@tdencoding = 'UTF-8'
+# @tdencoding = 'US-ASCII'
+# @tdencoding = 'EUC-JP'
+# @tdencoding = 'Big5'
 
 #----------------------------------------------
@@ -166 +171 @@
         text.gsub!( /\![^\r\n]*[\r\n]+/, '' )
   end
-  text.delete( "\t" )
+  text.delete( /\t/ )
 end
 
@@ -183 +188 @@
         @data_path = add_delimiter( @data_path )
         raise TDiaryError, 'posttdiary-ex: Do not set @data_path as same as tDiary system directory.' if @data_path == @tdiary_dirname
-        
+        def_vars1 = ''
+        def_vars2 = ''
         variables = [:author_name, :author_mail, :index_page, :hour_offset]
+        variables.each do |var|
+                def_vars1 << "#{var} = nil\n"
+                def_vars2 << "@#{var} = #{var} unless #{var} == nil\n"
+        end
+
         begin
                 cgi_conf = File::open( "#{@data_path}tdiary.conf" ){|f| f.read }
                 cgi_conf.untaint unless @secure
-                eval( cgi_conf, binding, "(cgi_conf)", 1 )
-                variables.each do |var| eval "@#{var} = #{var} if #{var} != nil" end
-        rescue IOError, Errno::ENOENT
+                cgi_conf.force_encoding( @tdencoding )
+                b = binding.taint
+                eval( cgi_conf, b, "(cgi_conf)", 1 )
+                eval( def_vars2, b )
+                rescue IOError, Errno::ENOENT
         end
 end
@@ -211 +224 @@
         @options = {}
         # evaluate tdiary.conf  (load_cgi_conf() would be called as well, via tdiary.conf)
-        eval( File::open( @tdiary_dirname + @tdiary_conf_file ){|f| f.read }.untaint, binding, "(tdiary.conf)", 1 )
+
+        f = File::open( @tdiary_dirname + @tdiary_conf_file ){|f| f.read }.untaint.force_encoding(@tdencoding)
+        eval( f, binding, "(tdiary.conf)", 1 )
 
         Dir.chdir( orgdir )
@@ -296 +311 @@
         cmdstr = @magickpath + "identify"
         check_command( cmdstr )
+        return false if !FileTest::exist?( name )
         begin
                 imgsize = %x[#{cmdstr} '#{name}'].sub(/#{name}/, '').split[1][/\d+x\d+/]
@@ -323 +339 @@
         v = ""
         check_command( @exifpath )
+        return "" if !FileTest::exist?( fullpath_imgname )
         open( "| #{@exifpath} -t \"User Comment\" #{fullpath_imgname}", "r" ) do |f|
                 s = f.readlines
                 s.each do |t|
                         t.gsub!( /.*Value:/, '' )
-                        v = NKF::nkf( '-m0 -wXd', t ).gsub!( /^\s+/, '' ).chomp! if $&
+                        v = NKF::nkf( '-m0 -Xwd', t ).gsub!( /^\s+/, '' ).chomp! if $&
                 end
         end
@@ -343 +360 @@
         v = ''
         check_command( @exifpath )
+        return 1 if !FileTest::exist?( fullpath_imgname )
         open( "| #{@exifpath} -t \"Orientation\" #{fullpath_imgname}", "r" ) do |f|
                 s = f.readlines
@@ -740 +758 @@
                         case opt
                         when '--read-conffile'
-                                conf_df_name = arg
+                                conf_df_name = arg.dup
                         when '--image-path'
-                                image_dir = arg
+                                image_dir = arg.dup
                         when '--image-url'
-                                image_url = arg
+                                image_url = arg.dup
                         when '--use-subject'
                                 use_subject = true
                         when '--make-thumbnail'
-                                thumbnail_size = arg
+                                thumbnail_size = arg.dup
                         when '--image-geometry'
-                                image_geometry = arg
+                                image_geometry = arg.dup
                         when '--use-image-ex'
                                 use_image_ex = true
@@ -762 +780 @@
 
                         when '--convert-path'
-                                convertpath_specified = arg
+                                convertpath_specified = arg.dup
                         when '--exif-path'
-                                exifpath_specified = arg
+                                exifpath_specified = arg.dup
                                 read_exif = true
                         when '--remote-mode'
                                 remote_mode = true
                         when '--remote-image-path'
-                                remote_image_dir = add_delimiter(arg)
+                                remote_image_dir = add_delimiter(arg.dup)
                         when '--remote-yearly-dir'
-                                remote_yearly_dir = (arg =~ /[1yt]/i)
+                                remote_yearly_dir = (arg.dup =~ /[1yt]/i)
                         when '--preserve-local-images'
                                 preserve_local_images = true
@@ -780 +798 @@
                                 if arg =~ /\D/ then
                                         require 'etc'
-                                        group_id = Etc.getgrnam( arg )['gid']
+                                        group_id = Etc.getgrnam( arg.dup )['gid']
                                 else
                                         group_id = arg.to_i
@@ -788 +806 @@
                                 add_div_imgnum_specified = arg.to_i
                         when '--threshold-size'
-                                threshold_size = arg
+                                threshold_size = arg.dup
                         when '--image-format'
-                                image_format_specified = arg
+                                image_format_specified = arg.dup
                         when '--use-original-name'
                                 use_original_name = true
@@ -806 +824 @@
                         when '--write-to-file'
                                 filter_mode = true
-                                writeout_filename = arg
+                                writeout_filename = arg.dup
                         when '--date-margin'
                                 date_margin = arg.to_i
@@ -882 +900 @@
 
         if filter_mode == false then
-                url = ARGV.shift
+                url = ARGV.shift.dup
                 if %r|http://([^:/]*):?(\d*)(/.*)| =~ url then
                         host = $1
@@ -892 +910 @@
                         raise 'posttdiary-ex: invalid url for update.rb.'
                 end
-                user = ARGV.shift
-                pass = ARGV.shift
+                user = ARGV.shift.dup
+                pass = ARGV.shift.dup
         end
         
@@ -902 +920 @@
         Net::HTTP.version_1_2
 
-        mail = NKF::nkf( '-m0 -wXd', ARGF.read )
+        mail = NKF::nkf( '-m0 -Xwd', ARGF.read )
         raise "posttdiary-ex: no mail text." if not mail or mail.length == 0
         
@@ -994 +1012 @@
                 image_name = now.strftime( "%Y%m%d" ) + "_" + nextnum.to_s + image_ext
                 nextnum += 1
-                sh.move( tmpimgname , image_dir + image_name )
+                sh.rename( tmpimgname , image_dir + image_name )
                 exif_comment[image_name] = (read_exif ? read_exif_comment(image_dir + image_name) : "" )
                 exif_orientation[image_name] = (read_exif ? read_exif_orientation(image_dir + image_name) : "" )
@@ -1112 +1130 @@
                 Net::HTTP.start( host, port ) do |http|
                         protection_key = nil
-                        res, = http.get( cgi,
+                        res = http.get( cgi,
                                        'Authorization' => "Basic #{auth}",
                                        'Referer' => url )
@@ -1128 +1146 @@
                                 end
                         end
-                        response, = http.post( cgi, data, 'Authorization' => "Basic #{auth}", 'Referer' => url )
+                        response = http.post( cgi, data, 'Authorization' => "Basic #{auth}", 'Referer' => url )
                 end
         end