Commit: 25637e053d909e3e845894c02ded3bba91b5d2a4 - pukiwiki-fork (git)

Commit MetaInfo

• Revisión: 25637e053d909e3e845894c02ded3bba91b5d2a4 (tree)
• Tiempo: 2019-01-15 01:08:34
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2420 AutoTicketLink - Improve regex and JSON encode

Cambiar Resumen

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

Diferencia incremental

--- 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;

--- 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})';