Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/MantisSourceBase.class.php
	SourceCgit/SourceCgit.php
	SourceGithub/SourceGithub.php
	SourceGitlab/SourceGitlab.php
	SourceGitphp/SourceGitphp.php
	SourceGitweb/SourceGitweb.php

Author: dregad

README.md

@@ -0,0 +1,93 @@
+<?php
+
+# Copyright (c) 2017 Damien Regad
+# Licensed under the MIT license
+
+require_once( 'MantisSourcePlugin.class.php' );
+
+/**
+ * Class MantisSourceGitBasePlugin
+ *
+ * Base class providing common methods for all git-based Source Integration
+ * Plugin classes.
+ *
+ */
+abstract class MantisSourceGitBasePlugin extends MantisSourcePlugin
+{
+	/**
+	 * Git branch name validation regex.
+	 * Based on rules defined in man page
+	 * http://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
+	 */
+	private $valid_branch_regex = '%'
+		# Must not start with '/'; cannot contain '/.', '//', '@{' or '\';
+		# cannot be a single '@'.
+		. '^(?!/|.*([/.]\.|//|@\{|\\\\)|@$)'
+		# One or more chars, except the following: ASCII control, space,
+		# tilde, caret, colon, question mark, asterisk, open bracket.
+		. '[^\000-\037\177 ~^:?*[]+'
+		# Must not end with '.lock', '/' or '.'
+		. '(?<!\.lock|[/.])$'
+		. '%';
+
+	/**
+	 * Error constants
+	 */
+	const ERROR_INVALID_BRANCH = 'invalid_branch';
+
+	/**
+	 * Define plugin's Error strings
+	 * @return array
+	 */
+	public function errors() {
+		$t_errors_list = array(
+			self::ERROR_INVALID_BRANCH,
+		);
+
+		foreach( $t_errors_list as $t_error ) {
+			$t_errors[$t_error] = plugin_lang_get( 'error_' . $t_error, 'Source' );
+		}
+
+		return $t_errors;
+	}
+
+	/**
+	 * Determines if given string name is a valid git branch name.
+	 * @param string $p_branch Branch name to validate
+	 * @return bool True if valid
+	 */
+	protected function is_branch_valid( $p_branch )
+	{
+		return (bool)preg_match( $this->valid_branch_regex, $p_branch );
+	}
+
+	/**
+	 * Triggers an error if the branch is invalid
+	 * @param string $p_branch Branch name to validate
+	 * @return void
+	 */
+	protected function ensure_branch_valid( $p_branch )
+	{
+		if( !$this->is_branch_valid( $p_branch ) ) {
+			error_parameters( $p_branch );
+			plugin_error( self::ERROR_INVALID_BRANCH );
+		}
+	}
+
+	/**
+	 * Validates a comma-delimited list of git branches.
+	 * Triggers an ERROR_INVALID_BRANCH if one of the branches is invalid
+	 * @param string $p_list Comma-delimited list of branch names (or '*')
+	 * @return void
+	 */
+	protected function validate_branch_list( $p_list )
+	{
+		if( $p_list == '*' ) {
+			return;
+		}
+
+		foreach( explode( ',', $p_list ) as $t_branch ) {
+			$this->ensure_branch_valid( trim( $t_branch ) );
+		}
+	}
+}

Source/MantisSourceGitBasePlugin.class.php

@@ -927,7 +927,7 @@ function save() {
 				db_param() . ', ' . db_param() . ' )';
 			db_query( $t_query, array(
 				$this->repo_id, $this->revision, $this->parent, $this->branch,
-				$this->user_id, $this->timestamp, $this->author, $this->message, $this->info,
+				$this->user_id, $this->timestamp, $this->author, db_mysql_fix_utf8( $this->message ), $this->info,
 				$this->ported, $this->author_email, $this->committer, $this->committer_email,
 				$this->committer_id ) );
 

Source/Source.API.php

@@ -13,6 +13,8 @@ class SourcePlugin extends MantisSourceBase {
 
 	static $cache = array();
 
+	const PLUGIN_VERSION = self::FRAMEWORK_VERSION;
+
 	/**
 	 * Changeset link matching pattern.
 	 * format: '<type>:<reponame>:<revision>:', where
@@ -28,7 +30,7 @@ function register() {
 		$this->name = plugin_lang_get( 'title' );
 		$this->description = plugin_lang_get( 'description' );
 
-		$this->version = self::FRAMEWORK_VERSION;
+		$this->version = self::PLUGIN_VERSION;
 		$this->requires = array(
 			'MantisCore' => self::MANTIS_VERSION,
 		);

Source/Source.php

@@ -147,3 +147,4 @@ $s_plugin_Source_import_full_failed = 'Full repository data importing failed.';
 
 $s_plugin_Source_changeset_column_title = 'C';
 
+$s_plugin_Source_error_invalid_branch = 'Invalid characters in Branch name "%1$s".';

Source/lang/strings_english.txt

@@ -144,3 +144,5 @@ $s_plugin_Source_import_latest_failed = 'Partieller Import des Projektarchivs fe
 $s_plugin_Source_import_full_failed = 'Vollständiger Import des Projektarchivs fehlgeschlagen.';
 
 $s_plugin_Source_changeset_column_title = 'C';
+
+$s_plugin_Source_error_invalid_branch = 'Ungültige Zeichen in der Zweige "%1$s"';