Changeset 7573

Timestamp:

Jun 11, 2008, 10:36:15 PM (13 years ago)

Author:

ebihara

Message:

#2634:OPENPNE_USE_PARTIAL_SSL が false の場合は OPENPNE_SSL_URL は見ないようにし、URLが OPENPNE_URL もしくは OPENPNE_SSL_URL からはじまっているかどうかの判定に strpos() を使用するようにした

File:

• OpenPNE/branches/stable-2.12.x/webapp/lib/smarty_plugins/modifier.t_url2a_ktai.php (modified) (2 diffs)

OpenPNE/branches/stable-2.12.x/webapp/lib/smarty_plugins/modifier.t_url2a_ktai.php

@@ -13 +13 @@
 function smarty_modifier_t_url2a_ktai($string)
 {
-    $url_pattern = sprintf('/(%s|%s)(?:index.php)?\?m=pc&a=(\w+)((?:[a-zA-Z0-9_=]|&)*)/', preg_quote(OPENPNE_URL, '/'), preg_quote(OPENPNE_SSL_URL, '/'));
+    $url_pattern = '/https?:\/\/(?:[a-zA-Z0-9_\-\/.,:;~?@=+$%#!()]|&)+/';
     return preg_replace_callback($url_pattern, 'smarty_modifier_t_url2a_ktai_callback', $string);
 }
@@ -19 +19 @@
 function smarty_modifier_t_url2a_ktai_callback($matches)
 {
-    $raw_url    = $matches[0];
-    $host       = $matches[1];
-    $raw_action = $matches[2];
-    $param      = $matches[3];
+    $raw_url = $matches[0];
 
-    //自動リンクのアクションリストにない場合は変換なし
-    if (empty($GLOBALS['_OPENPNE_PC2KTAI_LINK_ACTION_LIST'][$raw_action])) {
+    $openpne_url = '';
+    if (strpos($raw_url, OPENPNE_URL) === 0) {
+        $openpne_url = OPENPNE_URL;
+    } elseif (OPENPNE_USE_PARTIAL_SSL && strpos($raw_url, OPENPNE_SSL_URL) === 0) {
+        $openpne_url = OPENPNE_SSL_URL;
+    }
+
+    if (!$openpne_url) {
         return $raw_url;
     }
 
-    $converted_action = $GLOBALS['_OPENPNE_PC2KTAI_LINK_ACTION_LIST'][$raw_action];
+    $url_pattern = sprintf('/^%s(?:index.php)?\?m=pc&a=(\w+)((?:[a-zA-Z0-9_=]|&)*)$/', preg_quote($openpne_url, '/'));
+
+    $openpne_url_matches = array();
+    if (!preg_match($url_pattern, $raw_url, $openpne_url_matches)) {
+        return $raw_url;
+    }
+    $action = $openpne_url_matches[1];
+    $param = $openpne_url_matches[2];
+
+    //自動リンクのアクションリストにない場合は変換なし
+    if (empty($GLOBALS['_OPENPNE_PC2KTAI_LINK_ACTION_LIST'][$action])) {
+        return $raw_url;
+    }
+
+    $converted_action = $GLOBALS['_OPENPNE_PC2KTAI_LINK_ACTION_LIST'][$action];
     $param = str_replace('&', '&', $param);