From e725e4fbe4efd024f3aef648ffd6f1349046375f Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Thu, 23 Jun 2011 17:51:38 +0200
Subject: [PATCH] cc-1799 Human Filesystem

storage dir should be created first so then it's realpath can be inserted into the database.
---
 .../application/controllers/PluploadController.php     |  2 +-
 airtime_mvc/application/models/StoredFile.php          | 10 ++++------
 install/include/airtime-install.php                    |  6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/application/controllers/PluploadController.php b/airtime_mvc/application/controllers/PluploadController.php
index 8b6068f51..f52de7370 100644
--- a/airtime_mvc/application/controllers/PluploadController.php
+++ b/airtime_mvc/application/controllers/PluploadController.php
@@ -25,7 +25,7 @@ class PluploadController extends Zend_Controller_Action
     public function uploadAction()
     {
         $upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload";
-        $res = StoredFile::uploadFile($upload_dir);
+        StoredFile::uploadFile($upload_dir);
 
 		die('{"jsonrpc" : "2.0"}');
     }
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index a45fc72d2..951591d47 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -800,12 +800,10 @@ class StoredFile {
 			if (PEAR::isError($duplicate)) {
 				die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' . $duplicate->getMessage() .'}}');
 			}
-			else {
-                if (file_exists($duplicate->getFilePath())) {
-				    $duplicateName = $duplicate->getMetadataValue(UI_MDATA_KEY_TITLE);
-				    die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}');
-                }
-			}
+            if (file_exists($duplicate->getFilePath())) {
+			    $duplicateName = $duplicate->getMetadataValue(UI_MDATA_KEY_TITLE);
+			    die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}');
+            }
 		}
 
         $storDir = MusicDir::getStorDir();
diff --git a/install/include/airtime-install.php b/install/include/airtime-install.php
index 2cda6da54..400b98f4d 100644
--- a/install/include/airtime-install.php
+++ b/install/include/airtime-install.php
@@ -66,7 +66,7 @@ if(isset($version) && ($version != false) && ($version < AIRTIME_VERSION)) {
     echo "It appears you already have a version of Airtime installed.\n";
     echo "Upgrading is currently disabled for Airtime 1.9.0-beta1.\n";
     exit(2);
-    
+
     require_once("airtime-upgrade.php");
 
     //Make sure to exit with non-zero error code so that airtime-install
@@ -130,6 +130,8 @@ require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php')
 
 echo "* Airtime Version: ".AIRTIME_VERSION.PHP_EOL;
 
+AirtimeInstall::InstallStorageDirectory();
+
 if ($db_install) {
     if($newInstall) {
         // This is called with "system" so that we can pass in a parameter.  See the file itself
@@ -141,8 +143,6 @@ if ($db_install) {
     }
 }
 
-AirtimeInstall::InstallStorageDirectory();
-
 AirtimeInstall::CreateSymlinksToUtils();
 
 AirtimeInstall::CreateZendPhpLogFile();