tdiary 3.2.2.20130507

data/js/highlight.js

@@ -0,0 +1,36 @@
+/**
+ * highlight.js: Highlighting the element jumped from other pages. 
+ *
+ * Copyright (C) 2003 by Ryuji SAKAI
+ * Copyright (C) 2003 by Kazuhiro NISHIYAMA
+ * Copyright (C) 2011 by MATSUOKA Kohei <kmachu@gmail.com>
+ * You can distribute it under GPL.
+ */
+
+$(function() {
+  function highlight(anchor) {
+    // clear current highlight
+    $(".highlight").removeClass("highlight");
+
+    // change document title
+    var target = $(anchor).parent();
+    if (target.filter('h3').size() > 0) {
+      document.title = target.children("a").attr("title") + " - " + $tDiary.title;
+    }
+
+    target.addClass("highlight");
+  }
+
+  // bind click event to anchors
+  $(document.anchors)
+    .filter(function() {
+      return $(this).attr("name").match(/^[pc]/);
+    })
+    .bind("click", function() {
+      highlight(this);
+    })
+
+  if (document.location.hash) {
+    highlight($('[name=' + document.location.hash.replace(/[^\w]/g, "") + ']')[0]);
+  }
+});

data/js/image.js

@@ -0,0 +1,181 @@
+/*
+ image.js: javascript for image.rb plugin of tDiary
+
+ Copyright (C) 2011 by TADA Tadashi <t@tdtds.jp>
+ Copyright (C) 2011 by hb <smallstyle@gmail.com>
+ You can redistribute it and/or modify it under GPL2.
+ */
+
+function insertImage(text){
+	$('#body').insertAtCaret(text);
+}
+
+$(function(){
+	$('.image-img')
+	.live('hover', function(){
+		$(this).css('cursor', 'pointer');
+	}, function(){
+		$(this).css('cursor', 'default');
+	})
+	.live('click', function(){
+		var idx = this.id.replace('image-index-', '');
+		var w = $('#image-info-' + idx + ' .image-width').text();
+		var h = $('#image-info-' + idx + ' .image-height').text();
+		$('#body').insertAtCaret($.makePluginTag('image', function(){
+			return [idx, "'" + $tDiary.plugin.image.alt + "'", 'nil', '[' + w + ',' + h + ']']
+		}));
+	});
+	
+	var ImagePlugin = function(url){
+		this.url =url;
+	};
+	ImagePlugin.prototype = {
+		upload: function(formData, callback){
+			$.ajax({
+				url: this.url,
+				type: 'post',
+				data: formData,
+				processData: false,
+				contentType: false,
+				beforeSend: function(){
+					$('#plugin-image-addimage input[type="submit"]').attr('disabled', 'disabled');
+					$('#plugin-image-uploading').show();
+				},
+				success: function(data){
+					callback(data);
+				},
+				complete: function(){
+					$('#plugin-image-addimage input[type="submit"]').removeAttr('disabled');
+					$('#plugin-image-uploading').hide();
+				}
+			});
+		},
+		
+		remove: function(data, callback){
+			$.ajax({
+				url: this.url,
+				type: 'post',
+				data: data,
+				dataType: 'html',
+				success: function(response){
+					callback();
+				}				
+			});
+		}
+	};
+	
+	$('#plugin-image-addimage input[name="plugin"]')
+	.after($('<span>', {text: 'Uploading...'}).attr('id', 'plugin-image-uploading').hide());
+		
+	$('#plugin-image-addimage form')
+	.submit(function(e){
+		if(typeof(FormData) == 'undefined') {
+			return true;
+		}
+		e.preventDefault();
+		
+		uploadFiles(this.plugin_image_file.files);
+		this.reset();
+		return false;
+	});
+	
+	var uploadFiles = function(files) {
+		var formData = new FormData();
+		formData.append('plugin', 'image');
+		$.each($('#plugin-image-addimage input[type="hidden"]'), function(){
+			formData.append($(this).attr('name'), $(this).val());
+		});
+		$.each(files, function(i, file){
+			formData.append('plugin_image_file', file);
+		});
+
+		var imagePlugin = new ImagePlugin($(this).attr('action'));
+		imagePlugin.upload(formData, function(result){
+			$('#plugin-image-delimage').parents('div.form').remove();
+			$('<div>')
+				.attr({
+					'class': 'form'
+				})
+				.append($('#plugin-image-delimage', result).parents('div.form').html())
+				.insertBefore('#plugin-image-addimage');
+			var timestamp = new Date().getTime();
+			$.each($('#plugin-image-delimage img'), function(){
+				$(this).attr('src', $(this).attr('src') + '?' + timestamp);
+			});
+		});
+		return false;
+	};
+
+	$('#plugin-image-delimage')
+	.live('submit', function(e){
+		e.preventDefault();
+		
+		var ids = $.map($('#image-table input[name="plugin_image_id"]:checked'), function(i){
+			return $(i).val();
+		});
+		var imagePlugin = new ImagePlugin($(this).attr('action'));
+		imagePlugin.remove($(this).serialize() + '&plugin=image', function(){
+			$.each(ids, function(i, id){
+				$('#image-index-' + id).parent().fadeOut();
+				$('#image-info-' + id).fadeOut();
+			});
+		});
+		return false;
+	});
+
+	if(window.File) {
+		$('<div>')
+			.attr({
+				id: 'plugin_image_dnd'
+			})
+			.css({
+				'height': '5em',
+				'text-align': 'center',
+				'line-height': '5em',
+				'background': '#ddd',
+				'border': 'dashed 3px #AAA'
+			})
+			.bind('dragenter', function(){
+				$(this).css('border', 'solid 3px #AAA');
+				return false;
+			})
+			.bind('dragleave', function(){
+				$(this).css('border', 'dashed 3px #CCC');
+				return false;
+			})
+			.bind('drop', function(e){
+				$('#plugin_image_dnd').hide();
+				$(this).css('border', 'dashed 3px #CCC');
+				$('#plugin-image-addimage form').show();
+				var files = e.originalEvent.dataTransfer.files;
+				uploadFiles(files);
+				return false;
+			})
+			.text($tDiary.plugin.image.drop_here)
+			.hide()
+			.appendTo('#plugin-image-addimage');
+
+		var dnd_timer = false;
+		$('body')
+			.bind('dragenter', function() {
+				if (dnd_timer) {
+					clearTimeout( dnd_timer );
+				}
+				$('#plugin-image-addimage form').hide();
+				$('#plugin_image_dnd').show();
+			})
+			.bind('dragover', function(){
+				if (dnd_timer) {
+					clearTimeout( dnd_timer );
+				}
+				return false;
+			})
+			.bind('dragleave', function(){
+				dnd_timer = setTimeout(function(){
+					$('#plugin_image_dnd').hide();
+					$('#plugin-image-addimage form').show();
+				}, 500);
+				return false;
+			});
+	}
+});

