diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 7c24c0da8..6495b2fae 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -129,10 +129,10 @@ class LibraryController extends Zend_Controller_Action } } - try{ - Application_Model_Playlist::DeletePlaylists($playlists, $user->getId()); - }catch (PlaylistNoPermissionException $e){ - $this->view->message = "You don't have a permission to delete all playlists/files that are selected."; + try { + Application_Model_Playlist::deletePlaylists($playlists, $user->getId()); + } catch (PlaylistNoPermissionException $e) { + $this->view->message = "You don't have permission to delete selected playlists/files."; return; } diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index d9662a9c6..67829c147 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -98,7 +98,7 @@ class PlaylistController extends Zend_Controller_Action } private function playlistNoPermission(){ - $this->view->error = "You don't have permission to deleted playlist(s)"; + $this->view->error = "You don't have permission to delete selected playlist(s)."; } private function playlistUnknownError($e) @@ -217,10 +217,10 @@ class PlaylistController extends Zend_Controller_Action $pl = new Application_Model_Playlist($this->pl_sess->id); } - Application_Model_Playlist::DeletePlaylists($ids, $userInfo->id); + Application_Model_Playlist::deletePlaylists($ids, $userInfo->id); $this->createFullResponse($pl); } - catch (PlaylistNoPermissionException $e){ + catch (PlaylistNoPermissionException $e) { $this->playlistNoPermission(); } catch (PlaylistNotFoundException $e) { diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index 9945aa430..ccb3cac8f 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -804,12 +804,12 @@ class Application_Model_Playlist { * Delete playlists that match the ids.. * @param array $p_ids */ - public static function DeletePlaylists($p_ids, $p_userId) + public static function deletePlaylists($p_ids, $p_userId) { $leftOver = self::playlistsNotOwnedByUser($p_ids, $p_userId); - if(count($leftOver) == 0){ + if (count($leftOver) == 0) { CcPlaylistQuery::create()->findPKs($p_ids)->delete(); - }else{ + } else { throw new PlaylistNoPermissionException; } } @@ -819,8 +819,8 @@ class Application_Model_Playlist { $ownedByUser = CcPlaylistQuery::create()->filterByDbCreatorId($p_userId)->find()->getData(); $selectedPls = $p_ids; $ownedPls = array(); - foreach($ownedByUser as $pl){ - if( in_array($pl->getDbId(), $selectedPls) ){ + foreach ($ownedByUser as $pl) { + if (in_array($pl->getDbId(), $selectedPls)) { $ownedPls[] = $pl->getDbId(); } }