Add option to filter commits from feeds using a pattern

Author: xiphux

config/gitphp.conf.php.example

@@ -199,6 +199,17 @@ $gitphp_conf['abbreviateurl'] = false;
  */
 $gitphp_conf['cleanurl'] = false;
 
+/*
+ * feedfilter
+ * Sets a regular expression to use to filter commits out
+ * of the project atom/rss feed.  Commits that have a
+ * commit message matching this pattern will be excluded.
+ * For example, '/GIT_SILENT/' will exclude any commit
+ * with the string GIT_SILENT in the commit message.
+ */
+//$gitphp_conf['feedfilter'] = '/GIT_SILENT/';
+
+
 /*********************************************************
  * Executable/filesystem options
  * Important to check if you're running windows

include/controller/Controller_Feed.class.php

@@ -100,11 +100,9 @@ protected function LoadHeaders()
 	protected function LoadData()
 	{
 		$log = new GitPHP_GitLog($this->GetProject(), $this->GetProject()->GetHeadCommit(), self::MAX_FEED_ITEMS);
-
-		//todo: backport..
-		//if ($this->config->HasKey('feedfilter')) {
-		//	$log->FilterCommits($this->config->GetValue('feedfilter'));
-
+		if ($this->config->HasKey('feedfilter')) {
+			$log->FilterCommits($this->config->GetValue('feedfilter'));
+		}
 		// Don't show commits older than 48 hours, but show a minimum of 20 entries
 		$log->FilterOldCommits(48*60*60, 20);
 

include/git/GitLog.class.php

@@ -164,4 +164,36 @@ public function FilterOldCommits($age, $mini = 0)
 		}
 
 	}
+
+	/**
+	 * Filters out commits matching a certain pattern
+	 *
+	 * @param string $pattern pattern
+	 */
+	public function FilterCommits($pattern)
+	{
+		if (empty($pattern))
+			return;
+
+		if (!$this->dataLoaded) {
+			$this->LoadData();
+		}
+
+		$filtered = false;
+		foreach ($this->hashList as $i => $hash) {
+			$commit = $this->project->GetCommit($hash);
+			$comment = $commit->GetComment();
+			foreach ($comment as $commentline) {
+				if (preg_match($pattern, $commentline)) {
+					unset($this->hashList[$i]);
+					$filtered = true;
+					break;
+				}
+			}
+		}
+
+		if ($filtered) {
+			$this->hashList = array_values($this->hashList);
+		}
+	}
 }