tdiary-contrib 4.0.4 → 4.0.5.1

data/plugin/appstore.rb

@@ -16,24 +16,24 @@ end
 
 def appstore_detail(url)
    appstore_dom = ''
-   
+
    begin
       appstore_dom = appstore_common(url, {:detail => true})
-      
+
    rescue
       appstore_dom = "<b>Error. message=#{$!.message}.</b>"
-      
+
    end
-   
+
 end
 
 def appstore_common(url, params)
    return %Q|<a href="url">#{url}</a>| if feed?
-   
+
    appstore_uri = URI::parse(url)
    id = appstore_uri.path.split('/').last.gsub('id', '')
    raise StandardError.new("AppStore ID: not found from #{url}..") if id.nil? || id == ''
-   
+
    return %Q|<a class="appstore" data-appstoreid="#{id}" href="#{url}"></a>|
 end
 

data/plugin/bigpresen.rb

@@ -12,7 +12,7 @@
 # ʸ���Υ������ϡ�ɽ���ƥ����Ȥȥ��饤�ɤΥ������˹礦�褦��ưŪ��Ĵ������ޤ���
 # JavaScript��DHTML���Ѥ���ư�����Τǡ������Ķ��ˤ�äƤ�ɽ������ʤ����Ȥ⤢��ޤ���
 #
-# Copyright (c) 2006 Maripo Goda 
+# Copyright (c) 2006 Maripo Goda
 # mailto:madin@madin.jp
 # Document URL http://www.madin.jp/works/plugin.html
 # You can redistribute it and/or modify it under GPL2.
