[phpcvsview-cvs-updates] phpcvsview config.php,1.13,1.14 cvsview.php,1.27,1.28 func_ArchiveDownload.php,1.4,1.5 func_DiffFile.php,1.6,1.7 func_DirListing.php,1.12,1.13 func_FileHistory.php,1.14,1.15 func_FileView.php,1.19,1.20 phpcvs.php,1.26,1.27 phpcvsmime.php,1.7,1.8 utils.php,1.9,1.10

[Sijis A. <si...@us...>]

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

Modified Files:
	config.php cvsview.php func_ArchiveDownload.php 
	func_DiffFile.php func_DirListing.php func_FileHistory.php 
	func_FileView.php phpcvs.php phpcvsmime.php utils.php 
Log Message:
- updated copyright year
- minor cosmetic cleanup

Index: phpcvs.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/phpcvs.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** phpcvs.php	27 Nov 2005 00:10:18 -0000	1.26
--- phpcvs.php	3 Jan 2006 01:12:26 -0000	1.27
***************
*** 10,14 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   **/
  
--- 10,14 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   **/
  
***************
*** 83,118 ****
  	 */
  	var $ALLOWED_RESPONSES = array( 
! 		"ok" => "processOk",
! 		"error" => "processError",
! 		"Valid-requests" => "processValidRequests",
! 		"Checked-in" => "processCheckedIn",
! 		"New-entry" => "processNewEntry",
! 		"Checksum" => "processChecksum",
! 		"Copy-file" => "processCopyFile",
! 		"Updated" => "processUpdated",
! 		"Created" => "processCreated",
! 		"Update-existing" => "processUpdateExisting",
! 		"Merged" => "processMerged",
! 		"Patched" => "processPatched",
! 		"Rcs-diff" => "processRcsDiff",
! 		"Mode" => "processMode",
! 		"Mod-time" => "processModTime",
! 		"Removed" => "processRemoved",
! 		"Remove-entry" => "processRemoveEntry",
! 		"Set-static-directory" => "processSetStaticDirectory",
  		"Clear-static-directory" => "processClearStaticDirectory",
! 		"Set-sticky" => "processSetSticky",
! 		"Clear-sticky" => "processClearSticky",
! 		"Template" => "processTemplate",
! 		"Set-checkin-prog" => "processSetCheckinProg",
! 		"Set-update-prog" => "processSetUpdateProg",
! 		"Notified" => "processNotified",
! 		"Module-expansion" => "processModuleExpansion",
! 		"Wrapper-rcsOption" => "processWrapperRcsOption",
! 		"M" => "processM",
! 		"Mbinary" => "processMBinary",
! 		"E" => "processE",
! 		"F" => "processF",
! 		"MT" => "processMT"
  		);
  
--- 83,118 ----
  	 */
  	var $ALLOWED_RESPONSES = array( 
! 		"ok"					=> "processOk",
! 		"error"					=> "processError",
! 		"Valid-requests"		=> "processValidRequests",
! 		"Checked-in"			=> "processCheckedIn",
! 		"New-entry"				=> "processNewEntry",
! 		"Checksum"				=> "processChecksum",
! 		"Copy-file"				=> "processCopyFile",
! 		"Updated"				=> "processUpdated",
! 		"Created"				=> "processCreated",
! 		"Update-existing"		=> "processUpdateExisting",
! 		"Merged"				=> "processMerged",
! 		"Patched"				=> "processPatched",
! 		"Rcs-diff"				=> "processRcsDiff",
! 		"Mode"					=> "processMode",
! 		"Mod-time"				=> "processModTime",
! 		"Removed"				=> "processRemoved",
! 		"Remove-entry"			=> "processRemoveEntry",
! 		"Set-static-directory"	=> "processSetStaticDirectory",
  		"Clear-static-directory" => "processClearStaticDirectory",
! 		"Set-sticky"			=> "processSetSticky",
! 		"Clear-sticky"			=> "processClearSticky",
! 		"Template"				=> "processTemplate",
! 		"Set-checkin-prog"		=> "processSetCheckinProg",
! 		"Set-update-prog"		=> "processSetUpdateProg",
! 		"Notified"				=> "processNotified",
! 		"Module-expansion"		=> "processModuleExpansion",
! 		"Wrapper-rcsOption"		=> "processWrapperRcsOption",
! 		"M"						=> "processM",
! 		"Mbinary"				=> "processMBinary",
! 		"E"						=> "processE",
! 		"F"						=> "processF",
! 		"MT"					=> "processMT"
  		);
  
***************
*** 151,162 ****
  	 * @var array
  	 */
! 	var $FOLDERS = array();
! 	var $FILES = array();				// An array of the files in the current module.
! 	var $CURRENT_FOLDER;				// The current folder we are building up.
! 	var $CURRENT_FILE;					// The current file we are building up.
! 	var $ANNOTATION = array();			// An array of the lines in the file which has been annotated.
! 	var $FILECONTENTS = "";				// A string to store the lines of the file contents in.
! 	var $INITIALISED = false;			// A boolean to indicate whether we have already sent the Root/ValidRequests/ValidResponses.
! 	var $DEBUG = false;					// A boolean to enable/disable debug output
  
  	/**
--- 151,162 ----
  	 * @var array
  	 */