data/misc/convert2.rb

@@ -0,0 +1,123 @@
+# -*- coding: utf-8; -*-
+#!/usr/bin/env ruby
+#
+# convert2: convert diary data file format tDiary1 to tDiary2.
+#
+# Copyright (C) 2001,2002, All right reserved by TADA Tadashi <sho@spc.gr.jp>
+# You can redistribute it and/or modify it under GPL2.
+
+=begin How to usage
+ruby convert2.rb [-p <tDiary path>] [-c <tdiary.conf path>]
+
+-p <tDiary path>     : tDiaryのインストールパス。未指定時はカレントディレクトリ
+                       例: -p /usr/local/tdiary
+-c <tdiary.conf path>: tdiary.confが存在するパス。未指定時はカレントディレクトリ
+                       例: -c /home/hoge/public_html/diary
+=end
+
+=begin ChangeLog
+2002-10-08 TADA Tadashi <sho@spc.gr.jp>
+	* for tDiary 1.5.0.20021003.
+
+2002-08-16 TADA Tadashi <sho@spc.gr.jp>
+	* follow new IO classes specification.
+
+2002-07-25 TADA Tadashi <sho@spc.gr.jp>
+	* display progress.
+
+2002-07-23 TADA Tadashi <sho@spc.gr.jp>
+	* fix some bugs.
+
+2002-05-30 TADA Tadashi <sho@spc.gr.jp>
+	* created.
+=end
+
+def usage
+	puts "convert2: convert diary data file format tDiary1 to tDiary2."
+	puts "usage: ruby convert2.rb [-p <tDiary path>] [-c <tdiary.conf path>]"
+	exit
+end
+
+require 'getoptlong'
+parser = GetoptLong::new
+tdiary_path = '.'
+tdiary_conf = nil
+parser.set_options(
+	['--path', '-p', GetoptLong::REQUIRED_ARGUMENT],
+	['--conf', '-c', GetoptLong::REQUIRED_ARGUMENT]
+)
+begin
+	parser.each do |opt, arg|
+		case opt
+		when '--path'
+			tdiary_path = arg
+		when '--conf'
+			tdiary_conf = arg
+		else
+			usage
+		end
+	end
+rescue
+	usage
+end
+
+tdiary_conf = tdiary_path unless tdiary_conf
+Dir::chdir( tdiary_conf )
+
+begin
+	ARGV << '' # dummy argument against cgi.rb offline mode.
+	$:.unshift tdiary_path
+	require "#{tdiary_path}/tdiary"
+rescue LoadError
+	$stderr.puts 'convert.rb: cannot load tdiary.rb. try -p option.'
+	exit
+end
+
+
+module TDiary
+	class TDiaryConvert2 < TDiaryBase
+		def initialize
+			cgi = CGI.new
+			super( cgi, 'day.rhtml', Config::new(cgi) )
+			require "#{PATH}/tdiary/pstoreio"
+			@io_old = PStoreIO::new( self )
+			@years = @io_old.calendar
+			@years.keys.sort.each do |year|
+				@years[year.to_s].sort.each do |month|
+					puts "#{year}-#{month}"
+					date = Time::local( year.to_i, month.to_i )
+					@io_old.transaction( date ) do |diaries|
+						@diaries = diaries
+						false
+					end
+	
+					require 'tdiary/defaultio'
+					DefaultIO::new( self ).transaction( date ) do |diaries|
+						diaries.update( @diaries )
+						TDiaryBase::DIRTY_DIARY | TDiaryBase::DIRTY_COMMENT | TDiaryBase::DIRTY_REFERER
+					end
+					clear_parser_cache( date )
+				end
+			end
+		end
+	
+	protected
+		def cookie_name
+			''
+		end
+	
+		def cookie_mail
+			''
+		end
+	end
+end
+
+TDiary::TDiaryConvert2::new
+
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/misc/filter/antispamservice.rb

