提交: 95306d1416055e444cb081f352f8e34ae3eaf855 - pukiwiki-fork (git)

Commit MetaInfo

• 修訂: 95306d1416055e444cb081f352f8e34ae3eaf855 (tree)
• 時間: 2017-04-02 15:59:51
• 作者: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

AutoTicketLink: Support hyphen and dot in key

Change Summary

• modified: lib/html.php
• modified: skin/ticketlink.js

差異

--- a/lib/html.php
+++ b/lib/html.php
@@ -210,6 +210,9 @@ function get_html_scripting_data()
 	};
 	$text = '';
 	foreach ($ticket_link_sites as $s) {
+		if (!preg_match('/^([a-zA-Z0-9]+)([\.\-][a-zA-Z0-9]+)*$/', $s['key'])) {
+			continue;
+		}
 		$site_info_json = htmlsc(json_encode($s, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
 		$text .= <<<EOS
   <span class="pukiwiki-ticketlink-site" data-site="$site_info_json"></span>

--- a/skin/ticketlink.js
+++ b/skin/ticketlink.js
@@ -18,16 +18,21 @@ if (window.addEventListener) {
       }
       return '';
     }
+    function regexEscape(key) {
+      return key.replace(/[\-\.]/g, function (m) {
+        return '\\' + m;
+      });
+    }
     function setupSites(siteList) {
       for (var i = 0, length = siteList.length; i < length; i++) {
         var site = siteList[i];
         var reText = '';
         switch (site.type) {
           case 'jira':
-            reText = '(' + site.key + '):' + '([A-Z][A-Z0-9]+-\\d+)';
+            reText = '(' + regexEscape(site.key) + '):' + '([A-Z][A-Z0-9]+-\\d+)';
             break;
           case 'redmine':
-            reText = '(' + site.key + '):' + '(\\d+)';
+            reText = '(' + regexEscape(site.key) + '):' + '(\\d+)';
             break;
           default:
             continue;