[evolvis-commits] r10162: fixed [#972] SCM Plug in & Unified Diff↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 17:38:59 CET 2011


Author: mirabilos
Date: 2011-02-24 17:38:59 +0100 (Thu, 24 Feb 2011)
New Revision: 10162

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/www/cvsweb.php
Log:
fixed [#972] SCM Plug in & Unified Diff


Modified: trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/www/cvsweb.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/www/cvsweb.php	2011-02-24 16:38:58 UTC (rev 10161)
+++ trunk/gforge_base/evolvisforge-5.1/gforge-plugin-scmcvs/www/cvsweb.php	2011-02-24 16:38:59 UTC (rev 10162)
@@ -19,10 +19,14 @@
 }
 
 $supportedContentTypes = array('text/html', 'text/x-cvsweb-markup');
+$plainTextDiffTypes = array('c', 's', 'u', '');
 
 $contentType = 'text/html';
 if(getStringFromGet('cvsroot') && strpos(getStringFromGet('cvsroot'), ';') === false) {
 	$projectName = getStringFromGet('cvsroot');
+	if(getStringFromGet('r1') && getStringFromGet('r2') && in_array(getStringFromGet('f'), $plainTextDiffTypes)) {
+		$contentType = 'text/plain';
+	}
 } else {
 	$queryString = getStringFromServer('QUERY_STRING');
 	if(preg_match_all('/[;]?([^\?;=]+)=([^;]+)/', $queryString, $matches, PREG_SET_ORDER)) {
@@ -33,6 +37,9 @@
 		if(isset($query['content-type'])) {
 			$contentType = $query['content-type'];
 		}
+		if(isset($query['r1']) && isset($query['r2']) && (!isset($query['f']) || in_array($query['f'], $plainTextDiffTypes))) {
+			$contentType = 'text/plain';
+		}
 	}
 }
 // Remove eventual leading /cvsroot/ or cvsroot/



More information about the evolvis-commits mailing list