[phpcvsview-cvs-updates] phpcvsview cvsview.php,1.5,1.6

[Brian C. <bch...@us...>]

Update of /cvsroot/phpcvsview/phpcvsview
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2286

Modified Files:
	cvsview.php 
Log Message:
Completed file revision history view.


Index: cvsview.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/cvsview.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cvsview.php	29 Sep 2004 08:28:34 -0000	1.5
--- cvsview.php	29 Sep 2004 10:59:40 -0000	1.6
***************
*** 73,77 ****
  
  	if ($Seconds > 0) {
! 	    $Result = $Seconds . " Second";
  		if ($DateDiff > 1) {
  		    $Result .= "s";
--- 73,77 ----
  
  	if ($Seconds > 0) {
! 	    $Result = "$Seconds Second";
  		if ($DateDiff > 1) {
  		    $Result .= "s";
***************
*** 79,83 ****
  	}
  	if ($Minutes > 0) {
! 	    $Result = $Minutes . " Minute";
  		if ($Minutes > 1) {
  		    $Result .= "s";
--- 79,83 ----
  	}
  	if ($Minutes > 0) {
! 	    $Result = "$Minutes Minute";
  		if ($Minutes > 1) {
  		    $Result .= "s";
***************
*** 85,92 ****
  	}
  	if ($Hours > 0) {
! 	    $Result = $Hours . " Hour";
  		if ($Hours > 1) {
  		    $Result .= "s";
  		}
  	}
  	if ($Days > 0) {
--- 85,99 ----
  	}
  	if ($Hours > 0) {
! 	    $Result = "$Hours Hour";
  		if ($Hours > 1) {
  		    $Result .= "s";
  		}
+ 		$Minutes = $Minutes % 60;
+ 		if ($Minutes > 0) {
+ 		    $Result .= ", $Minutes Minute";
+ 			if ($Minutes > 1) {
+ 			    $Result .= "s";
+ 			}
+ 		}
  	}
  	if ($Days > 0) {
***************
*** 95,98 ****
--- 102,112 ----
  		    $Result .= "s";
  		}
+ 		$Hours = $Hours % 24;
+ 		if ($Hours > 0) {
+ 		    $Result .= ", $Hours Hour";
+ 			if ($Hours > 1) {
+ 			    $Result .= "s";
+ 			}
+ 		}
  	}
  	if ($Weeks > 0) {
***************
*** 101,104 ****
--- 115,125 ----
  		    $Result .= "s";
  		}
+ 		$Days = $Days % 7;
+ 		if ($Days > 0) {
+ 		    $Result .= ", $Days Day";
+ 			if ($Days > 1) {
+ 			    $Result .= "s";
+ 			}
+ 		}
  	}
  	if ($Years > 0) {
***************
*** 107,110 ****
--- 128,138 ----
  		    $Result .= "s";
  		}
+ 		$Weeks = $Weeks % 52;
+ 		if ($Weeks > 0) {
+ 		    $Result .= ", $Weeks Week";
+ 			if ($Weeks > 1) {
+ 			    $Result .= "s";
+ 			}
+ 		}
  	}
  	return $Result;
***************
*** 191,195 ****
  			echo "    <td align=\"center\" valign=\"center\"><a href=\"$HREF&fh\"><img border=\"0\" src=\"$ScriptPath/images/file.png\"></a></td>\n";
  			echo "    <td><a href=\"$HREF&fh\">".$File["Name"]."</a></td>\n";
! 			echo "    <td align=\"center\"><a href=\"$HREF&fv=1&fr=".$File["Head"]."\">".$File["Head"]."</td>\n";
  			echo "    <td align=\"center\">".$AGE." ago</td>\n";
  			echo "    <td align=\"center\">".$File["Revisions"][$File["Head"]]["author"]."</td>\n";
--- 219,223 ----
  			echo "    <td align=\"center\" valign=\"center\"><a href=\"$HREF&fh\"><img border=\"0\" src=\"$ScriptPath/images/file.png\"></a></td>\n";
  			echo "    <td><a href=\"$HREF&fh\">".$File["Name"]."</a></td>\n";
! 			echo "    <td align=\"center\"><a href=\"$HREF&fv&fr=".$File["Head"]."\">".$File["Head"]."</td>\n";
  			echo "    <td align=\"center\">".$AGE." ago</td>\n";
  			echo "    <td align=\"center\">".$File["Revisions"][$File["Head"]]["author"]."</td>\n";
***************
*** 259,265 ****
  		foreach ($CVSServer->FILES[0]["Revisions"] as $Revision)
  		{
  			echo "<hr>\n";
! 			echo "Revision <b>".$Revision["Revision"]."</b> - (view) (download)<br>\n";
! 			echo "Last Checkin: ".strftime("%A %d %b %Y %T %Z", strtotime($Revision["date"]))." (".CalculateDateDiff(strtotime($Revision["date"]), time())." ago) by ".$Revision["author"]."<br>\n";
  		}
  		
--- 287,309 ----
  		foreach ($CVSServer->FILES[0]["Revisions"] as $Revision)
  		{
+ 			$HREF = str_replace("//", "/", "$ScriptName?mp=$ModPath");
  			echo "<hr>\n";
! 			echo "<b>Revision</b> ".$Revision["Revision"]." -";
! 			echo " (<a href=\"$HREF&fv&fr=".$Revision["Revision"]."\">view</a>)";
! 			echo " (<a href=\"$HREF&fd&fr=".$Revision["Revision"]."\">download</a>)<br>\n";
! 			echo "<b>Last Checkin:</b> ".strftime("%A %d %b %Y %T %Z", strtotime($Revision["date"]))." (".CalculateDateDiff(strtotime($Revision["date"]), time())." ago) by ".$Revision["author"]."<br>\n";
! 			echo "<b>Branch:</b> ".$Revision["Branches"]."<br>\n";
! 			$DateTime = strtotime($Revision["date"]);
! 			echo "<b>Date:</b> ".strftime("%B %d, %Y", $DateTime)."<br>\n";
! 			echo "<b>Time:</b> ".strftime("%H:%M:%S", $DateTime)."<br>\n";
! 			echo "<b>Author:</b> ".$Revision["author"]."<br>\n";
! 			echo "<b>State:</b> ".$Revision["state"]."<br>\n";
! 			echo "<b>Log Message:</b><pre>".$Revision["LogMessage"]."</pre>\n";
! 
! //			if (($i + 1) < $Elements[0]["TotalRevisions"]) {
! //				echo "Changes since ".$Elements[$i+1]["Revision"].": ";
! //			    echo "+".$Elements[$i]["LinesAdd"]." -".$Elements[$i]["LinesSub"]."<br>\n";
! //			} // End of if (($i + 1) < $Elements[0]["TotalRevisions"])
! 
  		}