! 	var $FOLDERS			= array();
! 	var $FILES				= array();	// An array of the files in the current module.
! 	var $CURRENT_FOLDER		= "";		// The current folder we are building up.
! 	var $CURRENT_FILE		= "";		// The current file we are building up.
! 	var $ANNOTATION			= array();	// An array of the lines in the file which has been annotated.
! 	var $FILECONTENTS		= "";		// A string to store the lines of the file contents in.
! 	var $INITIALISED		= false;	// A boolean to indicate whether we have already sent the Root/ValidRequests/ValidResponses.
! 	var $DEBUG				= false;	// A boolean to enable/disable debug output
  
  	/**

Index: func_DirListing.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/func_DirListing.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** func_DirListing.php	7 Aug 2005 03:33:35 -0000	1.12
--- func_DirListing.php	3 Jan 2006 01:12:26 -0000	1.13
***************
*** 9,13 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   **/
  
--- 9,13 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   **/
  
***************
*** 28,32 ****
  		$Response = $CVSServer->Authenticate();
  		if ($Response !== true) {
- 
  			echo "<h3>ERROR: ".$Response."</h3>";
  			return;
--- 28,31 ----
***************
*** 39,45 ****
  		if (strlen($env['mod_path']) < 2) {
  			$Modules = $CVSServer->getModuleList();
! 		}
! 		else
! 		{
  			$Modules = false;
  		}
--- 38,42 ----
  		if (strlen($env['mod_path']) < 2) {
  			$Modules = $CVSServer->getModuleList();
! 		} else {
  			$Modules = false;
  		}

Index: func_DiffFile.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/func_DiffFile.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** func_DiffFile.php	15 Apr 2005 05:34:32 -0000	1.6
--- func_DiffFile.php	3 Jan 2006 01:12:26 -0000	1.7
***************
*** 9,13 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   **/
  
--- 9,13 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   **/
  
***************
*** 63,74 ****
  		}
  		$Lines = explode("\n", $FileContents);
! 		foreach ($Lines as $Line) 
! 		{
  			$FilePatching[] = array('mode' => "o", 'text' => $Line);
  		}
  		
  		$linenumber = 0;
! 		while(strpos($DiffLines[$linenumber], "diff") === false)
! 		{
  			$linenumber++;
  		} // while
--- 63,72 ----
  		}
  		$Lines = explode("\n", $FileContents);
! 		foreach ($Lines as $Line) {
  			$FilePatching[] = array('mode' => "o", 'text' => $Line);
  		}
  		
  		$linenumber = 0;
! 		while(strpos($DiffLines[$linenumber], "diff") === false){
  			$linenumber++;
  		} // while
***************
*** 77,84 ****
  		// We now have the line which starts the diff output.
  		$LineOffset = 0;
