BugTrack/2420 AutoTicketLink - Improve regex and JSON encode

diff --git a/lib/html.php b/lib/html.php
index c91a58e..c35f3ed 100644 (file)
--- a/lib/html.php
+++ b/lib/html.php
@@ -247,7 +247,7 @@ EOS;
                'base_uri_pathname' => get_base_uri(PKWK_URI_ROOT),
                'base_uri_absolute' => get_base_uri(PKWK_URI_ABSOLUTE)
        );
-       $h_props = htmlsc(json_encode($props, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+       $h_props = htmlsc_json($props);
        $site_props = <<<EOS
 <input type="hidden" class="site-props" value="$h_props" />
 EOS;
@@ -273,8 +273,7 @@ EOS;
                }
                array_push($filtered_ticket_link_sites, $s);
        }
-       $h_ticket_link_sites = htmlsc(json_encode($filtered_ticket_link_sites,
-               JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+       $h_ticket_link_sites = htmlsc_json($filtered_ticket_link_sites);
        $ticketlink_data = <<<EOS
 <input type="hidden" class="ticketlink-def" value="$h_ticket_link_sites" />
 EOS;

diff --git a/skin/main.js b/skin/main.js
index 2da085e..a9f8e8d 100644 (file)
--- a/skin/main.js
+++ b/skin/main.js
@@ -124,10 +124,10 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
         var reText = '';
         switch (site.type) {
           case 'jira':
-            reText = '(' + regexEscape(site.key) + '):([A-Z][A-Z0-9_]+-\\d+)';
+            reText = '(' + regexEscape(site.key) + '):([A-Z][A-Z0-9]{1,20}-\\d{1,10})';
             break;
           case 'redmine':
-            reText = '(' + regexEscape(site.key) + '):(\\d+)';
+            reText = '(' + regexEscape(site.key) + '):(\\d{1,10})';
             break;
           case 'git':
             reText = '(' + regexEscape(site.key) + '):([0-9a-f]{7,40})';