From b366e471977fbbee880487b2bc57959e0d3ddc8e Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Sun, 7 Jul 2013 15:25:32 +0100
Subject: [PATCH] Condensing code, only need $renamed once

---
 lib/file-control.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/file-control.php b/lib/file-control.php
index 24cb4a4..ae604fb 100644
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -147,7 +147,7 @@ if ($_GET['action']=="upload") {
 			}  
 
 			public function upload($current,$uploadFile){ 
-				if(move_uploaded_file($current->tmp_name,$uploadFile)){  
+				if(move_uploaded_file($current->tmp_name,$uploadFile)){
 					return true;  
 				}  
 			}  
@@ -176,17 +176,14 @@ if ($_GET['action']=="upload") {
 
 // If we're due to rename a file/folder...
 if ($_GET['action']=="rename") {
+	$renamed=false;
 	if (!$demoMode && is_writable($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])))) {
 		if(rename($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])),$docRoot.$fileLoc."/".$fileName)) {
 			// Reload file manager
 			echo 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean($_GET['oldFileName'])).'\');';
 			echo 'action="rename";';
 			$renamed=true;
-		} else {
-			$renamed=false;
 		}
-	} else {
-		$renamed=false;
 	}
 	if (!$renamed) {
 		echo "action='nothing'; top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."\\n\\nMaybe public write permissions needed on this or parent folder?');";