! 		while($linenumber < count($DiffLines))
! 		{
! 			if (strpos($DiffLines[$linenumber], "a") !== false) 
! 			{
  			    // We have added a line or lines.
  				$Parts = explode("a", $DiffLines[$linenumber]);
--- 75,80 ----
  		// We now have the line which starts the diff output.
  		$LineOffset = 0;
! 		while($linenumber < count($DiffLines)) {
! 			if (strpos($DiffLines[$linenumber], "a") !== false) {
  			    // We have added a line or lines.
  				$Parts = explode("a", $DiffLines[$linenumber]);
***************
*** 86,98 ****
  				$NewLineLocation = explode(",", $Parts[1]);
  				$InsertLength = count($NewLineLocation) == 2 ? $NewLineLocation[1]-$NewLineLocation[0]+1 : 1;
! 				for ($LineCounter = 0; $LineCounter < $InsertLength; $LineCounter++)
! 				{
  					$TempLine = array('mode' => "+", 'text' => substr($DiffLines[++$linenumber], 2));
  					$FilePatching = InsertIntoArray($FilePatching, $TempLine, $InsertLocation[0]+$LineCounter+1);
  					$LineOffset++;
  				}
! 			}
! 			else if (strpos($DiffLines[$linenumber], "c") !== false) 
! 			{
  			    // We have changed a line or lines.
  				$Parts = explode("c", $DiffLines[$linenumber]);
--- 82,91 ----
  				$NewLineLocation = explode(",", $Parts[1]);
  				$InsertLength = count($NewLineLocation) == 2 ? $NewLineLocation[1]-$NewLineLocation[0]+1 : 1;
! 				for ($LineCounter = 0; $LineCounter < $InsertLength; $LineCounter++) {
  					$TempLine = array('mode' => "+", 'text' => substr($DiffLines[++$linenumber], 2));
  					$FilePatching = InsertIntoArray($FilePatching, $TempLine, $InsertLocation[0]+$LineCounter+1);
  					$LineOffset++;
  				}
! 			} else if (strpos($DiffLines[$linenumber], "c") !== false) {
  			    // We have changed a line or lines.
  				$Parts = explode("c", $DiffLines[$linenumber]);
***************
*** 102,107 ****
  				$NewFileLocation = explode(",", $Parts[1]);
  				$NewLineLength = count($NewFileLocation) == 2 ? $NewFileLocation[1]-$NewFileLocation[0]+1 : 1;
! 				for ($LineCounter = 0; $LineCounter < $InsertLength; $LineCounter++)
! 				{
  					if ($LineCounter < $NewLineLength) {
  						$linenumber++;
--- 95,99 ----
  				$NewFileLocation = explode(",", $Parts[1]);
  				$NewLineLength = count($NewFileLocation) == 2 ? $NewFileLocation[1]-$NewFileLocation[0]+1 : 1;
! 				for ($LineCounter = 0; $LineCounter < $InsertLength; $LineCounter++) {
  					if ($LineCounter < $NewLineLength) {
  						$linenumber++;
***************
*** 112,124 ****
  					$FilePatching[$InsertLocation[0]-2+$LineCounter+$LineOffset]['mode'] = '-';
  				}
! 				for ($LineCounter = $InsertLength; $LineCounter < $NewLineLength; $LineCounter++)
! 				{
  					$linenumber++;
  					$TempLine = array('mode' => "+", 'text' => substr($DiffLines[$linenumber], 2));
  					$FilePatching = InsertIntoArray($FilePatching, $TempLine, $InsertLocation[0]+$LineCounter+$LineOffset);
  				}
! 			}
! 			else if (strpos($DiffLines[$linenumber], "d") !== false) 
! 			{
  			    // we have removed a line or lines.
  				$Parts = explode("d", $DiffLines[$linenumber]);
--- 104,113 ----
  					$FilePatching[$InsertLocation[0]-2+$LineCounter+$LineOffset]['mode'] = '-';
  				}
! 				for ($LineCounter = $InsertLength; $LineCounter < $NewLineLength; $LineCounter++) {
  					$linenumber++;
  					$TempLine = array('mode' => "+", 'text' => substr($DiffLines[$linenumber], 2));
  					$FilePatching = InsertIntoArray($FilePatching, $TempLine, $InsertLocation[0]+$LineCounter+$LineOffset);
  				}
! 			} else if (strpos($DiffLines[$linenumber], "d") !== false) {
  			    // we have removed a line or lines.
  				$Parts = explode("d", $DiffLines[$linenumber]);
***************
*** 126,131 ****
  				$OldLineLocation = explode(",", $Parts[1]);
  				$DeleteLength = count($DeleteLocation) == 2 ? $DeleteLocation[1]-$DeleteLocation[0]+1 : 1;
! 				for ($LineCounter = 0; $LineCounter < $DeleteLength; $LineCounter++)
! 				{
  					$FilePatching[$OldLineLocation[0]+$LineCounter+$LineOffset]['mode'] = '-';
  					$LineOffset++;
--- 115,119 ----
  				$OldLineLocation = explode(",", $Parts[1]);
  				$DeleteLength = count($DeleteLocation) == 2 ? $DeleteLocation[1]-$DeleteLocation[0]+1 : 1;
! 				for ($LineCounter = 0; $LineCounter < $DeleteLength; $LineCounter++) {
  					$FilePatching[$OldLineLocation[0]+$LineCounter+$LineOffset]['mode'] = '-';
  					$LineOffset++;
***************
*** 138,143 ****
  		$search = array("<", ">", "\n", "\t", " ");
  		$replace = array("&lt;", "&gt;", "", "&nbsp;&nbsp;&nbsp;&nbsp;", "&nbsp;");
! 		foreach ($FilePatching as $Line)
! 		{
  			echo '	<p class="';
  			switch($Line['mode']){
--- 126,130 ----
  		$search = array("<", ">", "\n", "\t", " ");
  		$replace = array("&lt;", "&gt;", "", "&nbsp;&nbsp;&nbsp;&nbsp;", "&nbsp;");
! 		foreach ($FilePatching as $Line) {
  			echo '	<p class="';
  			switch($Line['mode']){

Index: func_FileView.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/func_FileView.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** func_FileView.php	15 Apr 2005 05:36:04 -0000	1.19
--- func_FileView.php	3 Jan 2006 01:12:26 -0000	1.20
***************
*** 9,13 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   * 
   * Thanks To:
--- 9,13 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   * 
   * Thanks To:
***************
*** 50,56 ****
  			fclose($fd);
  		}
! 	}
! 	else
! 	{
  		// Connect to the CVS server.
  		if ($CVSServer->Connect() === true) {
--- 50,54 ----
  			fclose($fd);
  		}
! 	} else {
  		// Connect to the CVS server.
  		if ($CVSServer->Connect() === true) {
***************
*** 99,105 ****
  				echo $hlcontent;
  				echo '</p>';
! 			}
! 			else
! 			{
  				$search = array('<', '>', '\n', '\t');
  				$replace = array('&lt;', '&gt;', '', ' ');
--- 97,101 ----
  				echo $hlcontent;
  				echo '</p>';
! 			} else {
  				$search = array('<', '>', '\n', '\t');
  				$replace = array('&lt;', '&gt;', '', ' ');
***************
*** 113,119 ****
  						fwrite($fd, "<pre>\n");
  					}
! 				}
! 				else
! 				{
  					$fd = false;
  				}
--- 109,113 ----
  						fwrite($fd, "<pre>\n");
  					}
! 				} else {
  					$fd = false;
  				}

Index: config.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/config.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** config.php	18 Feb 2005 10:29:42 -0000	1.13
--- config.php	3 Jan 2006 01:12:26 -0000	1.14
***************
*** 9,35 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   **/
  
  // CVSROOT configuration.
  /* phpCVSView Source Repository */
! $config['cvs']['phpCVSView']['server'] = "cvs.sourceforge.net";
! $config['cvs']['phpCVSView']['cvsroot'] = "/cvsroot/phpcvsview";
! $config['cvs']['phpCVSView']['username'] = "anonymous";
! $config['cvs']['phpCVSView']['password'] = "";
! $config['cvs']['phpCVSView']['mode'] = "pserver";
! $config['cvs']['phpCVSView']['description'] = "PHP based CVS Repository Viewer";
! $config['cvs']['phpCVSView']['html_title'] = "phpCVSView Source Code Library";
! $config['cvs']['phpCVSView']['html_header'] = "phpCVSView Source Code Library";
  
  /* phpCVSView Source Repository */
! $config['cvs']['RPak']['server'] = "bcheese.homeip.net";
! $config['cvs']['RPak']['cvsroot'] = "/cvsroot/mstsrpak";
! $config['cvs']['RPak']['username'] = "anonymous";
! $config['cvs']['RPak']['password'] = "";
! $config['cvs']['RPak']['mode'] = "pserver";
! $config['cvs']['RPak']['description'] = "MS Train Sim Route Packaging System";
! $config['cvs']['RPak']['html_title'] = "RPak Source Code Library";
! $config['cvs']['RPak']['html_header'] = "RPak Source Code Library";
  
  // Default CVSROOT configuration to use.
--- 9,35 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   **/
  
  // CVSROOT configuration.
  /* phpCVSView Source Repository */
! $config['cvs']['phpCVSView']['server']		= "cvs.sourceforge.net";
! $config['cvs']['phpCVSView']['cvsroot']		= "/cvsroot/phpcvsview";
! $config['cvs']['phpCVSView']['username']	= "anonymous";
! $config['cvs']['phpCVSView']['password']	= "";
! $config['cvs']['phpCVSView']['mode']		= "pserver";
! $config['cvs']['phpCVSView']['description']	= "PHP based CVS Repository Viewer";
! $config['cvs']['phpCVSView']['html_title']	= "phpCVSView Source Code Library";
! $config['cvs']['phpCVSView']['html_header']	= "phpCVSView Source Code Library";
  
  /* phpCVSView Source Repository */
! $config['cvs']['RPak']['server']			= "bcheese.homeip.net";
! $config['cvs']['RPak']['cvsroot']			= "/cvsroot/mstsrpak";
! $config['cvs']['RPak']['username']			= "anonymous";
! $config['cvs']['RPak']['password']			= "";
! $config['cvs']['RPak']['mode']				= "pserver";
! $config['cvs']['RPak']['description']		= "MS Train Sim Route Packaging System";
! $config['cvs']['RPak']['html_title']		= "RPak Source Code Library";
! $config['cvs']['RPak']['html_header']		= "RPak Source Code Library";
  
  // Default CVSROOT configuration to use.
***************
*** 40,46 ****
  
  // Setup whether to use GeSHi project code for syntax highlighting or not.
! $config['GeSHi']['Enable'] = true;
! $config['GeSHi']['Path'] = "geshi";
! $config['GeSHi']['HighlightersPath'] = "geshi/geshi";
  
  // The default language
--- 40,46 ----
  
  // Setup whether to use GeSHi project code for syntax highlighting or not.
! $config['GeSHi']['Enable']				= true;
! $config['GeSHi']['Path']				= "geshi";
! $config['GeSHi']['HighlightersPath']	= "geshi/geshi";
  
  // The default language
***************
*** 51,56 ****
  
  // Settings for Output Cache.
! $config['Cache']['Enable'] = true;
! $config['Cache']['Location'] = "/tmp/phpCVSViewCache";
  
  ?>
--- 51,56 ----
  
  // Settings for Output Cache.
! $config['Cache']['Enable']		= true;
! $config['Cache']['Location']	= "/tmp/phpCVSViewCache";
  
  ?>

Index: utils.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/utils.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** utils.php	4 Feb 2005 11:03:13 -0000	1.9
--- utils.php	3 Jan 2006 01:12:26 -0000	1.10
***************
*** 9,13 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   **/
  
--- 9,13 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   **/
  
***************
*** 23,33 ****
  	global $lang;
  
! 	$date['date_diff'] = $DateLater - $DateEarlier;
! 	$date['seconds'] = $date['date_diff'];
! 	$date['minutes'] = floor($date['seconds']/60);
! 	$date['hours'] = floor($date['minutes']/60);
! 	$date['days'] = floor($date['hours']/24);
! 	$date['weeks'] = floor($date['days']/7);
! 	$date['years'] = floor($date['days']/365);
  
  	// displays seconds
--- 23,33 ----
  	global $lang;
  
! 	$date['date_diff']	= $DateLater - $DateEarlier;
! 	$date['seconds']	= $date['date_diff'];
! 	$date['minutes']	= floor($date['seconds']/60);
! 	$date['hours']		= floor($date['minutes']/60);
! 	$date['days']		= floor($date['hours']/24);
! 	$date['weeks']		= floor($date['days']/7);
! 	$date['years']		= floor($date['days']/365);
  
  	// displays seconds
***************
*** 92,97 ****
  {
  	$RetVal = "";
! 	for ($Counter = 0; $Counter <= $Number; $Counter++)
! 	{
  		if ($Dirs[$Counter] != "") {
  			$RetVal .= $Seperator . $Dirs[$Counter];
--- 92,96 ----
  {
  	$RetVal = "";
! 	for ($Counter = 0; $Counter <= $Number; $Counter++){
  		if ($Dirs[$Counter] != "") {
  			$RetVal .= $Seperator . $Dirs[$Counter];
***************
*** 162,169 ****
  function InsertIntoArray($Array, $Value, $Position)
  {
! 	if (!is_array($Array)) {return $Array;}
! 	$Last = array_splice($Array, $Position);
! 	$Array[] = $Value;
! 	$Array = array_merge($Array, $Last);
  	return $Array;
  }
--- 161,170 ----
  function InsertIntoArray($Array, $Value, $Position)
  {
! 	if (!is_array($Array)) { return $Array; }
! 
! 	$Last		= array_splice($Array, $Position);
! 	$Array[]	= $Value;
! 	$Array		= array_merge($Array, $Last);
! 
  	return $Array;
  }

Index: phpcvsmime.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/phpcvsmime.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** phpcvsmime.php	7 Aug 2005 03:33:35 -0000	1.7
--- phpcvsmime.php	3 Jan 2006 01:12:26 -0000	1.8
***************
*** 9,13 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   */
  
--- 9,13 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   */
  
***************
*** 18,175 ****
   * @name $MIME_TYPES
   */
  global $MIME_TYPES;
!  
  $MIME_TYPES = array(
! 	'ez' => 'application/andrew-inset',
! 	'hqx' => 'application/mac-binhex40',
! 	'cpt' => 'application/mac-compactpro',
! 	'doc' => 'application/msword',
! 	'bin' => 'application/octet-stream',
! 	'dms' => 'application/octet-stream',
! 	'lha' => 'application/octet-stream',
! 	'lzh' => 'application/octet-stream',
! 	'exe' => 'application/octet-stream',
! 	'class' => 'application/octet-stream',
! 	'so' => 'application/octet-stream',
! 	'dll' => 'application/octet-stream',
! 	'oda' => 'application/oda',
! 	'pdf' => 'application/pdf',
! 	'ai' => 'application/postscript',
! 	'eps' => 'application/postscript',
! 	'ps' => 'application/postscript',
! 	'smi' => 'application/smil',
! 	'smil' => 'application/smil',
! 	'mif' => 'application/vnd.mif',
! 	'xls' => 'application/vnd.ms-excel',
! 	'ppt' => 'application/vnd.ms-powerpoint',
! 	'wbxml' => 'application/vnd.wap.wbxml',
! 	'wmlc' => 'application/vnd.wap.wmlc',
! 	'wmlsc' => 'application/vnd.wap.wmlscriptc',
! 	'bcpio' => 'application/x-bcpio',
! 	'vcd' => 'application/x-cdlink',
! 	'pgn' => 'application/x-chess-pgn',
! 	'cpio' => 'application/x-cpio',
! 	'csh' => 'application/x-csh',
! 	'dcr' => 'application/x-director',
! 	'dir' => 'application/x-director',
! 	'dxr' => 'application/x-director',
! 	'dvi' => 'application/x-dvi',
! 	'spl' => 'application/x-futuresplash',
! 	'gtar' => 'application/x-gtar',
! 	'hdf' => 'application/x-hdf',
! 	'php' => 'application/x-httpd-php',
! 	'php4' => 'application/x-httpd-php',
! 	'php3' => 'application/x-httpd-php',
! 	'phtml' => 'application/x-httpd-php',
! 	'phps' => 'application/x-httpd-php-source',
! 	'js' => 'application/x-javascript',
! 	'skp' => 'application/x-koan',
! 	'skd' => 'application/x-koan',
! 	'skt' => 'application/x-koan',
! 	'skm' => 'application/x-koan',
! 	'latex' => 'application/x-latex',
! 	'nc' => 'application/x-netcdf',
! 	'cdf' => 'application/x-netcdf',
! 	'crl' => 'application/x-pkcs7-crl',
! 	'sh' => 'application/x-sh',
! 	'shar' => 'application/x-shar',
! 	'swf' => 'application/x-shockwave-flash',
! 	'sit' => 'application/x-stuffit',
! 	'sv4cpio' => 'application/x-sv4cpio',
! 	'sv4crc' => 'application/x-sv4crc',
! 	'tar' => 'application/x-tar',
! 	'tgz' => 'application/x-tar',
! 	'tcl' => 'application/x-tcl',
! 	'tex' => 'application/x-tex',
! 	'texinfo' => 'application/x-texinfo',
! 	'texi' => 'application/x-texinfo',
! 	't' => 'application/x-troff',
! 	'tr' => 'application/x-troff',
! 	'roff' => 'application/x-troff',
! 	'man' => 'application/x-troff-man',
! 	'me' => 'application/x-troff-me',
! 	'ms' => 'application/x-troff-ms',
! 	'ustar' => 'application/x-ustar',
! 	'src' => 'application/x-wais-source',
! 	'crt' => 'application/x-x509-ca-cert',
! 	'xhtml' => 'application/xhtml+xml',
! 	'xht' => 'application/xhtml+xml',
! 	'zip' => 'application/zip',
! 	'au' => 'audio/basic',
! 	'snd' => 'audio/basic',
! 	'mid' => 'audio/midi',
! 	'midi' => 'audio/midi',
! 	'kar' => 'audio/midi',
! 	'mpga' => 'audio/mpeg',
! 	'mp2' => 'audio/mpeg',
! 	'mp3' => 'audio/mpeg',
! 	'aif' => 'audio/x-aiff',
! 	'aiff' => 'audio/x-aiff',
! 	'aifc' => 'audio/x-aiff',
! 	'm3u' => 'audio/x-mpegurl',
! 	'ram' => 'audio/x-pn-realaudio',
! 	'rm' => 'audio/x-pn-realaudio',
! 	'rpm' => 'audio/x-pn-realaudio-plugin',
! 	'ra' => 'audio/x-realaudio',
! 	'wav' => 'audio/x-wav',
! 	'pdb' => 'chemical/x-pdb',
! 	'xyz' => 'chemical/x-xyz',
! 	'bmp' => 'image/bmp',
! 	'gif' => 'image/gif',
! 	'ief' => 'image/ief',
! 	'jpeg' => 'image/jpeg',
! 	'jpg' => 'image/jpeg',
! 	'jpe' => 'image/jpeg',
! 	'png' => 'image/png',
! 	'tiff' => 'image/tiff',
! 	'tif' => 'image/tiff',
! 	'djvu' => 'image/vnd.djvu',
! 	'djv' => 'image/vnd.djvu',
! 	'wbmp' => 'image/vnd.wap.wbmp',
! 	'wbmp' => 'image/vnd.wap.wbmp',
! 	'ras' => 'image/x-cmu-raster',
! 	'pnm' => 'image/x-portable-anymap',
! 	'pbm' => 'image/x-portable-bitmap',
! 	'pgm' => 'image/x-portable-graymap',
! 	'ppm' => 'image/x-portable-pixmap',
! 	'rgb' => 'image/x-rgb',
! 	'xbm' => 'image/x-xbitmap',
! 	'xpm' => 'image/x-xpixmap',
! 	'xwd' => 'image/x-xwindowdump',
! 	'igs' => 'model/iges',
! 	'iges' => 'model/iges',
! 	'msh' => 'model/mesh',
! 	'mesh' => 'model/mesh',
! 	'silo' => 'model/mesh',
! 	'wrl' => 'model/vrml',
! 	'vrml' => 'model/vrml',
! 	'css' => 'text/css',
! 	'html' => 'text/html',
! 	'htm' => 'text/html',
! 	'shtml' => 'text/html',
! 	'jsp' => 'text/html',
! 	'asc' => 'text/plain',
! 	'txt' => 'text/plain',
! 	'rtx' => 'text/richtext',
! 	'rtf' => 'text/rtf',
! 	'sgml' => 'text/sgml',
! 	'sgm' => 'text/sgml',
! 	'tsv' => 'text/tab-separated-values',
! 	'wml' => 'text/vnd.wap.wml',
! 	'wml' => 'text/vnd.wap.wml',
! 	'wmls' => 'text/vnd.wap.wmlscript',
! 	'wmls' => 'text/vnd.wap.wmlscript',
! 	'etx' => 'text/x-setext',
! 	'xml' => 'text/xml',
! 	'xsl' => 'text/xml',
! 	'mpeg' => 'video/mpeg',
! 	'mpg' => 'video/mpeg',
! 	'mpe' => 'video/mpeg',
! 	'qt' => 'video/quicktime',
! 	'mov' => 'video/quicktime',
! 	'mxu' => 'video/vnd.mpegurl',
! 	'avi' => 'video/x-msvideo',
! 	'movie' => 'video/x-sgi-movie',
! 	'ice' => 'x-conference/x-cooltalk'
  );
  
--- 18,176 ----
   * @name $MIME_TYPES
   */
+ 
  global $MIME_TYPES;
! 
  $MIME_TYPES = array(
! 	'ez'	=> 'application/andrew-inset',
! 	'hqx'	=> 'application/mac-binhex40',
! 	'cpt'	=> 'application/mac-compactpro',
! 	'doc'	=> 'application/msword',
! 	'bin'	=> 'application/octet-stream',
! 	'dms'	=> 'application/octet-stream',
! 	'lha'	=> 'application/octet-stream',
! 	'lzh'	=> 'application/octet-stream',
! 	'exe'	=> 'application/octet-stream',
! 	'class'	=> 'application/octet-stream',
! 	'so'	=> 'application/octet-stream',
! 	'dll'	=> 'application/octet-stream',
! 	'oda'	=> 'application/oda',
! 	'pdf'	=> 'application/pdf',
! 	'ai'	=> 'application/postscript',
! 	'eps'	=> 'application/postscript',
! 	'ps'	=> 'application/postscript',
! 	'smi'	=> 'application/smil',
! 	'smil'	=> 'application/smil',
! 	'mif'	=> 'application/vnd.mif',
! 	'xls'	=> 'application/vnd.ms-excel',
! 	'ppt'	=> 'application/vnd.ms-powerpoint',
! 	'wbxml'	=> 'application/vnd.wap.wbxml',
! 	'wmlc'	=> 'application/vnd.wap.wmlc',
! 	'wmlsc'	=> 'application/vnd.wap.wmlscriptc',
! 	'bcpio'	=> 'application/x-bcpio',
! 	'vcd'	=> 'application/x-cdlink',
! 	'pgn'	=> 'application/x-chess-pgn',
! 	'cpio'	=> 'application/x-cpio',
! 	'csh'	=> 'application/x-csh',
! 	'dcr'	=> 'application/x-director',
! 	'dir'	=> 'application/x-director',
! 	'dxr'	=> 'application/x-director',
! 	'dvi'	=> 'application/x-dvi',
! 	'spl'	=> 'application/x-futuresplash',
! 	'gtar'	=> 'application/x-gtar',
! 	'hdf'	=> 'application/x-hdf',
! 	'php'	=> 'application/x-httpd-php',
! 	'php4'	=> 'application/x-httpd-php',
! 	'php3'	=> 'application/x-httpd-php',
! 	'phtml'	=> 'application/x-httpd-php',
! 	'phps'	=> 'application/x-httpd-php-source',
! 	'js'	=> 'application/x-javascript',
! 	'skp'	=> 'application/x-koan',
! 	'skd'	=> 'application/x-koan',
! 	'skt'	=> 'application/x-koan',
! 	'skm'	=> 'application/x-koan',
! 	'latex'	=> 'application/x-latex',
! 	'nc'	=> 'application/x-netcdf',
! 	'cdf'	=> 'application/x-netcdf',
! 	'crl'	=> 'application/x-pkcs7-crl',
! 	'sh'	=> 'application/x-sh',
! 	'shar'	=> 'application/x-shar',
! 	'swf'	=> 'application/x-shockwave-flash',
! 	'sit'	=> 'application/x-stuffit',
! 	'sv4cpio'	=> 'application/x-sv4cpio',
! 	'sv4crc'	=> 'application/x-sv4crc',
! 	'tar'	=> 'application/x-tar',
! 	'tgz'	=> 'application/x-tar',
! 	'tcl'	=> 'application/x-tcl',
! 	'tex'	=> 'application/x-tex',
! 	'texinfo'	=> 'application/x-texinfo',
! 	'texi'	=> 'application/x-texinfo',
! 	't'		=> 'application/x-troff',
! 	'tr'	=> 'application/x-troff',
! 	'roff'	=> 'application/x-troff',
! 	'man'	=> 'application/x-troff-man',
! 	'me'	=> 'application/x-troff-me',
! 	'ms'	=> 'application/x-troff-ms',
! 	'ustar'	=> 'application/x-ustar',
! 	'src'	=> 'application/x-wais-source',
! 	'crt'	=> 'application/x-x509-ca-cert',
! 	'xhtml'	=> 'application/xhtml+xml',
! 	'xht'	=> 'application/xhtml+xml',
! 	'zip'	=> 'application/zip',
! 	'au'	=> 'audio/basic',
! 	'snd'	=> 'audio/basic',
! 	'mid'	=> 'audio/midi',
! 	'midi'	=> 'audio/midi',
! 	'kar'	=> 'audio/midi',
! 	'mpga'	=> 'audio/mpeg',
! 	'mp2'	=> 'audio/mpeg',
! 	'mp3'	=> 'audio/mpeg',
! 	'aif'	=> 'audio/x-aiff',
! 	'aiff'	=> 'audio/x-aiff',
! 	'aifc'	=> 'audio/x-aiff',
! 	'm3u'	=> 'audio/x-mpegurl',
! 	'ram'	=> 'audio/x-pn-realaudio',
! 	'rm'	=> 'audio/x-pn-realaudio',
! 	'rpm'	=> 'audio/x-pn-realaudio-plugin',
! 	'ra'	=> 'audio/x-realaudio',
! 	'wav'	=> 'audio/x-wav',
! 	'pdb'	=> 'chemical/x-pdb',
! 	'xyz'	=> 'chemical/x-xyz',
! 	'bmp'	=> 'image/bmp',
! 	'gif'	=> 'image/gif',
! 	'ief'	=> 'image/ief',
! 	'jpeg'	=> 'image/jpeg',
! 	'jpg'	=> 'image/jpeg',
! 	'jpe'	=> 'image/jpeg',
! 	'png'	=> 'image/png',
! 	'tiff'	=> 'image/tiff',
! 	'tif'	=> 'image/tiff',
! 	'djvu'	=> 'image/vnd.djvu',
! 	'djv'	=> 'image/vnd.djvu',
! 	'wbmp'	=> 'image/vnd.wap.wbmp',
! 	'wbmp'	=> 'image/vnd.wap.wbmp',
! 	'ras'	=> 'image/x-cmu-raster',
! 	'pnm'	=> 'image/x-portable-anymap',
! 	'pbm'	=> 'image/x-portable-bitmap',
! 	'pgm'	=> 'image/x-portable-graymap',
! 	'ppm'	=> 'image/x-portable-pixmap',
! 	'rgb'	=> 'image/x-rgb',
! 	'xbm'	=> 'image/x-xbitmap',
! 	'xpm'	=> 'image/x-xpixmap',
! 	'xwd'	=> 'image/x-xwindowdump',
! 	'igs'	=> 'model/iges',
! 	'iges'	=> 'model/iges',
! 	'msh'	=> 'model/mesh',
! 	'mesh'	=> 'model/mesh',
! 	'silo'	=> 'model/mesh',
! 	'wrl'	=> 'model/vrml',
! 	'vrml'	=> 'model/vrml',
! 	'css'	=> 'text/css',
! 	'html'	=> 'text/html',
! 	'htm'	=> 'text/html',
! 	'shtml'	=> 'text/html',
! 	'jsp'	=> 'text/html',
! 	'asc'	=> 'text/plain',
! 	'txt'	=> 'text/plain',
! 	'rtx'	=> 'text/richtext',
! 	'rtf'	=> 'text/rtf',
! 	'sgml'	=> 'text/sgml',
! 	'sgm'	=> 'text/sgml',
! 	'tsv'	=> 'text/tab-separated-values',
! 	'wml'	=> 'text/vnd.wap.wml',
! 	'wml'	=> 'text/vnd.wap.wml',
! 	'wmls'	=> 'text/vnd.wap.wmlscript',
! 	'wmls'	=> 'text/vnd.wap.wmlscript',
! 	'etx'	=> 'text/x-setext',
! 	'xml'	=> 'text/xml',
! 	'xsl'	=> 'text/xml',
! 	'mpeg'	=> 'video/mpeg',
! 	'mpg'	=> 'video/mpeg',
! 	'mpe'	=> 'video/mpeg',
! 	'qt'	=> 'video/quicktime',
! 	'mov'	=> 'video/quicktime',
! 	'mxu'	=> 'video/vnd.mpegurl',
! 	'avi'	=> 'video/x-msvideo',
! 	'movie'	=> 'video/x-sgi-movie',
! 	'ice'	=> 'x-conference/x-cooltalk'
  );
  

Index: func_ArchiveDownload.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/func_ArchiveDownload.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** func_ArchiveDownload.php	27 Nov 2005 00:18:28 -0000	1.4
--- func_ArchiveDownload.php	3 Jan 2006 01:12:26 -0000	1.5
***************
*** 9,13 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   **/
   
--- 9,13 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   **/
   
***************
*** 38,43 ****
  		$Files = $CVSServer->FILES;
  		
! 		foreach ($Folders as $folder)
! 		{
  			if ($folder["Name"] != "Attic") {
  			    DAProcessDirectory($ReposLoc.$folder["Name"]."/", $BasePath."/".$folder["Name"]);
--- 38,42 ----
  		$Files = $CVSServer->FILES;
  		
! 		foreach ($Folders as $folder) {
  			if ($folder["Name"] != "Attic") {
  			    DAProcessDirectory($ReposLoc.$folder["Name"]."/", $BasePath."/".$folder["Name"]);
***************
*** 46,51 ****
  		}
  		
! 		foreach ($Files as $file)
! 		{
  			$CVSServer->ExportFile($ReposLoc.$file["Name"], time());
  			$filehandle = fopen($BasePath."/".$file["Name"], "wb");
--- 45,49 ----
  		}
  		
! 		foreach ($Files as $file) {
  			$CVSServer->ExportFile($ReposLoc.$file["Name"], time());
  			$filehandle = fopen($BasePath."/".$file["Name"], "wb");

Index: func_FileHistory.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/func_FileHistory.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** func_FileHistory.php	16 Apr 2005 02:23:01 -0000	1.14
--- func_FileHistory.php	3 Jan 2006 01:12:26 -0000	1.15
***************
*** 9,13 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   **/
  
--- 9,13 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   **/
  
***************
*** 44,47 ****
--- 44,48 ----
  			$HREF = str_replace('//', '/', $env['script_name'].'?mp='.$env['mod_path']);
  			$DateTime = strtotime($Revision["date"]);
+ 
  			echo '<hr />'."\n";
  			//echo '<a name="rd'.$DateTime.'" />&nbsp;</a>'."\n";
***************
*** 50,55 ****
  			echo ' (<a href="'.$HREF.'&amp;fv&amp;dt='.$DateTime.'">'.$lang['view'].'</a>)';
  			echo ' (<a href="'.$HREF.'&amp;fd&amp;dt='.$DateTime.'">'.$lang['download'].'</a>)';
! 			if (isset($Revision["PrevRevision"]))
! 			{
  				if ($Revision["PrevRevision"] != '') {
  					echo ' (<a href="'.$HREF.'&amp;df&amp;r1='.$Revision["PrevRevision"].'&amp;r2=';
--- 51,56 ----
  			echo ' (<a href="'.$HREF.'&amp;fv&amp;dt='.$DateTime.'">'.$lang['view'].'</a>)';
  			echo ' (<a href="'.$HREF.'&amp;fd&amp;dt='.$DateTime.'">'.$lang['download'].'</a>)';
! 
! 			if (isset($Revision["PrevRevision"])){
  				if ($Revision["PrevRevision"] != '') {
  					echo ' (<a href="'.$HREF.'&amp;df&amp;r1='.$Revision["PrevRevision"].'&amp;r2=';
***************
*** 64,67 ****
--- 65,69 ----
  			echo '	<p><b>'.$lang['author'].'</b> '.$Revision["author"].'</p>'."\n";
  			echo '	<p><b>'.$lang['state'].'</b> '.$Revision["state"].'</p>'."\n";
+ 
  			if (isset($Revision["PrevRevision"]))
                          {

Index: cvsview.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/cvsview.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** cvsview.php	7 Aug 2005 03:33:35 -0000	1.27
--- cvsview.php	3 Jan 2006 01:12:26 -0000	1.28
***************
*** 9,13 ****
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2005 Brian A Cheeseman
   */
  
--- 9,13 ----
   * @author Brian A Cheeseman <bch...@us...>
   * @version $Id$
!  * @copyright 2003-2006 Brian A Cheeseman
   */
  
***************
*** 20,26 ****
  	global $HTTP_ENV_VARS;
  	$_ENVIRON = $HTTP_ENV_VARS;
! }
! else
! {
  	$_ENVIRON = $_ENV;
  }
--- 20,24 ----
  	global $HTTP_ENV_VARS;
  	$_ENVIRON = $HTTP_ENV_VARS;
! } else {
  	$_ENVIRON = $_ENV;
  }
***************
*** 35,40 ****
  $env['mod_path'] = str_replace("//", "/", $env['mod_path']);
  
! $env['language_path'] = 'languages/';
! $env['theme_path'] = 'Themes/';
  
  // check if cookie exist, if so use cookie, otherwise use config value
--- 33,38 ----
  $env['mod_path'] = str_replace("//", "/", $env['mod_path']);
  
! $env['language_path']	= 'languages/';
! $env['theme_path']		= 'Themes/';
  
  // check if cookie exist, if so use cookie, otherwise use config value
***************
*** 51,59 ****
  	$env['mod_path'] = "/";
  	unset($_GET["fh"]);
!         unset($_GET["fa"]);
!         unset($_GET["fv"]);
!         unset($_GET["fd"]);
!         unset($_GET["df"]);
!         unset($_GET["dp"]);
  	$env['CVSROOT'] = $_GET["cr"];
  	// Set cookie with theme info. This cookie is set to expire 1 year from today.
--- 49,57 ----
  	$env['mod_path'] = "/";
  	unset($_GET["fh"]);
! 	unset($_GET["fa"]);
! 	unset($_GET["fv"]);
! 	unset($_GET["fd"]);
! 	unset($_GET["df"]);
! 	unset($_GET["dp"]);
  	$env['CVSROOT'] = $_GET["cr"];
  	// Set cookie with theme info. This cookie is set to expire 1 year from today.