Commit: 1e344a1b777fe54bbd9d25407c803ca3f9418c35 - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• Revision: 1e344a1b777fe54bbd9d25407c803ca3f9418c35 (tree)
• Zeit: 2011-11-05 13:45:59
• Autor: nbuy <nbuy@704c...>
• Commiter: nbuy

Log Message

fix URI string accept class define RFC 1738

git-svn-id: https://xoopscube.svn.sourceforge.net/svnroot/xoopscube/Package_Legacy/trunk@1036 704cf05f-ae62-4b0e-a484-234ee0250e75

Ändern Zusammenfassung

• modified: html/modules/legacy/kernel/Legacy_TextFilter.class.php

Diff

--- a/html/modules/legacy/kernel/Legacy_TextFilter.class.php
+++ b/html/modules/legacy/kernel/Legacy_TextFilter.class.php
@@ -254,11 +254,13 @@ class Legacy_TextFilter extends XCube_TextFilter
 	}
 
 	function makeClickableConvertTable(&$patterns, &$replacements) {
-		$patterns[] = "/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i";
+		// URI accept class ref. RFC 1738 (but not strict here)
+		$hpath = "[-_.!~*\'()a-z0-9;\/?:\@&=+\$,%#]+";
+		$patterns[] = "/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/($hpath)/i";
 		$replacements[] = "\\1<a href=\"\\2://\\3\" rel=\"external\">\\2://\\3</a>";
-		$patterns[] = "/(^|[^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i";
+		$patterns[] = "/(^|[^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.($hpath)/i";
 		$replacements[] = "\\1<a href=\"http://www.\\2.\\3\" rel=\"external\">www.\\2.\\3</a>";
-		$patterns[] = "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i";
+		$patterns[] = "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.($hpath)/i";
 		$replacements[] = "\\1<a href=\"ftp://ftp.\\2.\\3\" rel=\"external\">ftp.\\2.\\3</a>";
 		$patterns[] = "/(^|[^]_a-z0-9-=\"'\/:\.])([a-z0-9\-_\.]+?)@([a-z0-9!#\$%&'\*\+\-\/=\?^_\`{\|}~\.]+)/i";
 		$replacements[] = "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>";