tdiary 5.0.9 → 5.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd3b534e6c1ffad24c57751463277aef66e04524472b4cd8d9d1e9208e6ae68
-  data.tar.gz: d292756cffd0c049bc0dd901273fb2e6b76a1c47823d1cb3f4aad7186a8dceb0
+  metadata.gz: 0ef45e72faac164b99776cce2ae128150a9481dfc15c771bbac366aba30ffa48
+  data.tar.gz: 27c461933e713b46c6b32853f8e1c6d3ea3eff4f1205a3f4950461a314c793cd
 SHA512:
-  metadata.gz: 89aae1938ff019eafd11a5bcaed479d2cb43c9af2bbdbfcb526a58e3263ea1d9cad98daaf1b8f91a8ec026e0ce0d9cf04e332108ce170272110cc4d244268eef
-  data.tar.gz: d27f809a7becae8e6f6b2129a4620a0cd6c60f6d1c8aac2ca14c64a04ea6858fb68ae9ae4fb1f1b45e1ee9e1928bb01efef99ec1a92cf6d22766620c6acf868a
+  metadata.gz: ab35b0fbe73802e3593c8f5aceaa5aa1c33453cdfb8517281ac7b01907ce2f20f1c6f6eb74a3f8591eaff91e88d7f9ae565d949f72af4dc114d221c9a20d909a
+  data.tar.gz: 17055214b65ad726e5314ed953c7de9fed2a44cca573691e7fe5e42ad3966a864db26f81d52dbe3fc2ccbcd3756ebf0d781772082cc87dceb5383950cae8bc61

data/ChangeLog

@@ -1,3 +1,6 @@
+2015-09-29  SHIBATA Hiroshi <hsbt@ruby-lang.org>
+	* release 5.0.10
+
 2018-06-29  Tada, Tadashi <t@tdtds.jp>
 	* release 5.0.9
 

data/Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     byebug (10.0.1)
-    capybara (3.2.1)
+    capybara (3.8.1)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -15,9 +15,9 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
-    coveralls (0.8.21)
+    coveralls (0.8.22)
       json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
@@ -25,13 +25,13 @@ GEM
       debase-ruby_core_source (>= 0.10.2)
     debase-ruby_core_source (0.10.2)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     emot (0.0.4)
       thor
-    faraday (0.15.1)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    fastimage (2.1.3)
-    ffi (1.9.23)
+    fastimage (2.1.4)
+    ffi (1.9.25)
     hikidoc (0.1.0)
     jasmine (2.99.0)
       jasmine-core (>= 2.99.0, < 3.0.0)