@@ -44,7 +44,7 @@ function #{scriptID} () {
 			maxPx = Math.min(maxPx, w#{scriptID} * 2 * 0.9 / countLength(msgArr[t]));
 		}
 		maxPx = Math.min(maxPx, Math.floor(h#{scriptID} * 0.8 / msgArr.length));
-	        with (document.getElementById("#{scriptID}")) {	
+	        with (document.getElementById("#{scriptID}")) {
 			innerHTML = msg#{scriptID}[t#{scriptID}];
 			style.fontSize = maxPx+"px";
 			style.top = ((h#{scriptID}-(maxPx * msgArr.length)) / 2) + "px";
@@ -61,7 +61,7 @@ function #{scriptID} () {
 	}
 }
 
-function countLength (str) 
+function countLength (str)
 	{
 	len = 0;
 	for (i = 0; i < str.length; i++) {

data/plugin/bitly.rb

@@ -5,7 +5,7 @@
 #        (because bitly returns nil sometime.)
 #
 # required some options below:
-#    @options['biyly.login'] : your login ID of bit.ly. 
+#    @options['biyly.login'] : your login ID of bit.ly.
 #    @options['biyly.key']   : your API key of biy.ly.
 #
 # Copyright (C) 2010, TADA Tadashi <t@tdtds.jp>

data/plugin/brow_si.rb

@@ -17,7 +17,7 @@ end
 
 add_footer_proc do
 	if @conf["brow.si.site_id"] and @conf.smartphone?
-		
+
 		<<-SCRIPT
 		<script type="text/javascript">
 			window['_brSiteId'] = '#{h @conf["brow.si.site_id"]}';

data/plugin/category_similar.rb

@@ -21,7 +21,7 @@ def category_similar(categories, max_item)
 			items << %Q|<a href="#{h @index}#{anchor "#{ymd}#p#{'%02d' % idx}"}" title="#{h excerpt}">#{t}#p#{'%02d' % idx}</a> #{apply_plugin(title)}|
 		end
 	end
-	
+
 	unless items.empty?
 		'<div class="section">' +
 		"<h3 class='category-similar'>#{category_similar_label}</h3>" +

data/plugin/category_to_tagcloud.rb

@@ -149,13 +149,13 @@ if category_enable?
 				now_year = Time.now.year
 				now_month = Time.now.month
 				r = Hash.new
-	
+
 				months = [
 					['01'],['01','02'],['01','02','03'],['02','03','04'],['03','04','05'],
 					['04','05','06'],['05','06','07'],['06','07','08'],['07','08','09'],
 					['08','09','10'],['09','10','11'],['10','11','12']
 				][now_month - 1]
-	
+
 				r[now_year.to_s] = months
 				case now_month
 				when 1

data/plugin/coderay.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # coderay.rb - easy syntax highlighting for selected languages
-#  refer to the URL below. 
+#  refer to the URL below.
 #  http://coderay.rubychan.de/
 #
 # Copyright (C) 2013, tamoot <tamoot+tdiary@gmail.com>

data/plugin/datepicker.rb

@@ -8,7 +8,7 @@
 
 #
 # not support
-# 
+#
 return if feed? || @conf.mobile_agent?
 
 if /\A(?:form|preview|append|edit|update)\z/ =~ @mode

data/plugin/flickr.rb

@@ -96,7 +96,7 @@ def flickr_open(method, photo_id)
   Dir::mkdir(cache_dir) unless File::directory?(cache_dir)
 
   file = "#{cache_dir}/#{photo_id}.#{method}"
-  unless File.exist?(file)
+  if !File.exist?(file) || File.size(file) == 0
     req = Flickr::Request.new(@conf['flickr.apikey'])
     req['method'] = method
     req['photo_id'] = photo_id
@@ -106,7 +106,7 @@ def flickr_open(method, photo_id)
           fout.puts req.open
         }
       end
-    rescue TimeoutError => e
+    rescue TimeoutError, OpenSSL::OpenSSLError => e
       File.delete(file)
       raise e
     end

data/plugin/git-register.rb

@@ -6,7 +6,7 @@
 # You can redistribute it and/or modify it under GPL2.
 #
 # tDiaryのデータを日別でGitに登録するプラグインです
-# 
+#
 # 1. プラグインディレクトリ(例: plugin)にgit-register.rbを設置。
 # 2. プラグインディレクトリにja/git-register.rb、en/git-register.rbを設置。
 # 3. tdiary.confにリポジトリを指定(リポジトリの場所を/var/git-respoと仮定)
@@ -113,16 +113,16 @@ module ::TDiary
 
 			# commit
 			require 'shellwords'
-			
-			msg = "#{ENV['REMOTE_ADDR']} - #{ENV['REMOTE_HOST']}" 
-			
+
+			msg = "#{ENV['REMOTE_ADDR']} - #{ENV['REMOTE_HOST']}"
+
 			Dir.chdir("#{@repository_dir}") do
 				td2_file2 = @date.strftime("%Y%m/%Y%m%d.td2")
 				system("git add -- #{Shellwords.shellescape(td2_file2)}".untaint)
 				system("git commit -q -m \"#{msg}\" -- #{Shellwords.shellescape(td2_file2)}".untaint)
 			end
 		end
-		
+
 		protected
 
 		def mode; 'day'; end
@@ -199,9 +199,9 @@ else
 		conf.show_nyear = false
 		def conf.bot?; true; end
 
-		repository_dir = @conf['git.repository_dir'] 
+		repository_dir = @conf['git.repository_dir']
 		diary = @diaries[@date.strftime('%Y%m%d')]
-		
+
 		TDiary::GitRegister.new(repository_dir, diary).execute
 	end
 

data/plugin/goo_gl.rb

@@ -12,18 +12,18 @@ require 'net/https'
 
 def goo_gl( long_url )
    return nil if !long_url or long_url.empty?
-   
+
    # on memory
    @goo_gl_cache ||= {} # cached only on memory
    return @goo_gl_cache[long_url] if @goo_gl_cache[long_url]
-   
+
    # proxy
    px_host, px_port = (@conf['proxy'] || '').split( /:/ )
    px_port = 80 if px_host and !px_port
-   
+
    # params
    params = {'longUrl' => long_url}.to_json
-   
+
    https = nil
    begin
       https = Net::HTTP::Proxy(px_host, px_port).new('www.googleapis.com', 443)
@@ -32,11 +32,11 @@ def goo_gl( long_url )
       @goo_gl_cache[long_url] = JSON::parse(body)["id"] if res.code == '200'
    rescue Exception => e
       # do nothing..
-      
+
    ensure
       https.finish if https && https.started?
-      
+
    end
-   
+
    return @goo_gl_cache[long_url]
 end

data/plugin/google_map.rb

@@ -27,7 +27,7 @@ def google_map_common(params)
      return %Q|<a href="#{url}">#{url}</a>|
    end
    return 'not support this environment.' if @conf.mobile_agent?
-   
+
    params[:zoom]    ||=  10
    params[:html]    ||= nil
    params[:title]   ||= nil
@@ -36,7 +36,7 @@ def google_map_common(params)
    params[:address] ||= nil
    params[:type]    ||= :ROADMAP
    params[:overview]||= false
-   
+
    dom_id = "#{@date.strftime("%Y%m")}_#{@gmap_count}"
    params.merge!(:id => dom_id)
    params.merge!(:width => 240, :height => 180) if @conf.iphone?
@@ -96,7 +96,7 @@ def google_map_script(hash)
    if hash[:title]
    str << %Q|  var marker = new google.maps.Marker({\n|
    str << %Q|      position: new google.maps.LatLng(#{hash[:lat]}, #{hash[:lon]}),\n|
-   str << %Q|      map: gMap,\n| 
+   str << %Q|      map: gMap,\n|
    str << %Q|      title: '#{hash[:title]}'\n|
    str << %Q|  });\n|
    # set InfoWindow
@@ -109,7 +109,7 @@ def google_map_script(hash)
    end # :html
    end # :title
    str << %Q|});\n|
-    
+
    str
 end
 
@@ -137,7 +137,7 @@ def google_geomap_script(hash)
    if hash[:title]
    str << %Q|        var marker = new google.maps.Marker({\n|
    str << %Q|            position: geoLat,\n|
-   str << %Q|            map: gMap,\n| 
+   str << %Q|            map: gMap,\n|
    str << %Q|            title: '#{hash[:title]}'\n|
    str << %Q|        });\n|
    # set InfoWindow
@@ -155,7 +155,7 @@ def google_geomap_script(hash)
    str << %Q|    });\n|
    str << %Q|  }\n|
    str << %Q|});\n|
