Softbank携帯のSSLが正常に動かない問題を修正

diff --git a/app/helpers/base_helper.rb b/app/helpers/base_helper.rb
index 0eb6ab3..3687ea3 100644 (file)
--- a/app/helpers/base_helper.rb
+++ b/app/helpers/base_helper.rb
@@ -415,20 +415,20 @@ def link_to_mobile(name, options = {}, html_options = nil)
       9 => '',
       0 => '',
     }
-    if request.mobile.is_a?(Jpmobile::Mobile::Softbank)
-      h = {
-        1 => '\e$F<\ f',
-        2 => '\e$F=\ f',
-        3 => '\e$F>\ f',
-        4 => '\e$F?\ f',
-        5 => '\e$F@\ f',
-        6 => '\e$FA\ f',
-        7 => '\e$FB\ f',
-        8 => '\e$FC\ f',
-        9 => '\e$FD\ f',
-        0 => '\e$FE\ f',
-      }
-    end
+#    if request.mobile.is_a?(Jpmobile::Mobile::Softbank)
+#      h = {
+#        1 => '\e$F<\ f',
+#        2 => '\e$F=\ f',
+#        3 => '\e$F>\ f',
+#        4 => '\e$F?\ f',
+#        5 => '\e$F@\ f',
+#        6 => '\e$FA\ f',
+#        7 => '\e$FB\ f',
+#        8 => '\e$FC\ f',
+#        9 => '\e$FD\ f',
+#        0 => '\e$FE\ f',
+#      }
+#   end
     h[accesskey] + link_to(name, options, html_options)
   else
     link_to(name, options, html_options)

diff --git a/config/initializers/jpmobile_override.rb b/config/initializers/jpmobile_override.rb
index 1bdedf7..517998a 100644 (file)
--- a/config/initializers/jpmobile_override.rb
+++ b/config/initializers/jpmobile_override.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 # override vender/plugins/jpmobile/lib/jpmobile/filter.rb
 module Jpmobile
@@ -5,7 +6,7 @@ module Jpmobile
     module Emoticon
       class Outer < Base
         include ApplyOnlyForMobile
-        def to_external(str, controller, use_webcode=true)
+        def to_external(str, controller, use_webcode=false)
           table = nil
           to_sjis = false
           case controller.request.mobile

diff --git a/lib/check_session_signature.rb b/lib/check_session_signature.rb
index f88a376..bace607 100644 (file)
--- a/lib/check_session_signature.rb
+++ b/lib/check_session_signature.rb
@@ -13,7 +13,7 @@ module CheckSessionSignature
     signature = Zlib.crc32([request.env['HTTP_USER_AGENT'].to_s,
                             request.env['HTTP_X_MSIM_USE'].to_s,
                             request.env['HTTP_X_UP_SUBNO'].to_s,
-                            request.env['HTTP_X_JPHONE_UID'].to_s,
+                            #request.env['HTTP_X_JPHONE_UID'].to_s,
                             ].join('\1'))
     session[:_signature] ||= signature
     session_key = ActionController::Base.session_options.merge(request.session_options || {})[:key]