';
+ }
+ else {
+ $row['image'] = '
';
+ }
}
+
return $results;
}
@@ -723,7 +680,8 @@ class Application_Model_StoredFile {
unset($columnsDisplayed[$key]);
}
}
- $selectorRows = "SELECT " . join(',', $columnsDisplayed );
+ //$selectorRows = "SELECT " . join(',', $columnsDisplayed );
+ $selectorRows = "SELECT * ";
$sql = $selectorCount." FROM ".$fromTable;
$totalRows = $CC_DBC->getOne($sql);
@@ -774,9 +732,11 @@ class Application_Model_StoredFile {
else {
$sql = $selectorRows." FROM ".$fromTable." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"];
}
-
+
+ //Logging::log($sql);
+
$results = $CC_DBC->getAll($sql);
-
+
if(!isset($totalDisplayRows)) {
$totalDisplayRows = $totalRows;
}
@@ -905,6 +865,7 @@ class Application_Model_StoredFile {
$audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName;
Logging::log("copyFileToStor: moving file $audio_file to $audio_stor");
+
//Martin K.: changed to rename: Much less load + quicker since this is an atomic operation
$r = @rename($audio_file, $audio_stor);
@@ -927,14 +888,14 @@ class Application_Model_StoredFile {
}
/**
- *
+ *
* Enter description here ...
* @param $dir_id - if this is not provided, it returns all files with full path constructed.
* @param $propelObj - if this is true, it returns array of proepl obj
*/
public static function listAllFiles($dir_id=null, $propelObj=false){
global $CC_DBC;
-
+
if($propelObj){
$sql = "SELECT m.directory || f.filepath as fp"
." FROM CC_MUSIC_DIRS m"
@@ -996,12 +957,12 @@ class Application_Model_StoredFile {
public function getSoundCloudErrorMsg(){
return $this->_file->getDbSoundCloudErrorMsg();
}
-
+
public function setFileExistsFlag($flag){
$this->_file->setDbFileExists($flag)
->save();
}
-
+
public function getFileExistsFlag(){
return $this->_file->getDbFileExists();
}
@@ -1048,3 +1009,4 @@ class Application_Model_StoredFile {
}
}
+class DeleteScheduledFileException extends Exception {}
diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php
index 7e9862d0d..aa79e71bf 100644
--- a/airtime_mvc/application/models/User.php
+++ b/airtime_mvc/application/models/User.php
@@ -11,11 +11,16 @@ class Application_Model_User {
public function __construct($userId)
{
- if (strlen($userId)==0){
+ if (empty($userId)){
$this->_userInstance = $this->createUser();
- } else {
+ }
+ else {
$this->_userInstance = CcSubjsQuery::create()->findPK($userId);
- }
+
+ if (is_null($this->_userInstance)){
+ throw new Exception();
+ }
+ }
}
public function getId() {
@@ -29,7 +34,20 @@ class Application_Model_User {
public function isAdmin() {
return $this->isUserType(UTYPE_ADMIN);
}
-
+
+ public function canSchedule($p_showId) {
+ $type = $this->getType();
+
+ if ( $type === UTYPE_ADMIN ||
+ $type === UTYPE_PROGRAM_MANAGER ||
+ CcShowHostsQuery::create()->filterByDbShow($p_showId)->filterByDbHost($this->getId())->count() > 0 )
+ {
+ return true;
+ }
+
+ return false;
+ }
+
public function isUserType($type, $showId=''){
if(is_array($type)){
$result = false;
@@ -62,99 +80,99 @@ class Application_Model_User {
}
}
}
-
+
public function setLogin($login){
$user = $this->_userInstance;
- $user->setDbLogin($login);
+ $user->setDbLogin($login);
}
-
+
public function setPassword($password){
$user = $this->_userInstance;
- $user->setDbPass(md5($password));
+ $user->setDbPass(md5($password));
}
-
+
public function setFirstName($firstName){
$user = $this->_userInstance;
- $user->setDbFirstName($firstName);
+ $user->setDbFirstName($firstName);
}
-
+
public function setLastName($lastName){
$user = $this->_userInstance;
- $user->setDbLastName($lastName);
+ $user->setDbLastName($lastName);
}
-
+
public function setType($type){
$user = $this->_userInstance;
- $user->setDbType($type);
+ $user->setDbType($type);
}
public function setEmail($email){
$user = $this->_userInstance;
- $user->setDbEmail($email);
+ $user->setDbEmail($email);
}
public function setSkype($skype){
$user = $this->_userInstance;
- $user->setDbSkypeContact($skype);
+ $user->setDbSkypeContact($skype);
}
public function setJabber($jabber){
$user = $this->_userInstance;
- $user->setDbJabberContact($jabber);
+ $user->setDbJabberContact($jabber);
}
-
+
public function getLogin(){
$user = $this->_userInstance;
- return $user->getDbLogin();
- }
-
+ return $user->getDbLogin();
+ }
+
public function getPassword(){
$user = $this->_userInstance;
- return $user->getDbPass();
+ return $user->getDbPass();
}
-
+
public function getFirstName(){
$user = $this->_userInstance;
- return $user->getDbFirstName();
+ return $user->getDbFirstName();
}
-
+
public function getLastName(){
$user = $this->_userInstance;
- return $user->getDbLastName();
+ return $user->getDbLastName();
}
-
+
public function getType(){
$user = $this->_userInstance;
- return $user->getDbType();
+ return $user->getDbType();
}
public function getEmail(){
$user = $this->_userInstance;
- return $user->getDbEmail();
+ return $user->getDbEmail();
}
public function getSkype(){
$user = $this->_userInstance;
- return $user->getDbSkypeContact();
+ return $user->getDbSkypeContact();
}
public function getJabber(){
$user = $this->_userInstance;
- return $user->getDbJabberContact();
-
+ return $user->getDbJabberContact();
+
}
-
+
public function save(){
$this->_userInstance->save();
}
-
+
public function delete(){
if (!$this->_userInstance->isDeleted())
$this->_userInstance->delete();
}
private function createUser() {
- $user = new CcSubjs();
+ $user = new CcSubjs();
return $user;
}
@@ -165,7 +183,7 @@ class Application_Model_User {
$sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs ";
$sql = $sql_gen;
-
+
if(is_array($type)) {
for($i=0; $iTitle:md["MDATA_KEY_TITLE"]);?>
Artist:md["MDATA_KEY_CREATOR"]);?>
Album:md["MDATA_KEY_SOURCE"]);?>
@@ -19,7 +19,7 @@
-type == "pl") : ?>
+type == "playlist") : ?>
Name:md["dc:title"]);?>
Creator:md["dc:creator"]);?>
Length:md["dcterms:extent"]);?>
diff --git a/airtime_mvc/application/views/scripts/library/index.phtml b/airtime_mvc/application/views/scripts/library/index.phtml
index bfb8b78b3..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/library/index.phtml
+++ b/airtime_mvc/application/views/scripts/library/index.phtml
@@ -1,18 +0,0 @@
--
-
- Search - -
-
-
-
-
-
diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml
new file mode 100644
index 000000000..d1f8d7cb8
--- /dev/null
+++ b/airtime_mvc/application/views/scripts/library/library.phtml
@@ -0,0 +1,9 @@
+File import in progress...
- -
+
- Search +
+
+
+
+
diff --git a/airtime_mvc/application/views/scripts/playlist/index.phtml b/airtime_mvc/application/views/scripts/playlist/index.phtml
index 6f4d6836b..e1c14e724 100644
--- a/airtime_mvc/application/views/scripts/playlist/index.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/index.phtml
@@ -1,12 +1,14 @@
-
+
pl)) : ?>
-
+
pl)) : ?>
+
+
File import in progress...
+
pl->getName(); ?>
diff --git a/airtime_mvc/application/views/scripts/playlist/set-cue.phtml b/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
index eb35d17fc..4b44e51ac 100644
--- a/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
@@ -1,11 +1,11 @@
- Cue In:
- -
+
-
cueIn; ?>
- Cue Out:
- -
+
-
cueOut; ?>
diff --git a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
index 1c9135323..4a55fb2db 100644
--- a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
@@ -1,11 +1,11 @@
- Fade out:
- -
+
-
fadeOut; ?>
- Fade in:
- -
+
-
fadeIn; ?>
diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index b003349da..bd55a9f94 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -4,7 +4,7 @@ if (count($items)) : ?>
- - ">
+
- " unqid="">
- Fade out: -
-
+
- fadeOut; ?>
- Fade in: -
-
+
- fadeIn; ?>
diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index b003349da..bd55a9f94 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -4,7 +4,7 @@ if (count($items)) : ?> -- "> +
- " unqid="">
' );
- } else if(type == "pl") {
- $('td.library_type', nRow).html( '
' );
- }
-
- $(nRow).attr("id", type+'_'+id);
-
- // insert id on lenth field
- $('td.library_length', nRow).attr("id", "length");
-
- return nRow;
-}
-
-function dtDrawCallback() {
- addLibraryItemEvents();
- addMetadataQtip();
- saveNumEntriesSetting();
- setupGroupActions();
+ });
}
function addProgressIcon(id) {
- if($("#au_"+id).find("td.library_title").find("span").length > 0){
- $("#au_"+id).find("td.library_title").find("span").removeClass();
- $("span[id="+id+"]").addClass("small-icon progress");
- }else{
- $("#au_"+id).find("td.library_title").append('')
+ var tr = $("#au_"+id),
+ span;
+
+ span = tr.find("td.library_title").find("span");
+
+ if (span.length > 0){
+ span.removeClass()
+ .addClass("small-icon progress");
+ }
+ else{
+ tr.find("td.library_title")
+ .append('');
}
}
function checkSCUploadStatus(){
- var url = '/Library/get-upload-to-soundcloud-status/format/json';
+
+ var url = '/Library/get-upload-to-soundcloud-status';
+
$("span[class*=progress]").each(function(){
- var id = $(this).attr("id");
+ var span, id;
+
+ span = $(this);
+ id = span.parent().parent().data("aData").id;
+
$.post(url, {format: "json", id: id, type:"file"}, function(json){
- if(json.sc_id > 0){
- $("span[id="+id+"]").removeClass("progress").addClass("soundcloud");
- }else if(json.sc_id == "-3"){
- $("span[id="+id+"]").removeClass("progress").addClass("sc-error");
+ if (json.sc_id > 0) {
+ span.removeClass("progress")
+ .addClass("soundcloud");
+
+ }
+ else if (json.sc_id == "-3") {
+ span.removeClass("progress")
+ .addClass("sc-error");
}
});
- })
+ });
}
function addQtipToSCIcons(){
$(".progress, .soundcloud, .sc-error").live('mouseover', function(){
- var id = $(this).attr("id");
- if($(this).hasClass("progress")){
+
+ var id = $(this).parent().parent().data("aData").id;
+
+ if ($(this).hasClass("progress")){
$(this).qtip({
content: {
text: "Uploading in progress..."
@@ -190,8 +152,9 @@ function addQtipToSCIcons(){
show: {
ready: true // Needed to make it show on first mouseover event
}
- })
- }else if($(this).hasClass("soundcloud")){
+ });
+ }
+ else if($(this).hasClass("soundcloud")){
$(this).qtip({
content: {
text: "Retreiving data from the server...",
@@ -200,7 +163,7 @@ function addQtipToSCIcons(){
type: "post",
data: ({format: "json", id : id, type: "file"}),
success: function(json, status){
- this.set('content.text', "The soundcloud id for this file is: "+json.sc_id)
+ this.set('content.text', "The soundcloud id for this file is: "+json.sc_id);
}
}
},
@@ -216,7 +179,7 @@ function addQtipToSCIcons(){
show: {
ready: true // Needed to make it show on first mouseover event
}
- })
+ });
}else if($(this).hasClass("sc-error")){
$(this).qtip({
content: {
@@ -227,7 +190,7 @@ function addQtipToSCIcons(){
data: ({format: "json", id : id, type: "file"}),
success: function(json, status){
this.set('content.text', "There was error while uploading to soundcloud.