@@ -0,0 +1,101 @@
+# -*- coding: utf-8; -*-
+#
+# antispamservice.rb: tDiary comment spam filter using Antispam API $Revision: 1.4 $
+#
+# usage:
+#    1) Get your free API Key from:
+#         a. Akismet API from http://akismet.com/personal/
+#         b. TypePad Antispam API from http://antispam.typepad.com/info/get-api-key.html
+#    2) Set the API key and enable filter in your tdiary.conf. See below.
+#          @options['antispam.service'] = 'rest.akismet.com'
+#          @options['antispam.key'] = '1234567890ab'
+#
+# Copyright (C) TADA Tadashi <sho@spc.gr.jp> 2007.
+# Modified by SHIBATA Hiroshi <shibata.hiroshi@gmail.com> 2008.
+# Distributed under GPL2.
+#
+
+require 'net/http'
+require 'uri'
+
+module TDiary::Filter
+	class AntispamserviceFilter < Filter
+		def comment_filter( diary, comment )
+
+			@antispam_service_list = {
+				# Service => ServiceHost
+				'Akismet' => 'rest.akismet.com',
+				'TypePad' => 'api.antispam.typepad.com'
+			}
+
+			host  = @antispam_service_list[@conf['antispam.service']]
+			return true unless (host || '' ).length > 0
+			debug("#{host}")
+
+			key = @conf['antispam.key']
+			return true unless (key || '' ).length > 0
+
+			blog = @conf.index.dup
+			blog[0, 0] = base_url unless %r|^https?://|i =~ blog
+			blog.gsub!( %r|/\./|, '/' )
+			permalink = "#{blog}?date=#{diary.date.strftime('%Y%m%d')}"
+
+			if comment.name == 'TrackBack' then
+				comment_type = 'trackback'
+				comment_author_url = comment.body.split[0]
+			else
+				comment_type = 'comment'
+				comment_author_url = nil
+			end
+
+			uri = URI::parse( "http://#{key}.#{host}/1.1/comment-check" )
+			data =  "blog=#{blog}"
+			data << "&user_ip=#{@cgi.remote_addr}"
+			data << "&user_agent=#{u @cgi.user_agent}"
+			data << "&permalink=#{permalink}"
+			data << "&comment_type=#{comment_type}"
+			data << "&comment_author=#{u comment.name}"
+			data << "&comment_author_email=#{u comment.mail}"
+			data << "&comment_author_url=#{u comment_author_url}" if comment_author_url
+			data << "&comment_content=#{u comment.body}"
+
+			unless check( uri, data ) then
+				debug( "antispam judged spam." )
+				comment.show = false
+				#
+				# NOTICE: force hide TSUKKOMIs. because Antispam judge
+				#         Japanese TSUKKOMI to spam sometime.
+				#
+				return true # (@conf['spamfilter.filter_mode'] || true)
+			end
+			debug( "antispam judged ham.", DEBUG_FULL )
+			return true
+		end
+
+		def check( uri, data )
+			header = {
+				'User-Agent' => "tDiary/#{TDIARY_VERSION} | Antispam filter/$Revision: 1.4 $",
+				'Content-Type' => 'application/x-www-form-urlencoded'
+			}
+			debug( "antispam request: #{data}", DEBUG_FULL )
+			proxy_h, proxy_p = (@conf['proxy'] || '').split( /:/ )
+			res = ::Net::HTTP::Proxy( proxy_h, proxy_p ).start( uri.host, uri.port ) do |http|
+				http.post( uri.path, data, header )
+			end
+			debug( "antispam result: #{res.body}", DEBUG_FULL )
+			return (res.body != 'true')
+		end
+
+		def u( str )
+			CGI::escape( str )
+		end
+	end
+end
+
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/misc/filter/limitdays.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8; -*-
+#
+# limitdays.rb: 
+#
+# Copyright (C) SHIBATA Hiroshi <shibata.hiroshi@gmail.com> 2008.
+# Distributed under GPL2.
+#
+
+module TDiary::Filter
+	class LimitdaysFilter < Filter
+		def comment_filter( diary, comment )
+			if @conf.options.include?('spamfilter.date_limit') &&
+					@conf.options['spamfilter.date_limit'] &&
+					/\A\d+\z/ =~ @conf.options['spamfilter.date_limit'].to_s
+				@date_limit = @conf.options['spamfilter.date_limit'].to_s.to_i
+			else
+				@date_limit = nil
+			end
+			
+			if @date_limit
+				now = Time.now
+				today = Time.local(now.year, now.month, now.day)
+				limit = today - 24 * 60 * 60 * @date_limit
+				if diary.date < limit
+					debug( "too old: #{diary.date} (limit >= #{limit})" )
+					comment.show = false
+					return false
+				end
+			end
+			return true
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End: