0))
return $rev;
$rev = strtoupper($rev);
switch($rev)
{
case "HEAD":
case "PREV":
case "COMMITTED":
return $rev;
}
return "HEAD";
}
$svnrep = new SVNRepository($rep);
// Retrieve the request information
$path1 = @$_REQUEST["compare"][0];
$path2 = @$_REQUEST["compare"][1];
$rev1 = @$_REQUEST["compare_rev"][0];
$rev2 = @$_REQUEST["compare_rev"][1];
// Some page links put the revision with the path...
if (strpos($path1, "@")) list($path1, $rev1) = explode("@", $path1);
if (strpos($path2, "@")) list($path2, $rev2) = explode("@", $path2);
$rev1 = checkRevision($rev1);
$rev2 = checkRevision($rev2);
// Choose a sensible comparison order unless told not to
if (!@$_REQUEST["manualorder"] && is_numeric($rev1) && is_numeric($rev2))
{
if ($rev1 > $rev2)
{
$temppath = $path1;
$temprev = $rev1;
$path1 = $path2;
$rev1 = $rev2;
$path2 = $temppath;
$rev2 = $temprev;
}
}
$url = $config->getURL($rep, "/", "comp");
$vars["revlink"] = "${lang["REVCOMP"]}";
if ($rev1 == 0) $rev1 = "HEAD";
if ($rev2 == 0) $rev2 = "HEAD";
$vars["repname"] = $rep->getDisplayName();
$vars["action"] = $lang["PATHCOMPARISON"];
$vars["compare_form"] = "";
# safe paths are a hack for fixing XSS sploit
$vars["path1"] = $path1;
$vars['safepath1'] = htmlentities($path1);
$vars["path2"] = $path2;
$vars['safepath2'] = htmlentities($path2);
$vars["rev1"] = $rev1;
$vars["rev2"] = $rev2;
$noinput = empty($path1) || empty($path2);
$listing = array();
// Generate the diff listing
$path1 = encodepath(str_replace(DIRECTORY_SEPARATOR, "/", $svnrep->repConfig->path.$path1));
$path2 = encodepath(str_replace(DIRECTORY_SEPARATOR, "/", $svnrep->repConfig->path.$path2));
$debug = false;
if (!$noinput)
{
$rawcmd = $config->svn." diff ".$rep->svnParams().quote($path1."@".$rev1)." ".quote($path2."@".$rev2);
$cmd = quoteCommand($rawcmd, true);
if ($debug) echo "$cmd\n";
}
function clearVars()
{
global $listing, $index;
$listing[$index]["newpath"] = null;
$listing[$index]["endpath"] = null;
$listing[$index]["info"] = null;
$listing[$index]["diffclass"] = null;
$listing[$index]["difflines"] = null;
$listing[$index]["enddifflines"] = null;
$listing[$index]["properties"] = null;
}
$vars["success"] = false;
if (!$noinput)
{
if ($diff = popen($cmd, "r"))
{
$index = 0;
$indiff = false;
$indiffproper = false;
$getLine = true;
$node = null;
$vars["success"] = true;
while (!feof($diff))
{
if ($getLine)
$line = fgets($diff);
clearVars();
$getLine = true;
if ($debug) print "Line = '$line'
" ;
if ($indiff)
{
// If we're in a diff proper, just set up the line
if ($indiffproper)
{
if ($line[0] == " " || $line[0] == "+" || $line[0] == "-")
{
switch ($line[0])
{
case " ":
$listing[$index]["diffclass"] = "diff";
$subline = hardspace(replaceEntities(rtrim(substr($line, 1)), $rep));
if (empty($subline)) $subline = " ";
$listing[$index++]["line"] = $subline;
if ($debug) print "Including as diff: $subline
";
break;
case "+":
$listing[$index]["diffclass"] = "diffadded";
$subline = hardspace(replaceEntities(rtrim(substr($line, 1)), $rep));
if (empty($subline)) $subline = " ";
$listing[$index++]["line"] = $subline;
if ($debug) print "Including as added: $subline
";
break;
case "-":
$listing[$index]["diffclass"] = "diffdeleted";
$subline = hardspace(replaceEntities(rtrim(substr($line, 1)), $rep));
if (empty($subline)) $subline = " ";
$listing[$index++]["line"] = $subline;
if ($debug) print "Including as removed: $subline
";
break;
}
continue;
}
else
{
$indiffproper = false;
$listing[$index++]["enddifflines"] = true;
$getLine = false;
if ($debug) print "Ending lines
";
continue;
}
}
// Check for the start of a new diff area
if (!strncmp($line, "@@", 2))
{
$pos = strpos($line, "+");
$posline = substr($line, $pos);
sscanf($posline, "+%d,%d", $sline, $eline);
if ($debug) print "sline = '$sline', eline = '$eline'
";
// Check that this isn't a file deletion
if ($sline == 0 && $eline == 0)
{
$line = fgets($diff);
if ($debug) print "Ignoring: $line
" ;
while ($line[0] == " " || $line[0] == "+" || $line[0] == "-")
{
$line = fgets($diff);
if ($debug) print "Ignoring: $line
" ;
}
$getLine = false;
if ($debug) print "Unignoring previous - marking as deleted";
$listing[$index++]["info"] = $lang["FILEDELETED"];
}
else
{
$listing[$index++]["difflines"] = $line;
$indiffproper = true;
}
continue;
}
else
{
$indiff = false;
if ($debug) print "Ending diff";
}
}
// Check for a new node entry
if (strncmp(trim($line), "Index: ", 7) == 0)
{
// End the current node
if ($node)
{
$listing[$index++]["endpath"] = true;
clearVars();
}
$node = trim($line);
$node = substr($node, 7);
$listing[$index]["newpath"] = $node;
if ($debug) echo "Creating node $node
";
// Skip past the line of ='s
$line = fgets($diff);
if ($debug) print "Skipping: $line
" ;
// Check for a file addition
$line = fgets($diff);
if ($debug) print "Examining: $line
" ;
if (strpos($line, "(revision 0)"))
$listing[$index]["info"] = $lang["FILEADDED"];
if (strncmp(trim($line), "Cannot display:", 15) == 0)
{
$index++;
clearVars();
$listing[$index++]["info"] = $line;
continue;
}
// Skip second file info
$line = fgets($diff);
if ($debug) print "Skipping: $line
" ;
$indiff = true;
$index++;
continue;
}
if (strncmp(trim($line), "Property changes on: ", 21) == 0)
{
$propnode = trim($line);
$propnode = substr($propnode, 21);
if ($debug) print "Properties on $propnode (cur node $ $node)";
if ($propnode != $node)
{
if ($node)
{
$listing[$index++]["endpath"] = true;
clearVars();
}
$node = $propnode;
$listing[$index++]["newpath"] = $node;
clearVars();
}
$listing[$index++]["properties"] = true;
clearVars();
if ($debug) echo "Creating node $node
";
// Skip the row of underscores
$line = fgets($diff);
if ($debug) print "Skipping: $line
" ;
while ($line = trim(fgets($diff)))
{
$listing[$index++]["info"] = $line;
clearVars();
}
continue;
}
// Check for error messages
if (strncmp(trim($line), "svn: ", 5) == 0)
{
$listing[$index++]["info"] = urldecode($line);
$vars["success"] = false;
continue;
}
$listing[$index++]["info"] = $line;
}
if ($node)
{
clearVars();
$listing[$index++]["endpath"] = true;
}
if ($debug) print_r($listing);
}
}
$vars["version"] = $version;
if (!$rep->hasUnrestrictedReadAccess($path1) || !$rep->hasUnrestrictedReadAccess($path2, false))
$vars["noaccess"] = true;
parseTemplate($rep->getTemplatePath()."header.tmpl", $vars, $listing);
parseTemplate($rep->getTemplatePath()."compare.tmpl", $vars, $listing);
parseTemplate($rep->getTemplatePath()."footer.tmpl", $vars, $listing);
?>