Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-4090: Make code style PSR compliant

Browse source
This commit is contained in:
Martin Konecny 2012-07-15 20:58:07 -04:00
parent 632f039977
commit 39760f8494
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
airtime_mvc/application/controllers/ApiController.php
View file

@ -602,7 +602,7 @@ class ApiController extends Zend_Controller_Action
$file->setMetadata($md); $file->setMetadata($md);
} }
} }
} elseif ($mode == "modify") { } else if ($mode == "modify") {
$filepath = $md['MDATA_KEY_FILEPATH']; $filepath = $md['MDATA_KEY_FILEPATH'];
//$filepath = str_replace("\\", "", $filepath); //$filepath = str_replace("\\", "", $filepath);
$file = Application_Model_StoredFile::RecallByFilepath($filepath); $file = Application_Model_StoredFile::RecallByFilepath($filepath);
@ -612,12 +612,11 @@ class ApiController extends Zend_Controller_Action
$this->view->error = "File does not exist in Airtime."; $this->view->error = "File does not exist in Airtime.";
return; return;
} } else {
//Updating a metadata change. //Updating a metadata change.
else {
$file->setMetadata($md); $file->setMetadata($md);
} }
} elseif ($mode == "moved") { } else if ($mode == "moved") {
$md5 = $md['MDATA_KEY_MD5']; $md5 = $md['MDATA_KEY_MD5'];
$file = Application_Model_StoredFile::RecallByMd5($md5); $file = Application_Model_StoredFile::RecallByMd5($md5);
@ -630,7 +629,7 @@ class ApiController extends Zend_Controller_Action
//$filepath = str_replace("\\", "", $filepath); //$filepath = str_replace("\\", "", $filepath);
$file->setFilePath($filepath); $file->setFilePath($filepath);
} }
} elseif ($mode == "delete") { } else if ($mode == "delete") {
$filepath = $md['MDATA_KEY_FILEPATH']; $filepath = $md['MDATA_KEY_FILEPATH'];
//$filepath = str_replace("\\", "", $filepath); //$filepath = str_replace("\\", "", $filepath);
$file = Application_Model_StoredFile::RecallByFilepath($filepath); $file = Application_Model_StoredFile::RecallByFilepath($filepath);
@ -642,7 +641,7 @@ class ApiController extends Zend_Controller_Action
} else { } else {
$file->deleteByMediaMonitor(); $file->deleteByMediaMonitor();
} }
} elseif ($mode == "delete_dir") { } else if ($mode == "delete_dir") {
$filepath = $md['MDATA_KEY_FILEPATH']; $filepath = $md['MDATA_KEY_FILEPATH'];
//$filepath = str_replace("\\", "", $filepath); //$filepath = str_replace("\\", "", $filepath);
$files = Application_Model_StoredFile::RecallByPartialFilepath($filepath); $files = Application_Model_StoredFile::RecallByPartialFilepath($filepath);
@ -791,8 +790,8 @@ class ApiController extends Zend_Controller_Action
$request = $this->getRequest(); $request = $this->getRequest();
$params = $request->getParams(); $params = $request->getParams();
$added_list = empty($params['added_dir'])?array():explode(',',$params['added_dir']); $added_list = empty($params['added_dir'])?array():explode(',', $params['added_dir']);
$removed_list = empty($params['removed_dir'])?array():explode(',',$params['removed_dir']); $removed_list = empty($params['removed_dir'])?array():explode(',', $params['removed_dir']);
// get all watched dirs // get all watched dirs
$watched_dirs = Application_Model_MusicDir::getWatchedDirs(null, null); $watched_dirs = Application_Model_MusicDir::getWatchedDirs(null, null);
@ -805,7 +804,7 @@ class ApiController extends Zend_Controller_Action
// if mount path itself was watched // if mount path itself was watched
if ($dirPath == $ad) { if ($dirPath == $ad) {
Application_Model_MusicDir::addWatchedDir($dirPath, false); Application_Model_MusicDir::addWatchedDir($dirPath, false);
} elseif (substr($dirPath, 0, strlen($ad)) === $ad && $dir->getExistsFlag() == false) { } else if (substr($dirPath, 0, strlen($ad)) === $ad && $dir->getExistsFlag() == false) {
// if dir contains any dir in removed_list( if watched dir resides on new mounted path ) // if dir contains any dir in removed_list( if watched dir resides on new mounted path )
Application_Model_MusicDir::addWatchedDir($dirPath, false); Application_Model_MusicDir::addWatchedDir($dirPath, false);
} elseif (substr($ad, 0, strlen($dirPath)) === $dirPath) { } elseif (substr($ad, 0, strlen($dirPath)) === $dirPath) {
@ -837,11 +836,10 @@ class ApiController extends Zend_Controller_Action
$files = Application_Model_StoredFile::listAllFiles($dir->getId(), true); $files = Application_Model_StoredFile::listAllFiles($dir->getId(), true);
foreach ($files as $f) { foreach ($files as $f) {
// if the file is from this mount // if the file is from this mount
if (substr( $f->getFilePath(),0,strlen($rd) ) === $rd) { if (substr($f->getFilePath(), 0, strlen($rd)) === $rd) {
$f->delete(); $f->delete();
} }
} }
if ($watchDir) { if ($watchDir) {
Application_Model_MusicDir::removeWatchedDir($rd, false); Application_Model_MusicDir::removeWatchedDir($rd, false);
} }