From be7af45c66f90785bf44d335d61e603986b5c989 Mon Sep 17 00:00:00 2001
From: james <james@james-P35-DS3L.(none)>
Date: Wed, 13 Jul 2011 09:01:48 -0400
Subject: [PATCH] CC-2524:Manage Media Folders:No error msg

- fixed
- changed error msg text
---
 .../controllers/PreferenceController.php      | 34 +++++++++++++------
 airtime_mvc/application/models/MusicDir.php   |  4 +--
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index c803b9f96..7b366140b 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -126,13 +126,20 @@ class PreferenceController extends Zend_Controller_Action
         $watched_dirs_form->populate(array('storageFolder' => $chosen));
         $bool = $watched_dirs_form->verifyChosenFolder($element);
 
+        // it has error checking in two part. It checks is_dir above, and
+        // check uniqueness in DB below. We should put is_dir checking into
+        // MusicDir class.
         if ($bool === true) {
-            MusicDir::setStorDir($chosen);
-            $dirId = MusicDir::getStorDir()->getId();
-            $data = array();
-            $data["directory"] = $chosen;
-            $data["dir_id"] = $dirId;
-            RabbitMq::SendMessageToMediaMonitor("change_stor", $data);
+            $res = MusicDir::setStorDir($chosen);
+            if($res['code'] == 0){
+                $dirId = MusicDir::getStorDir()->getId();
+                $data = array();
+                $data["directory"] = $chosen;
+                $data["dir_id"] = $dirId;
+                RabbitMq::SendMessageToMediaMonitor("change_stor", $data);
+            }else{
+                $watched_dirs_form->getElement($element)->setErrors(array($res['error']));
+            }
         }
 
         $this->view->subform = $watched_dirs_form->render();
@@ -146,11 +153,18 @@ class PreferenceController extends Zend_Controller_Action
         $watched_dirs_form->populate(array('watchedFolder' => $chosen));
         $bool = $watched_dirs_form->verifyChosenFolder($element);
 
+        // it has error checking in two part. It checks is_dir above, and
+        // check uniqueness in DB below. We should put is_dir checking into
+        // MusicDir class.
         if ($bool === true) {
-            MusicDir::addWatchedDir($chosen);
-            $data = array();
-            $data["directory"] = $chosen;
-            RabbitMq::SendMessageToMediaMonitor("new_watch", $data);
+            $res = MusicDir::addWatchedDir($chosen);
+            if($res['code'] == 0){
+                $data = array();
+                $data["directory"] = $chosen;
+                RabbitMq::SendMessageToMediaMonitor("new_watch", $data);
+            }else{
+                $watched_dirs_form->getElement($element)->setErrors(array($res['error']));
+            }
         }
 
         $this->view->subform = $watched_dirs_form->render();
diff --git a/airtime_mvc/application/models/MusicDir.php b/airtime_mvc/application/models/MusicDir.php
index 337547ae8..30d5d06d9 100644
--- a/airtime_mvc/application/models/MusicDir.php
+++ b/airtime_mvc/application/models/MusicDir.php
@@ -54,7 +54,7 @@ class MusicDir {
         }
         catch(Exception $e){
             //echo $e->getMessage();
-            return array("code"=>1, "error"=>"$p_path is already set as the current storage dir or the watched folders");
+            return array("code"=>1, "error"=>"$p_path is already set as the current storage dir or in the watched folders list");
         }
         
     }
@@ -124,7 +124,7 @@ class MusicDir {
             $dir->setDirectory($p_dir);
             return array("code"=>0);
         }else{
-            return array("code"=>1, "error"=>"$p_dir is already set as the current storage dir or the watched folders");
+            return array("code"=>1, "error"=>"$p_dir is already set as the current storage dir or in the watched folders list");
         }
     }