-    
+
    str
 end
 

data/plugin/google_webmaster.rb

@@ -1,16 +1,16 @@
 # encoding: utf-8
-# google-webmaster.rb - embed a meta tag to let Google Webmaster tool know your verification code. 
-# 
+# google-webmaster.rb - embed a meta tag to let Google Webmaster tool know your verification code.
+#
 # Copyright (C) 2012, Tatsuya Sato <satoryu.1981@gmail.com>
 # You can redistribute it and/or modify it under GPL2.
 #
 
 add_header_proc do
-  "<meta name=\"google-site-verification\" content=\"#{h @conf['google_webmaster.verification']}\" />" 
+  "<meta name=\"google-site-verification\" content=\"#{h @conf['google_webmaster.verification']}\" />"
 end
 
 add_conf_proc('Google Webmaster', 'Google ウェブマスターツール', 'etc') do
-  if @mode == 'saveconf' 
+  if @mode == 'saveconf'
     @conf['google_webmaster.verification'] = @cgi.params['google_webmaster.verification'][0]
   end
   <<-HTML

data/plugin/hb_footer.rb

@@ -35,7 +35,7 @@ add_body_leave_proc(Proc.new do |date|
   end
 end)
 
-# rss-recent.rb: RSS recent plugin 
+# rss-recent.rb: RSS recent plugin
 #
 # rss_recnet: show recnet list from RSS
 #   parameters (default):
