Fix changeset linking

The links were not being processed properly.

- Other patterns than the documented ones were matched, e.g.
`c:repo:rev` including leading whitespace if any, `:repo:rev`, etc.,
without a trailing `:`.
- Generated links for above matches are not correct (invalid page),

Fixes #146

Author: dregad

Source/Source.API.php

@@ -416,10 +416,15 @@ function Source_Changeset_Link_Callback( $p_matches ) {
 		$t_repo = SourceRepo::load( $t_changeset->repo_id );
 		$t_vcs = SourceVCS::repo( $t_repo );
 
-		if ($t_url_type == "v") {
-			$t_url = $t_vcs->url_changeset( $t_repo, $t_changeset );
-		} else {
-			$t_url = plugin_page( 'view' ) . '&id=' . $t_changeset->id;
+		switch( $t_url_type ) {
+			case 'v':
+			case 'd':
+				$t_url = $t_vcs->url_changeset( $t_repo, $t_changeset );
+				break;
+			case 'c':
+			case 's':
+			default:
+				$t_url = plugin_page( 'view' ) . '&id=' . $t_changeset->id;
 		}
 
 		$t_name = string_display_line( $t_repo->name . ' ' . $t_vcs->show_changeset( $t_repo, $t_changeset ) );

Source/Source.php

@@ -13,6 +13,15 @@ class SourcePlugin extends MantisPlugin {
 	static $framework_version = '0.18';
 	static $cache = array();
 
+	/**
+	 * Changeset link matching pattern
+	 * format: '<type>:<reponame>:<revision>:', where
+	 * <type> = link type, 'c' or 's' for changeset details, 'd' or 'v' for diff
+	 * <repo> = repository name
+	 * <rev>  = changeset revision ID (e.g. SVN rev number, GIT SHA, etc.)
+	 */
+	const CHANGESET_LINKING_REGEX = '/(?:([cdsv]?):([^:\n\t]+):([^:\n\t\s]+):)/i';
+
 	function register() {
 		$this->name = plugin_lang_get( 'title' );
 		$this->description = plugin_lang_get( 'description' );
@@ -147,7 +156,11 @@ function menu_main() {
 	}
 
 	function display_formatted( $p_event, $p_text, $p_multiline ) {
-		$p_text = preg_replace_callback( '/(?:([sv]):([^:\n\t]+):([^:\n\t\s]+):)/i', 'Source_Changeset_Link_Callback', $p_text );
+		$p_text = preg_replace_callback(
+			self::CHANGESET_LINKING_REGEX,
+			'Source_Changeset_Link_Callback',
+			$p_text
+		);
 		return $p_text;
 	}
 

Source/SourceIntegration.php

@@ -12,7 +12,6 @@ function register() {
 	function hooks() {
 		return array(
 			'EVENT_VIEW_BUG_EXTRA'		=> 'display_bug',
-			'EVENT_DISPLAY_FORMATTED'	=> 'display_formatted',
 			'EVENT_MENU_ISSUE'			=> 'display_changeset_link',
 
 			'EVENT_ACCOUNT_PREF_UPDATE_FORM' => 'account_update_form',
@@ -73,13 +72,6 @@ function display_bug( $p_event, $p_bug_id ) {
 		collapse_end( 'Source' );
 	} #display_bug
 
-	function display_formatted( $p_event, $p_string, $p_multiline ) {
-		$t_string = $p_string;
-		$t_string = preg_replace_callback( '/(\s)c?:([\w ]+):([\w]+)\b/', 'Source_Changeset_Link_Callback',	$t_string );
-
-		return $t_string;
-	}
-
 	/**
 	 * When updating user preferences, allowing the user or admin to specify
 	 * a version control username to be associated with the account.

Source/lang/strings_english.txt

@@ -104,7 +104,7 @@ $s_plugin_Source_show_repo_link = 'Repositories';
 $s_plugin_Source_show_search_link = 'Search';
 $s_plugin_Source_show_repo_stats = 'Repository Statistics';
 $s_plugin_Source_enabled_features = 'Enabled Features';
-$s_plugin_Source_enable_linking = 'Changeset Linking <span class="small">([sv]:&lt;reponame&gt;:&lt;revision&gt;:)</span>';
+$s_plugin_Source_enable_linking = 'Changeset Linking <span class="small">(<em>&lt;type&gt;:&lt;reponame&gt;:&lt;revision&gt;:</em> where &lt;type&gt; = \'s\' for details, \'v\' for diff)</span>';
 $s_plugin_Source_enable_mapping = 'Branch Mappings';
 $s_plugin_Source_enable_resolving = 'Resolve Fixed Issues';
 $s_plugin_Source_enable_message = 'Bug Fixed Message';