From a911251367eb3294380aee4b473347822dc0d381 Mon Sep 17 00:00:00 2001
From: Chris Martin <cgmartin@gmail.com>
Date: Thu, 3 Jan 2013 15:15:42 -0500
Subject: [PATCH] Change RenameUpload filter use_upload_name option default to
 a safer setting

---
 library/Zend/Filter/File/RenameUpload.php     |  6 ++----
 .../ZendTest/Filter/File/RenameUploadTest.php | 19 ++++---------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/library/Zend/Filter/File/RenameUpload.php b/library/Zend/Filter/File/RenameUpload.php
index 70ba8497e9d..5c66e1ea0f6 100644
--- a/library/Zend/Filter/File/RenameUpload.php
+++ b/library/Zend/Filter/File/RenameUpload.php
@@ -25,7 +25,7 @@ class RenameUpload extends AbstractFilter
      */
     protected $options = array(
         'target'          => null,
-        'use_upload_name' => true,
+        'use_upload_name' => false,
         'overwrite'       => false,
         'randomize'       => false,
     );
@@ -42,8 +42,6 @@ public function __construct($targetOrOptions)
         } else {
             $this->setTarget($targetOrOptions);
         }
-
-
     }
 
     /**
@@ -145,7 +143,7 @@ public function filter($value)
         } else {
             $uploadData = array(
                 'tmp_name' => $value,
-                'name' => $value,
+                'name'     => $value,
             );
             $sourceFile = $value;
         }
diff --git a/tests/ZendTest/Filter/File/RenameUploadTest.php b/tests/ZendTest/Filter/File/RenameUploadTest.php
index 56ab478e780..7d116a3df24 100644
--- a/tests/ZendTest/Filter/File/RenameUploadTest.php
+++ b/tests/ZendTest/Filter/File/RenameUploadTest.php
@@ -130,7 +130,6 @@ public function tearDown()
     public function testThrowsExceptionWithNonUploadedFile()
     {
         $filter = new FileRenameUpload($this->_newFile);
-        $filter->setUseUploadName(false);
         $this->assertEquals($this->_newFile, $filter->getTarget());
         $this->assertEquals('falsefile', $filter('falsefile'));
         $this->setExpectedException(
@@ -165,18 +164,18 @@ public function testOptions()
     {
         $filter = new FileRenameUpload($this->_newFile);
         $this->assertEquals($this->_newFile, $filter->getTarget());
-        $this->assertTrue($filter->getUseUploadName());
+        $this->assertFalse($filter->getUseUploadName());
         $this->assertFalse($filter->getOverwrite());
         $this->assertFalse($filter->getRandomize());
 
         $filter = new FileRenameUpload(array(
             'target'          => $this->_oldFile,
-            'use_upload_name' => false,
+            'use_upload_name' => true,
             'overwrite'       => true,
             'randomize'       => true,
         ));
         $this->assertEquals($this->_oldFile, $filter->getTarget());
-        $this->assertFalse($filter->getUseUploadName());
+        $this->assertTrue($filter->getUseUploadName());
         $this->assertTrue($filter->getOverwrite());
         $this->assertTrue($filter->getRandomize());
     }
@@ -189,7 +188,6 @@ public function testStringConstructorParam()
         $this->setUpMockMoveUploadedFile();
 
         $filter = new FileRenameUpload($this->_newFile);
-        $filter->setUseUploadName(false);
         $this->assertEquals($this->_newFile, $filter->getTarget());
         $this->assertEquals($this->_newFile, $filter($this->_oldFile));
         $this->assertEquals('falsefile', $filter('falsefile'));
@@ -225,10 +223,7 @@ public function testArrayConstructorParam()
         $this->setUpMockMoveUploadedFile();
 
         $filter = new FileRenameUpload(array(
-            'target'          => $this->_newFile,
-            'use_upload_name' => false,
-            'overwrite'       => false,
-            'randomize'       => false,
+            'target' => $this->_newFile,
         ));
         $this->assertEquals($this->_newFile, $filter->getTarget());
         $this->assertEquals($this->_newFile, $filter($this->_oldFile));
@@ -241,7 +236,6 @@ public function testArrayConstructorParam()
     public function testConstructTruncatedTarget()
     {
         $filter = new FileRenameUpload('*');
-        $filter->setUseUploadName(false);
         $this->assertEquals('*', $filter->getTarget());
         $this->assertEquals($this->_oldFile, $filter($this->_oldFile));
         $this->assertEquals('falsefile', $filter('falsefile'));
@@ -255,7 +249,6 @@ public function testTargetDirectory()
         $this->setUpMockMoveUploadedFile();
 
         $filter = new FileRenameUpload($this->_newDir);
-        $filter->setUseUploadName(false);
         $this->assertEquals($this->_newDir, $filter->getTarget());
         $this->assertEquals($this->_newDirFile, $filter($this->_oldFile));
         $this->assertEquals('falsefile', $filter('falsefile'));
@@ -271,7 +264,6 @@ public function testOverwriteWithExistingFile()
         $filter = new FileRenameUpload(array(
             'target'          => $this->_newFile,
             'overwrite'       => true,
-            'use_upload_name' => false,
         ));
 
         copy($this->_oldFile, $this->_newFile);
@@ -290,7 +282,6 @@ public function testCannotOverwriteExistingFile()
         $filter = new FileRenameUpload(array(
             'target'          => $this->_newFile,
             'overwrite'       => false,
-            'use_upload_name' => false,
         ));
 
         copy($this->_oldFile, $this->_newFile);
@@ -313,7 +304,6 @@ public function testGetRandomizedFile()
         $filter = new FileRenameUpload(array(
             'target'          => $this->_newFile,
             'randomize'       => true,
-            'use_upload_name' => false,
         ));
 
         $this->assertEquals($this->_newFile, $filter->getTarget());
@@ -333,7 +323,6 @@ public function testGetRandomizedFileWithoutExtension()
         $filter = new FileRenameUpload(array(
             'target'          => $fileNoExt,
             'randomize'       => true,
-            'use_upload_name' => false,
         ));
 
         $this->assertEquals($fileNoExt, $filter->getTarget());