@@ -72,11 +72,11 @@ def hb_footer(url, max = 5, cache_time = 3600, \
 	cache_file = "#{@cache_path}/rss-recent.#{CGI.escape(url)}"
 
 	hb_footer_cache_rss(url, cache_file, cache_time.to_i)
-	
+
 	return '' unless test(?r, cache_file)
 
 	rv = template_head
-	
+
 	i = 0
 	hb_footer_read_from_cache(cache_file).each do |title, url, time, content, description|
 		break if i >= max
@@ -111,14 +111,14 @@ def hb_footer_cache_rss(url, cache_file, cache_time)
 		require 'rss/2.0'
 		require 'rss/dublincore'
 		require 'rss/content'
-		
+
 		begin
 			uri = URI.parse(url)
 
 			raise URI::InvalidURIError if uri.scheme != "http"
 
 			rss_source = hb_footer_fetch_rss(uri, cached_time)
-			
+
 			raise InvalidResourceError if rss_source.nil?
 
 			# parse RSS

data/plugin/hb_footer4sec.rb

@@ -24,7 +24,7 @@ add_section_leave_proc do |date, index|
   hb_footer4sec(rss_url, 50, cache_time, template_head, template_list, template_foot)
 end
 
-# rss-recent.rb: RSS recent plugin 
+# rss-recent.rb: RSS recent plugin
 #
 # rss_recnet: show recnet list from RSS
 #   parameters (default):
@@ -61,11 +61,11 @@ def hb_footer4sec(url, max = 5, cache_time = 3600, \
 	cache_file = "#{@cache_path}/rss-recent.#{CGI.escape(url)}"
 
 	hb_footer4sec_cache_rss(url, cache_file, cache_time.to_i)
-	
+
 	return '' unless test(?r, cache_file)
 
 	rv = template_head
-	
+
 	i = 0
 	hb_footer4sec_read_from_cache(cache_file).each do |title, url, time, content, description|
 		break if i >= max
@@ -100,14 +100,14 @@ def hb_footer4sec_cache_rss(url, cache_file, cache_time)
 		require 'rss/2.0'
 		require 'rss/dublincore'
 		require 'rss/content'
-		
+
 		begin
 			uri = URI.parse(url)
 
 			raise URI::InvalidURIError if uri.scheme != "http"
 
 			rss_source = hb_footer4sec_fetch_rss(uri, cached_time)
-			
+
 			raise InvalidResourceError if rss_source.nil?
 
 			# parse RSS

data/plugin/hide_sidebar_iphone.rb

@@ -8,7 +8,7 @@ add_header_proc do
 	if @conf.iphone? then
 		<<-CSS
 		<style type="text/css"><!--
-		div.sidebar { 
+		div.sidebar {
 			display: none;
 		}
 		div.main {

data/plugin/iddy.rb

@@ -47,7 +47,7 @@ def iddy( id )
 	nameroma = user.to_a( 'nameroma' )[0]
 	mail = user.to_a( 'mail' )[0]
 	submail = user.to_a( 'submail' )[0]
-	
+
 	html = '<div class="iddy">'
 	html << %Q|<a href="#{profileurl.text}">|
 	html << %Q|<span class="iddy-image"><img src="#{imageurl.text}" alt="image" width="96" height="96"></span>| if imageurl

data/plugin/image_ex.rb

@@ -1,7 +1,7 @@
 # image_plugin_ex.rb
 # version 0.3
 # -pv-
-# 
+#
 # 名称:
 # 絵日記Plugin機能追加版
 #
@@ -89,7 +89,7 @@ if @conf.smartphone?
 end
 
 
-add_body_enter_proc(Proc.new do |date|	
+add_body_enter_proc(Proc.new do |date|
 	@image_date = date.strftime("%Y%m%d")
 	@image_year = date.strftime("%Y")
 	""
@@ -110,10 +110,10 @@ def image( id, alt = "image", id2 = nil, width = nil, place="none" )
 
 	image_dir.untaint
 	Dir.mkdir(image_dir) unless File.directory?(image_dir)
-	
+
 	list = imageList(@image_date, image_dir).untaint
 	slist = imageList(@image_date, image_dir, "s").untaint
-	
+
 	if width
 		width_tag = %Q[width="#{h width}"]
 	else
@@ -194,7 +194,7 @@ add_form_proc do |date|
 			def resize_image(orig, new, width, height, imageex_convertedwidth, imageex_convertedheight, orig_type, new_type)
 				imageex_convertpath = @options && @options['image_ex.convertpath'] || "convert"
 				imageex_convertpath
-				
+
 				if width > height
 					imageex_convertedsize = %Q[#{imageex_convertedwidth}x#{imageex_convertedheight}]
 					imageex_convertedsize
@@ -217,16 +217,16 @@ add_form_proc do |date|
 				giftopnm = @options && @options['image_ex.giftopnmpath'] || "giftopnm"
 				tifftopnm = @options && @options['image_ex.tifftopnmpath'] || "tifftopnm"
 				bmptopnm = @options && @options['image_ex.bmptopnmpath'] || "bmptopnm"
-				
+
 				downtype = orig_type.downcase
 				topnm = eval("#{downtype}topnm")
-				
+
 				if new_type == "jpg"
 					pnmto = pnmtojpeg
 				elsif new_type == "png"
 					pnmto = pnmtopng
 				end
-				
+
 				if width > height
 					imageex_convertedsize ="#{imageex_convertedwidth}"
 				else
@@ -252,7 +252,7 @@ add_form_proc do |date|
 			}
 			return image_path
 		end
-	
+
 		if @cgi.params['plugin_image_add'][0] && @cgi.params['plugin_image_file'][0].original_filename != ''
 			image_dir = @cgi.params['plugin_image_dir'][0].read.untaint
 			image_filename = ''
@@ -271,7 +271,7 @@ add_form_proc do |date|
 					f.print @cgi.params['plugin_image_file'][0].read
 				}
 			end
-			
+
 			if imageex_useresize == 1 or imageex_useresize == 2
 				open(image_file,"rb") do |fh|
 					img = ImageSize.new(fh.read)
@@ -291,7 +291,7 @@ add_form_proc do |date|
 					elsif imageex_converttype == 1
 						new_type = "png"
 					end
-					
+
 					if width
 						if width > imageex_thresholdsize or height > imageex_thresholdsize
 							small_image_file = %Q[#{image_dir}s#{image_date}_#{image_name.length.to_s}.#{new_type}]
@@ -367,10 +367,10 @@ add_form_proc do |date|
 	n_image = imageList(@date.strftime("%Y%m%d"), image_dir).length
 	list = imageList(@date.strftime("%Y%m%d"), image_dir)
 	slist = imageList(@date.strftime("%Y%m%d"), image_dir, "s")
-	
+
 	pretable=""
 	posttable=""
-	
+
 	if n_image > 0
 		pretable<< %Q[<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0">]
 		posttable << %Q[</TR></TABLE>]
@@ -386,7 +386,7 @@ add_form_proc do |date|
 		image_plugin_tag1 = "&lt;%="
 		image_plugin_tag2 = "%&gt;"
 	end
-	
+
 	r = ''
 	r << %Q[
 		<script type="text/javascript">
@@ -416,14 +416,14 @@ add_form_proc do |date|
 			alt_tag = %Q[alt="#{h list[id.to_i]}"]
 			thumbnail_tag = %Q[<form class="update" method="post" enctype="multipart/form-data" action="#{h @update}">#{csrf_protection}<input type="hidden" name="plugin_image_name" value="#{date.strftime( '%Y%m%d' )}_#{h id}"><input type="hidden" name="plugin_image_dir" value="#{h image_dir}"><input type="hidden" name="plugin_image_thumbnail" value="true"><input type="hidden" name="date" value="#{date.strftime( '%Y%m%d' )}"><input type="file" name="plugin_image_file"><input type="submit" name="plugin" value="サムネイル"></form>] if imageex_useresize == 0
 		end
-		
+
 		ptag = "#{image_plugin_tag1}image #{id}, '画像の説明'#{image_plugin_tag2}"
-		
+
 		i<< %Q[<td><table border="1" cellpadding="1" cellspacing="1"><tr><td style="text-align:center"><input type="button" onclick="ins(&quot;#{ptag}&quot;)" value="本文に追加"></td></tr><tr><td style="text-align:center">#{image_plugin_tag1}image #{h id},'title#{h id}'#{image_plugin_tag2}</td></tr><tr><td width="#{@imageex_thumbnailsize * 1.5}" height="#{@imageex_thumbnailsize * 1.3}" style="text-align:center">
 <img class="form" #{src_tag} #{alt_tag} height="#{@imageex_thumbnailsize}" ></tr><tr><td>#{thumbnail_tag}<form class="update" method="post" action="#{h @update}">#{csrf_protection}<input type="hidden" name="plugin_image_del" value="true"><input type="hidden" name="date" value="#{date.strftime( '%Y%m%d' )}"><input type="hidden" name="plugin_image_id" value="#{h id}"><input type="submit" name="plugin" value="画像を削除"><input type="hidden" name="plugin_image_dir" value="#{h image_dir}"></form>
 </tr></table></td>] if slist[id.to_i] || list[id.to_i]
 		nt += 1 if slist[id.to_i] || list[id.to_i]
-		
+
 		if nt > 0 and nt%2 == 0
 			i<< %Q[</TR></TABLE><TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR><TD>]
 		end