From 6f1dd7987f1b6df012b9faa3b6bb25cd747dd844 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Tue, 29 Apr 2014 10:05:17 -0400
Subject: [PATCH] CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get
 removed from organize

---
 .../modules/rest/controllers/MediaController.php          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php
index 7c3855824..2c7a667ca 100644
--- a/airtime_mvc/application/modules/rest/controllers/MediaController.php
+++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php
@@ -147,7 +147,7 @@ class Rest_MediaController extends Zend_Rest_Controller
                 //$relativePath is the folder name(if one) + track name, that was uploaded via ftp
                 $relativePath = substr($fullPath, strlen($basePath)-1);
 
-                //after the file is moved from organize store it's parent folder so we can delete it after
+                //after the file is moved from organize, store it's parent folder so we can delete it after
                 if (dirname($relativePath) != '/') {
                     $pathToDelete = Application_Common_OsPath::join(
                         $basePath,
@@ -155,11 +155,11 @@ class Rest_MediaController extends Zend_Rest_Controller
                     );
                 } else {
                     //if the uploaded file was not in a folder, DO NOT delete
-                    $pathToDelete = False;
+                    $pathToDelete = false;
                 }
             } else {
                 $relativePath = $_FILES["file"]["name"];
-                $pathToDelete = False;
+                $pathToDelete = false;
             }
 
             
@@ -175,7 +175,7 @@ class Rest_MediaController extends Zend_Rest_Controller
 
             $this->processUploadedFile($callbackUrl, $relativePath, $this->getOwnerId());
 
-            if (!$pathToDelete) {
+            if ($pathToDelete) {
                 Logging::info($pathToDelete);
                 //delete the empty folder that was uploaded via ftp (if one)
                 rmdir($pathToDelete);