@@ -45,12 +45,12 @@ GEM
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     method_source (0.9.0)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     multipart-post (2.0.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    octokit (4.9.0)
+    octokit (4.12.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     phantomjs (2.1.1.0)
     pit (0.0.7)
@@ -61,40 +61,40 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rack (2.0.5)
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
     rake (12.3.1)
     redcarpet (3.4.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     ruby-debug-ide (0.6.1)
       rake (>= 0.8.1)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    selenium-webdriver (3.12.0)
+    selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
-    sequel (5.9.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    sequel (5.12.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)

data/README.md

@@ -2,7 +2,7 @@
 
 [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://www.heroku.com/deploy?template=https://github.com/tdiary/tdiary-core)
 
-[![Gem Version](https://badge.fury.io/rb/tdiary.png)](https://rubygems.org/gems/tdiary) [![Build Status](https://secure.travis-ci.org/tdiary/tdiary-core.png)](https://travis-ci.org/tdiary/tdiary-core) [![Coverage Status](https://coveralls.io/repos/tdiary/tdiary-core/badge.png?branch=master)](https://coveralls.io/r/tdiary/tdiary-core) [![Dependency Status](https://gemnasium.com/tdiary/tdiary-core.png)](https://gemnasium.com/tdiary/tdiary-core) [![Code Climate](https://codeclimate.com/github/tdiary/tdiary-core.png)](https://codeclimate.com/github/tdiary/tdiary-core)
+[![Gem Version](https://badge.fury.io/rb/tdiary.png)](https://rubygems.org/gems/tdiary) [![Build Status](https://secure.travis-ci.org/tdiary/tdiary-core.png)](https://travis-ci.org/tdiary/tdiary-core) [![Coverage Status](https://coveralls.io/repos/tdiary/tdiary-core/badge.png?branch=master)](https://coveralls.io/r/tdiary/tdiary-core) [![Code Climate](https://codeclimate.com/github/tdiary/tdiary-core.png)](https://codeclimate.com/github/tdiary/tdiary-core)
 
 ## tDiary, The TSUKKOMI-able Weblog.
 

data/lib/tdiary/cli.rb

@@ -148,7 +148,7 @@ module TDiary
 			if password != password2
 				raise StandardError, 'password verification error'
 			end
-			htpasswd = WEBrick::HTTPAuth::Htpasswd.new('.htpasswd')
+			htpasswd = WEBrick::HTTPAuth::Htpasswd.new(ENV['HTPASSWD'] || '.htpasswd')
 			htpasswd.set_passwd(nil, username, password)
 			htpasswd.flush
 		end

data/lib/tdiary/rack/auth.rb

@@ -8,7 +8,7 @@ module TDiary
 				if defined? ::OmniAuth
 					@app = TDiary::Rack::Auth::OmniAuth.new(app)
 				else
-					@app = TDiary::Rack::Auth::Basic.new(app, '.htpasswd')
+					@app = TDiary::Rack::Auth::Basic.new(app, ENV['HTPASSWD'] || '.htpasswd')
 				end
 			end
 

data/lib/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '5.0.9'
+	VERSION = '5.0.10'
 end

data/misc/paas/heroku/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/tdiary/tdiary-contrib.git
-  revision: 54dfbb4ac311d1b9a609533c38b751ad4e775eb1
+  revision: 3afce003bd3db2a5e6e7d0b0c62c3b8270f5b0dd
   specs:
-    tdiary-contrib (5.0.8)
+    tdiary-contrib (5.0.9)
       pushbullet_ruby
       tdiary
 
@@ -17,9 +17,9 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activesupport (5.2.0)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -28,7 +28,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     bson (4.3.0)
     byebug (10.0.2)
-    capybara (3.2.1)
+    capybara (3.8.1)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -38,15 +38,15 @@ GEM
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
-    commonmarker (0.17.9)
+    commonmarker (0.17.13)
       ruby-enum (~> 0.5)
     concurrent-ruby (1.0.5)
-    coveralls (0.7.2)
-      multi_json (~> 1.3)
-      rest-client (= 1.6.7)
-      simplecov (>= 0.7)
-      term-ansicolor (= 1.2.2)
-      thor (= 0.18.1)
+    coveralls (0.8.22)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
     dalli (2.7.8)
     debase (0.2.2)
       debase-ruby_core_source (>= 0.10.2)
@@ -55,13 +55,13 @@ GEM
     docile (1.3.1)
     emot (0.0.4)
       thor
-    faraday (0.15.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
-    fastimage (2.1.3)
+    fastimage (2.1.4)
     ffi (1.9.25)
     hashie (3.5.7)
     hikidoc (0.1.0)
-    i18n (1.0.1)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     idn-ruby (0.1.0)
     jasmine (2.99.0)
@@ -77,23 +77,22 @@ GEM
       mini_mime (>= 0.1.1)
     memcachier (0.0.2)
     method_source (0.9.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (1.0.0)
+    mime-types-data (3.2018.0812)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    mongo (2.5.3)
+    mongo (2.6.2)
       bson (>= 4.3.0, < 5.0.0)
-    mongoid (6.4.1)
+    mongoid (6.4.2)
       activemodel (>= 5.1, < 6.0.0)
       mongo (>= 2.5.1, < 3.0.0)
-    multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.8.3)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     oauth (0.5.4)
-    octokit (4.9.0)
+    octokit (4.12.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     omniauth (1.8.1)
       hashie (>= 3.4.6, < 3.6.0)
@@ -106,20 +105,20 @@ GEM
       rack
     phantomjs (2.1.1.0)
     pit (0.0.7)
-    power_assert (1.1.2)
+    power_assert (1.1.3)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    public_suffix (3.0.2)
-    puma (3.11.4)
+    public_suffix (3.0.3)
+    puma (3.12.0)
     pushbullet_ruby (1.1.4)
       faraday (>= 0.13.0, < 1.0)
       mime-types
     rack (2.0.5)
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     racksh (1.0.0)
       rack (>= 1.0)
@@ -127,33 +126,31 @@ GEM
     rake (12.3.1)
     rdtool (0.6.38)
     redcarpet (3.4.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     ruby-debug-ide (0.6.1)
       rake (>= 0.8.1)
     ruby-enum (0.7.2)
       i18n
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    selenium-webdriver (3.12.0)
+    selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
-    sequel (5.9.0)
+    sequel (5.12.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -163,7 +160,7 @@ GEM
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sqlite3 (1.3.13)
-    tdiary (5.0.8)
+    tdiary (5.0.9)
       bundler (~> 1.3)
       emot
       fastimage
@@ -179,13 +176,13 @@ GEM
       twitter-text (>= 2.0)
     tdiary-style-rd (0.0.3)
       rdtool
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
     test-unit (3.2.8)
       power_assert
-    thor (0.18.1)
+    thor (0.19.4)
     thread_safe (0.3.6)
-    tins (0.13.2)
+    tins (1.16.3)
     twitter-text (2.1.0)
       idn-ruby
       unf (~> 0.1.0)

data/public/index.rdf

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="rss.css" type="text/css"?>
+<rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:xhtml="http://www.w3.org/1999/xhtml" xml:lang="ja-JP">
+	<channel rdf:about="http://www.example.com/index.rdf">
+	<title>【日記のタイトル】(→&lt;a href=&quot;update.rb?conf=default&quot;&gt;サイトの情報&lt;/a&gt;で変更しましょう)</title>
+	<link>http://www.example.com/</link>
+	<xhtml:link xhtml:rel="alternate" xhtml:media="handheld" xhtml:type="text/html" xhtml:href="http://www.example.com/" />
+	<description></description>
+	<dc:creator></dc:creator>
+	<dc:rights>Copyright 2018 , copyright of comments by respective authors</dc:rights>
+	<items><rdf:Seq>
+<rdf:li rdf:resource="http://www.example.com/?date=20180402#p01"/>
+<rdf:li rdf:resource="http://www.example.com/?date=20180403#p01"/>
+</rdf:Seq></items>
+</channel>
+<item rdf:about="http://www.example.com/?date=20180402#p01">
+<link>http://www.example.com/?date=20180402#p01</link>
+<xhtml:link xhtml:rel="alternate" xhtml:media="handheld" xhtml:type="text/html" xhtml:href="http://www.example.com/?date=20180402#p01" />
+<dc:date>2018-04-03T16:19:40+09:00</dc:date>
+<title>さて、テストである。</title>
+<dc:creator></dc:creator>
+<description>とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P</description>
+<content:encoded><![CDATA[<h3>さて、テストである。</h3><p>とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P</p>
+<p><a href="http://www.example.com/?date=20180402#c">ツッコミを入れる</a></p>]]></content:encoded>
+</item>
+<item rdf:about="http://www.example.com/?date=20180403#p01">
+<link>http://www.example.com/?date=20180403#p01</link>
+<xhtml:link xhtml:rel="alternate" xhtml:media="handheld" xhtml:type="text/html" xhtml:href="http://www.example.com/?date=20180403#p01" />
+<dc:date>2018-04-03T16:19:39+09:00</dc:date>
+<title>さて、テストである。</title>
+<dc:creator></dc:creator>
+<description>とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P</description>
+<content:encoded><![CDATA[<h3>さて、テストである。</h3><p>とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P</p>
+<p><a href="http://www.example.com/?date=20180403#c">ツッコミを入れる</a></p>]]></content:encoded>
+</item>
+</rdf:RDF>

data/tdiary.conf

@@ -0,0 +1,211 @@
+@data_path = File.expand_path("tmp/data", File.dirname(__FILE__))
+
+@style = 'Wiki'
+@index = './'
+@update = 'update.rb'
+@options['apply_plugin'] = true
+@options['sp.path'] = [
+	'misc/plugin'
+]
+
+@accesskey_enabled = false
+@options['bot'] = [
+	'^BlogLines/',
+	'^blogmap',
+	'MI[CK]AN/',
+	'^NG/',
+	'^samidare',
+	'^TAMATEBAKO/'
+]
+
+@options['sp.selected'] =
+"amazon.rb
+append-css.rb
+calendar2.rb
+category.rb
+comment_mail-smtp.rb
+disp_referrer.rb
+dropdown_calendar.rb
+footnote.rb
+highlight.rb
+image.rb
+jdate.rb
+kw.rb
+makerss.rb
+my-ex.rb
+recent_comment3.rb
+recent_list.rb
+"
+
+@options['dropdown_calendar.label'] = ''
+@options['makerss.file'] = 'index.rdf'
+@options['makerss.no_comments.file'] = 'no_comments.rdf'
+
+@options['spamfilter.bad_comment_patts'] = "(href=|casino|gambling|betting|fastsearch\\.eu\\.com|ganzao|poker|holdem|hold.em|roulette|drug|tramadol|viagra|fioricet|oxycontin|biaxin|aldara|business cards|home depot|slot.?machine|insurance|getblog2|video-game|Good site|internet-all\\.com|deai|tdfms|comu2|omaha)\r\n"
+@options['spamfilter.bad_ip_addrs'] = ""
+@options['spamfilter.bad_mail_patts'] = "(mu@alloha\\.info|mumu2004@mail\\.com|zhongleibo|dfd@12\\.com|anonimous|aol\\.|yahoo\\.|google\\.|hotmail\\.|msn\\.|leroy\\.|ablare\\.|gmx\\.|lorazepam|\\.co$)"
+@options['spamfilter.bad_uri_patts'] = ""
+@options['spamfilter.bad_uri_patts_for_mails'] = false
+@options['spamfilter.debug_file'] = ""
+@options['spamfilter.debug_mode'] = false
+@options['spamfilter.filter_mode'] = true
+@options['spamfilter.max_uris'] = "2"
+@options['spamfilter.resolv_check'] = false
+@options['spamfilter.resolv_check_mode'] = false
+@options['spamlookup.domain.list'] = "bsb.spamlookup.net\r\nmulti.surbl.org\r\nrbl.bulkfeeds.jp"
+@options['spamlookup.safe_domain.list'] = "search.yahoo.co.jp\r\nwww.google.com\r\nwww.google.co.jp\r\nsearch.msn.co.jp"
+
+
+@html_title = %Q[【日記のタイトル】(→<a href="#{@update}?conf=default">サイトの情報</a>で変更しましょう)]
+
+@header = <<HEADER
+<%= navi %>
+<h1><%= @conf.html_title %></h1>
+<div class="main">
+HEADER
+
+@footer = <<FOOTER
+</div>
+<div class="sidebar">
+<div style="text-align: center">
+	<%=calendar2%>
+	<%=calendar%>
+</div>
+
+<h3>最近の日記</h3>
+<%= recent_list %>
+
+<h3>最近のツッコミ</h3>
+<%= recent_comment3 %>
+</div>
+FOOTER
+
+@date_format = '%Y年%m月%d日'
+
+@section_anchor = '<span class="sanchor">_</span>'
+@comment_anchor = '<span class="canchor">_</span>'
+
+@latest_limit = 10
+
+@theme = 'default'
+
+@show_comment = true
+@comment_limit = 3
+
+@show_referer = true
+@referer_day_only = true
+
+@hour_offset = 0
+
+@show_nyear = true
+
+@no_referer = [
+	# Capybara の Referer を変更できないので、リンク元確認のテストのために除外する
+	# '^' + Regexp.quote( base_url ),  # 自分の日記
+	'^http://localhost[:/]',
+	'^http://192\.168\.',
+	'^http://172\.1[6789]',
+	'^http://172\.2[0-9]',
+	'^http://172\.3[01]',
+	'^http://10\.',
+	'^http:/+$',
+	'^http://[^/]+$',
+	'search\\?q=cache:',
+	'^http://cache\.yahoofs\.jp/',
+	'^http://[^\.]+\.alexa\.com/',
+	'^http://www\.hotbot\.com/',
+	'^http://gw\.mobile\.goo\.ne\.jp/',
+	'^http://haro\.jp/rss/',
+	'^https?://(www.)?bloglines.com[/:]',
+	'^http://del\.icio\.us/',
+	'^http://d\.hatena\.ne\.jp/.*/\?of=\d+$',
+	'^http://feedbringer\.net/',
+	'^http://reader\.www\.infoseek\.co\.jp/',
+	'^http://feedpath\.jp/feedreader/',
+	'^http://webryreader\.biglobe\.ne\.jp/',
+	'^http://www\.easythumbs\.com',
+	'^http://www\.shinobi\.jp/',
+	'^http://freerss\.net/',
+	'^http://g\.msn\.com/',
+	'^http://myweb-bookmarks\.com/',
+	'^http://reader\.livedoor\.com/',
+	'^http://wrs\.search\.yahoo\.co\.jp/',
+	'^http://www\.google\.com/reader/',
+	'^http://my\.yahoo\.co\.jp/',
+	'^http://data\.click\.rss\.drecom\.jp/',
+	'^http://i-know\.jp/',
+	'^http://r\.hatena\.ne\.jp/',
+	'^http://reader\.freerss\.net/',
+	'^http://reader\.goo\.ne\.jp/',
+	'^https://enter\.nifty\.com/my/',
+	'/feedshow(cat|cat|all|guide)?\.php',
+]
+
+@no_referer2 = [
+	'(sex|pussy|porn|xxx|rape|nudity|x-pictures|x-stories|pics--movies|teen|shemale|scat|pissing|pantyhose|mature|incest|hentai|bdsm|taboo|bestiality|violence|tits|cocks|peeing|anal|lesbian|shaved|www89.com|casino|poker|gambl|diet|discount|holdem|texas|viagra|betting|insurance|pharmac|phentermin|mortgage|loan|credit-card|hotel|credit|debt|get-sport|available-sport|sport-2u|-doctor|feelor\.com|adoptingcenter|domainthriftstore|payday|rrso|novacspacetravel|pills|radcraft\.com|partyshopcentral|beach-views|alcdrugprogdesign|slot|roulette|craps-table|wsop|ahdb\.com|aahbears\.com|brynmawr|umbc|\.fed\.us|book.?make|searchmee|kasino|tinyurl|wapurl|bimba|polls|fleetairarmarchive|kwiz|viewpoints|\.edu/|adipex|cheap|blackjack|expedia|zwitech|online[a-z]+\.com/|ezboard|ordercialis|financ|craps|baccar|keno|healthcare|portal_member|car.*\.com/$|insure|tropin|pgpgk|humangrowthhormone|hgh-igf|pharma|pill|organic|doctor\.|\.doctor|weight\.|\.weight|\.generic|generic\.|omaha|rxed|cardstud|erection|assuranc|ringtone)',
+]
+
+@only_volatile = [
+]
+
+@only_volatile2 = [
+	'^http://(www|images|translate)\.google\.[^/]+/',
+	'^http://([a-z]+\.)?(search|google|websearch|srd)\.yahoo\.[^/]+/',
+	'^http://(\w+\.)?search\.msn\.[^/]+/',
+	'^http://g\.msn\.com/',
+	'^http://([^\.]+\.)?goo\.ne\.jp/',
+	'^http://(www\.)?infoseek\.[^/]+/[OI]?Titles',
+	'^http://search\.fresheye\.com/',
+	'^http://[^\.]+\.excite\.[^/]+/search',
+	'^http://ask\.jp/',
+	'^http://www\.tocc\.co\.jp/search/',
+	'^http://[^\.]*\.lycos\.[a-z\.]+/',
+	'\.search\.biglobe\.ne\.jp/',
+	'^https?://(search|enter)\.nifty\.com/',
+	'^http://search\.jp\.aol\.com/',
+	'^http://www\.looksmart\.com/',
+	'^http://[^.]*\.naver\.co\.jp/',
+	'^http://allabout\.co\.jp/.*?/extsearch',
+	'^http://www\.isao\.net/search/',
+	'^http://(search-intl|search)\.netscape\.com/',
+	'^http://www\.wisenut\.com/',
+	'^http://www\.search\.com/',
+	'^http://(www|labs)\.ceek\.jp/',
+	'^http://seek\.3721\.com/',
+	'^http://search\.jword\.jp/',
+	'^http://www\.alltheweb\.com/',
+	'searchscout\.com/',
+	'^http://(sf|search)\.livedoor\.com/',
+	'^http://www\.myblog\.jp/',
+	'^http://mixi\.jp/',
+	'^http://aolsearch\.jp\.aol\.com/',
+	'^http://cgi\.search\.biglobe\.ne\.jp/cgi-bin/search2-b',
+	'^http://excite\.co\.jp/search',
+	'^http://so-net\.search\.goo\.ne\.jp/',
+	'^http://www.altavista.com',
+	'^http://1470\.net/mm/',
+	'^http://www\.rojo\.com/',
+	'^http://[br]\.hatena\.ne\.jp/',
+	'^http://r\.zeromemory\.info/',
+	'^http://newsing\.jp/',
+	'^http://clip\.nifty\.com/',
+	'^http://www\.flog\.jp/',
+	'^http://www\.technorati\.jp/',
+	'^http://netnavigate\.net/',
+	'^http://www\.netvibes\.com/',
+]
+
+@referer_table = [
+	['^(.{50}).*$', '\1...'],
+]
+
+@referer_table2 = [
+	['^http://www\.tdiary\.net/.*', 'tDiary.Net'],
+	['^http://sho\.tdiary\.net/(\d{4})(\d\d)(\d\d)\.html', 'ただのにっき(\1-\2-\3)'],
+	['^http://sho\.tdiary\.net/(\d{4})(\d\d)\.html', 'ただのにっき(\1-\2)'],
+	['^http://([^\.]*)\.tdiary\.net/(\d{4})(\d\d)(\d\d)\.html', 'tDiary.Net[\1](\2-\3-\4)'],
+	['^http://([^\.]*)\.tdiary\.net/(\d{4})(\d\d)\.html', 'tDiary.Net[\1](\2-\3)'],
+	['^http://([^\.]*)\.tdiary\.net/.*', 'tDiary.Net[\1]'],
+]
+
+load_cgi_conf