From d41337010492252e7f74facd61b73aee0451f290 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Fri, 20 Jul 2012 07:49:07 +0100
Subject: [PATCH] Handling the ignoring of .. path differently

No longer using rtrim
Added as new condition in if statement
---
 files.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files.php b/files.php
index 47ba4ef..a8c8c86 100644
--- a/files.php
+++ b/files.php
@@ -43,12 +43,12 @@ $finalArray = $tempArray =  array();
 
 // To start, push folders from object into finalArray, files into tempArray
 foreach ($objectList as $objectRef) {
-	$fileFolderName = rtrim(substr($objectRef->getPathname(), strlen($path)),"..");
+	$fileFolderName = substr($objectRef->getPathname(), strlen($path));
 	$canAdd = true;
 	for ($i=0;$i<count($ICEcoder["bannedFiles"]);$i++) {
 		if(strpos($fileFolderName,$ICEcoder["bannedFiles"][$i])!==false) {$canAdd = false;}
 	}
-	if ($objectRef->getFilename()!="." && $fileFolderName[strlen($fileFolderName)-1]!="/" && $canAdd) {
+	if ($objectRef->getFilename()!="." && $objectRef->getFilename()!=".." && $fileFolderName[strlen($fileFolderName)-1]!="/" && $canAdd) {
 		$fileFolderName!="/" && is_dir($path.$fileFolderName) ? array_push($finalArray,$fileFolderName) : array_push($tempArray,$fileFolderName);
 	}
 }