From 686a829a7629291eec991c3ccd483f945e4908a2 Mon Sep 17 00:00:00 2001
From: Kazuki Przyborowski <kazuki.przyborowski@gmail.com>
Date: Wed, 4 Jul 2012 08:52:26 +0000
Subject: [PATCH] Changed line ending format for iuntar.php from windows to
 unix.

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@786 2b68903e-0b30-0410-9a39-a2e4f3c5be39
---
 inc/misc/iuntar.php | 338 ++++++++++++++++++++++++++--------------------------
 inc/versioninfo.php |   6 +-
 2 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/inc/misc/iuntar.php b/inc/misc/iuntar.php
index 6c75062..1d576e6 100644
--- a/inc/misc/iuntar.php
+++ b/inc/misc/iuntar.php
@@ -1,170 +1,170 @@
-<?php
-/*
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Revised BSD License.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    Revised BSD License for more details.
- 
-    Copyright 2004-2012 iDB Support - http://idb.berlios.de/
-    Copyright 2004-2012 Game Maker 2k - http://gamemaker2k.org/
-    iUnTar ver. 4.7 by Kazuki Przyborowski & Josep Sanz Campderros
-
-    $FileInfo: iuntar.php - Last Update: 12/30/2011 SVN 781 - Author: cooldude2k $
-*/
-$File3Name = basename($_SERVER['SCRIPT_NAME']);
-if ($File3Name=="iuntar.php"||$File3Name=="/iuntar.php") {
-	require('index.php');
-	exit(); }
-
-// PHP iUnTAR Version 4.7
-// license: Revised BSD license
-// Kazuki Przyborowski (http://ja.gamemaker2k.org/)
-// Josep Sanz Campderros (http://saltos.net/)
-function untar($tarfile,$outdir="./",$chmod=null,$extract=true,$lsonly=false,$findfile=null) {
-$TarSize = filesize($tarfile);
-$TarSizeEnd = $TarSize - 1024;
-if($extract!==true&&$extract!==false) {
-	$extract = false; }
-if($lsonly!==true&&$lsonly!==false) {
-	$lsonly = false; }
-if($extract===true) { 
-	$lsonly = false; }
-if($extract===true) {
-if($outdir!=""&&!file_exists($outdir)) {
-	mkdir($outdir,0777); } }
-$thandle = fopen($tarfile, "rb");
-$i = 0;
-if($extract===false) {
-	$FileArray = null; $i = 0; }
-$outdir = preg_replace('{/$}', '', $outdir)."/";
-if(isset($findfile)) {
-$qfindfile = preg_quote($findfile,"/"); }
-if(!isset($findfile)) {
-$qfindfile = null; }
-while (ftell($thandle)<$TarSizeEnd) {
-	$FileName = null;
-	$FileMode = null;
-	$OwnerID = null;
-	$GroupID = null;
-	$FileSize = null;
-	$LastEdit = null;
-	$Checksum = null;
-	$FileType = null;
-	$LinkedFile = null;
-	$FileContent = null;
-	$FileName = $outdir.trim(fread($thandle,100));
-	fseek($thandle,56,SEEK_CUR);
-	$FileType = trim(fread($thandle,1));
-	fseek($thandle,-57,SEEK_CUR);
-	if($findfile!==null&&$FileType!="L"&&!preg_match("/".$qfindfile."/",$FileName)) {
-		fseek($thandle,8,SEEK_CUR);
-		fseek($thandle,8,SEEK_CUR);
-		fseek($thandle,8,SEEK_CUR);
-		$FileSize = octdec(trim(fread($thandle,12)));
-		fseek($thandle,12,SEEK_CUR);
-		fseek($thandle,8,SEEK_CUR);
-		$FileType = trim(fread($thandle,1));
-		fseek($thandle,100,SEEK_CUR);
-		fseek($thandle,255,SEEK_CUR); 
-		if($FileType=="0"||$FileType=="7") {
-			fseek($thandle,$FileSize,SEEK_CUR); } }
-	if($findfile===null||$FileType=="L"||preg_match("/".$qfindfile."/",$FileName)) {
-	$FileMode = trim(fread($thandle,8));
-	if($chmod===null) {
-		$FileCHMOD = octdec("0".substr($FileMode,-3)); }
-	if($chmod!==null) {
-		$FileCHMOD = $chmod; }
-		$OwnerID = trim(fread($thandle,8));
-		$GroupID = trim(fread($thandle,8));
-		$FileSize = octdec(trim(fread($thandle,12)));
-		$LastEdit = octdec(trim(fread($thandle,12)));
-		$Checksum = octdec(trim(fread($thandle,8)));
-		$FileType = trim(fread($thandle,1));
-		$LinkedFile = trim(fread($thandle,100));
-		fseek($thandle,255,SEEK_CUR); 
-			// LongLink support added by Josep Sanz Campderros
-			if($FileType=="L"&&$FileSize>0) {
-				$FileName = $outdir.trim(fread($thandle,$FileSize));
-				fseek($thandle,512-$FileSize,SEEK_CUR);
-				fseek($thandle,100,SEEK_CUR);
-				$FileMode = trim(fread($thandle,8));
-				if($chmod===null) {
-					$FileCHMOD = octdec("0".substr($FileMode,-3)); }
-				if($chmod!==null) {
-					$FileCHMOD = $chmod; }
-				$OwnerID = trim(fread($thandle,8));
-				$GroupID = trim(fread($thandle,8));
-				$FileSize = octdec(trim(fread($thandle,12)));
-				$LastEdit = trim(fread($thandle,12));
-				$Checksum = trim(fread($thandle,8));
-				$FileType = trim(fread($thandle,1));
-				$LinkedFile = trim(fread($thandle,100));
-				fseek($thandle,255,SEEK_CUR); } }
-		if($findfile===null||preg_match("/".$qfindfile."/",$FileName)) {
-		if($FileType=="0"||$FileType=="7") {
-			if($lsonly===true) {
-			fseek($thandle,$FileSize,SEEK_CUR); }
-			if($lsonly===false) {
-			// Empty files support added by Josep Sanz Campderros
-			if($FileSize===0) {
-			$FileContent = ""; }
-			if($FileSize>0) {
-			$FileContent = fread($thandle,$FileSize); } } }
-		if($FileType=="1") {
-			$FileContent = null; }
-		if($FileType=="2") {
-			$FileContent = null; }
-		if($FileType=="5") {
-			$FileContent = null; }
-		if($FileType=="0"||$FileType=="7") {
-			if($extract===true) {
-				$subhandle = fopen($FileName, "wb+");
-				fwrite($subhandle,$FileContent,$FileSize);
-				fclose($subhandle);
-				chmod($FileName,$FileCHMOD); } }
-		if($FileType=="1") {
-			if($extract===true) {
-				link($FileName,$LinkedFile); } }
-		if($FileType=="2") {
-			if($extract===true) {
-				symlink($LinkedFile,$FileName); } }
-		if($FileType=="5") {
-			if($extract===true) {
-				mkdir($FileName,$FileCHMOD); } }
-		if($FileType=="0"||$FileType=="1"||$FileType=="2"||$FileType=="5"||$FileType=="7") {
-			if($extract===false) { 
-				$FileArray[$i]['FileName'] = $FileName;
-				$FileArray[$i]['FileMode'] = $FileMode;
-				$FileArray[$i]['OwnerID'] = $OwnerID;
-				$FileArray[$i]['GroupID'] = $GroupID;
-				$FileArray[$i]['FileSize'] = $FileSize;
-				$FileArray[$i]['LastEdit'] = $LastEdit;
-				$FileArray[$i]['Checksum'] = $Checksum;
-				$FileArray[$i]['FileType'] = $FileType;
-				$FileArray[$i]['LinkedFile'] = $LinkedFile;
-				if($lsonly===false) {
-				$FileArray[$i]['FileContent'] = $FileContent; } } } }
-		//touch($FileName,$LastEdit);
-		if($extract===false&&$findfile===null&&isset($FileArray[$i]['FileName'])) { ++$i; }
-		if($extract===false) {
-		if($findfile!==null&&preg_match("/".$qfindfile."/",$FileName)&&isset($FileArray[$i]['FileName'])) { ++$i; } }
-		if($extract===true) {
-		if($findfile!==null&&preg_match("/".$qfindfile."/",$FileName)) { ++$i; } }
-		if(($FileType=="0"||$FileType=="7")&$FileSize>0) {
-			$CheckSize = 512;
-			while ($CheckSize<$FileSize) {
-				if($CheckSize<$FileSize) {
-					$CheckSize = $CheckSize + 512; } }
-					$SeekSize = $CheckSize - $FileSize;
-					fseek($thandle,$SeekSize,SEEK_CUR); } }
-		fclose($thandle);
-		if($extract===true) {
-			return true; }
-		if($extract===false) {
-			return $FileArray; } }
-function iuntar($tarfile,$outdir="./",$chmod=null,$extract=true,$lsonly=false,$findfile=null) {
-	return untar($tarfile,$outdir,$chmod,$extract,$lsonly,$findfile); }
+<?php
+/*
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the Revised BSD License.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    Revised BSD License for more details.
+ 
+    Copyright 2004-2012 iDB Support - http://idb.berlios.de/
+    Copyright 2004-2012 Game Maker 2k - http://gamemaker2k.org/
+    iUnTar ver. 4.7 by Kazuki Przyborowski & Josep Sanz Campderros
+
+    $FileInfo: iuntar.php - Last Update: 07/04/2012 SVN 786 - Author: cooldude2k $
+*/
+$File3Name = basename($_SERVER['SCRIPT_NAME']);
+if ($File3Name=="iuntar.php"||$File3Name=="/iuntar.php") {
+	require('index.php');
+	exit(); }
+
+// PHP iUnTAR Version 4.7
+// license: Revised BSD license
+// Kazuki Przyborowski (http://ja.gamemaker2k.org/)
+// Josep Sanz Campderros (http://saltos.net/)
+function untar($tarfile,$outdir="./",$chmod=null,$extract=true,$lsonly=false,$findfile=null) {
+$TarSize = filesize($tarfile);
+$TarSizeEnd = $TarSize - 1024;
+if($extract!==true&&$extract!==false) {
+	$extract = false; }
+if($lsonly!==true&&$lsonly!==false) {
+	$lsonly = false; }
+if($extract===true) { 
+	$lsonly = false; }
+if($extract===true) {
+if($outdir!=""&&!file_exists($outdir)) {
+	mkdir($outdir,0777); } }
+$thandle = fopen($tarfile, "rb");
+$i = 0;
+if($extract===false) {
+	$FileArray = null; $i = 0; }
+$outdir = preg_replace('{/$}', '', $outdir)."/";
+if(isset($findfile)) {
+$qfindfile = preg_quote($findfile,"/"); }
+if(!isset($findfile)) {
+$qfindfile = null; }
+while (ftell($thandle)<$TarSizeEnd) {
+	$FileName = null;
+	$FileMode = null;
+	$OwnerID = null;
+	$GroupID = null;
+	$FileSize = null;
+	$LastEdit = null;
+	$Checksum = null;
+	$FileType = null;
+	$LinkedFile = null;
+	$FileContent = null;
+	$FileName = $outdir.trim(fread($thandle,100));
+	fseek($thandle,56,SEEK_CUR);
+	$FileType = trim(fread($thandle,1));
+	fseek($thandle,-57,SEEK_CUR);
+	if($findfile!==null&&$FileType!="L"&&!preg_match("/".$qfindfile."/",$FileName)) {
+		fseek($thandle,8,SEEK_CUR);
+		fseek($thandle,8,SEEK_CUR);
+		fseek($thandle,8,SEEK_CUR);
+		$FileSize = octdec(trim(fread($thandle,12)));
+		fseek($thandle,12,SEEK_CUR);
+		fseek($thandle,8,SEEK_CUR);
+		$FileType = trim(fread($thandle,1));
+		fseek($thandle,100,SEEK_CUR);
+		fseek($thandle,255,SEEK_CUR); 
+		if($FileType=="0"||$FileType=="7") {
+			fseek($thandle,$FileSize,SEEK_CUR); } }
+	if($findfile===null||$FileType=="L"||preg_match("/".$qfindfile."/",$FileName)) {
+	$FileMode = trim(fread($thandle,8));
+	if($chmod===null) {
+		$FileCHMOD = octdec("0".substr($FileMode,-3)); }
+	if($chmod!==null) {
+		$FileCHMOD = $chmod; }
+		$OwnerID = trim(fread($thandle,8));
+		$GroupID = trim(fread($thandle,8));
+		$FileSize = octdec(trim(fread($thandle,12)));
+		$LastEdit = octdec(trim(fread($thandle,12)));
+		$Checksum = octdec(trim(fread($thandle,8)));
+		$FileType = trim(fread($thandle,1));
+		$LinkedFile = trim(fread($thandle,100));
+		fseek($thandle,255,SEEK_CUR); 
+			// LongLink support added by Josep Sanz Campderros
+			if($FileType=="L"&&$FileSize>0) {
+				$FileName = $outdir.trim(fread($thandle,$FileSize));
+				fseek($thandle,512-$FileSize,SEEK_CUR);
+				fseek($thandle,100,SEEK_CUR);
+				$FileMode = trim(fread($thandle,8));
+				if($chmod===null) {
+					$FileCHMOD = octdec("0".substr($FileMode,-3)); }
+				if($chmod!==null) {
+					$FileCHMOD = $chmod; }
+				$OwnerID = trim(fread($thandle,8));
+				$GroupID = trim(fread($thandle,8));
+				$FileSize = octdec(trim(fread($thandle,12)));
+				$LastEdit = trim(fread($thandle,12));
+				$Checksum = trim(fread($thandle,8));
+				$FileType = trim(fread($thandle,1));
+				$LinkedFile = trim(fread($thandle,100));
+				fseek($thandle,255,SEEK_CUR); } }
+		if($findfile===null||preg_match("/".$qfindfile."/",$FileName)) {
+		if($FileType=="0"||$FileType=="7") {
+			if($lsonly===true) {
+			fseek($thandle,$FileSize,SEEK_CUR); }
+			if($lsonly===false) {
+			// Empty files support added by Josep Sanz Campderros
+			if($FileSize===0) {
+			$FileContent = ""; }
+			if($FileSize>0) {
+			$FileContent = fread($thandle,$FileSize); } } }
+		if($FileType=="1") {
+			$FileContent = null; }
+		if($FileType=="2") {
+			$FileContent = null; }
+		if($FileType=="5") {
+			$FileContent = null; }
+		if($FileType=="0"||$FileType=="7") {
+			if($extract===true) {
+				$subhandle = fopen($FileName, "wb+");
+				fwrite($subhandle,$FileContent,$FileSize);
+				fclose($subhandle);
+				chmod($FileName,$FileCHMOD); } }
+		if($FileType=="1") {
+			if($extract===true) {
+				link($FileName,$LinkedFile); } }
+		if($FileType=="2") {
+			if($extract===true) {
+				symlink($LinkedFile,$FileName); } }
+		if($FileType=="5") {
+			if($extract===true) {
+				mkdir($FileName,$FileCHMOD); } }
+		if($FileType=="0"||$FileType=="1"||$FileType=="2"||$FileType=="5"||$FileType=="7") {
+			if($extract===false) { 
+				$FileArray[$i]['FileName'] = $FileName;
+				$FileArray[$i]['FileMode'] = $FileMode;
+				$FileArray[$i]['OwnerID'] = $OwnerID;
+				$FileArray[$i]['GroupID'] = $GroupID;
+				$FileArray[$i]['FileSize'] = $FileSize;
+				$FileArray[$i]['LastEdit'] = $LastEdit;
+				$FileArray[$i]['Checksum'] = $Checksum;
+				$FileArray[$i]['FileType'] = $FileType;
+				$FileArray[$i]['LinkedFile'] = $LinkedFile;
+				if($lsonly===false) {
+				$FileArray[$i]['FileContent'] = $FileContent; } } } }
+		//touch($FileName,$LastEdit);
+		if($extract===false&&$findfile===null&&isset($FileArray[$i]['FileName'])) { ++$i; }
+		if($extract===false) {
+		if($findfile!==null&&preg_match("/".$qfindfile."/",$FileName)&&isset($FileArray[$i]['FileName'])) { ++$i; } }
+		if($extract===true) {
+		if($findfile!==null&&preg_match("/".$qfindfile."/",$FileName)) { ++$i; } }
+		if(($FileType=="0"||$FileType=="7")&$FileSize>0) {
+			$CheckSize = 512;
+			while ($CheckSize<$FileSize) {
+				if($CheckSize<$FileSize) {
+					$CheckSize = $CheckSize + 512; } }
+					$SeekSize = $CheckSize - $FileSize;
+					fseek($thandle,$SeekSize,SEEK_CUR); } }
+		fclose($thandle);
+		if($extract===true) {
+			return true; }
+		if($extract===false) {
+			return $FileArray; } }
+function iuntar($tarfile,$outdir="./",$chmod=null,$extract=true,$lsonly=false,$findfile=null) {
+	return untar($tarfile,$outdir,$chmod,$extract,$lsonly,$findfile); }
 ?>
\ No newline at end of file
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 6cbbd9f..d7fc669 100644
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2012 iDB Support - http://idb.berlios.de/
     Copyright 2004-2012 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 01/01/2012 SVN 785 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 07/04/2012 SVN 786 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,8 +27,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
 	return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 4; $VER1[2] = 7; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 785;
-$SVNDay[0] = 01; $SVNDay[1] = 01; $SVNDay[2] = 2012; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 786;
+$SVNDay[0] = 07; $SVNDay[1] = 04; $SVNDay[2] = 2012; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $AltName = "RDB"; $AltName2 = "ReneeDB"; $RName = "iDB"; $SFName = "IntDB";
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Renee Discussion Boards"; $AltGM2k = "ReneeDB Team";
 $VerCheckName = "iDB"; $AltVerCheckName = "RDB"; $AltiDBHome = "http://duckduckgo.com/?q=ReneeDB";
-- 
2.11.0