Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/models/Preference.php

@@ -465,26 +465,24 @@ class Application_Model_Preference
 
     	$outputString = "\n";
     	foreach($outputArray as $key => $out){
-    	    if($key == 'SAAS' && ($out != '' || $out != 'disabled')){
+    	    if($key == 'TRIAL_END_DATE' && ($out != '' || $out != 'NULL')){
     	        continue;
     	    }
-    	    if($out != '' || is_numeric($out)){
+    	    if($key == "STREAM_INFO"){
-    	        if($key == "STREAM_INFO"){
+    	        $outputString .= $key." :\n";
-    	            $outputString .= $key." :\n";
+    	        foreach($out as $s_info){
-    	            foreach($out as $s_info){
+    	            foreach($s_info as $k => $v){
-    	                foreach($s_info as $k => $v){
+    	                $outputString .= "\t".strtoupper($k)." : ".$v."\n";
-    	                    $outputString .= "\t".strtoupper($k)." : ".$v."\n";
-    	                }
     	            }
-    	        }else if ($key == "SOUNDCLOUD_ENABLED") {
-    	            if ($out) {
-    	                $outputString .= $key." : TRUE\n";
-    	            } else if (!$out) {
-    	                $outputString .= $key." : FALSE\n";
-    	            }
-    	        }else{
-    		        $outputString .= $key.' : '.$out."\n";
     	        }
+    	    }else if ($key == "SOUNDCLOUD_ENABLED") {
+    	        if ($out) {
+    	            $outputString .= $key." : TRUE\n";
+    	        } else if (!$out) {
+    	            $outputString .= $key." : FALSE\n";
+    	        }
+    	    }else{
+    	        $outputString .= $key.' : '.$out."\n";
     	    }
     	}
     	if($returnArray){

airtime_mvc/application/models/RabbitMq.php

@@ -82,7 +82,7 @@ class Application_Model_RabbitMq
 
         $temp['event_type'] = $event_type;
         $temp['server_timezone'] = Application_Model_Preference::GetTimezone();
-        if($event_type = "update_recorder_schedule"){
+        if($event_type == "update_recorder_schedule"){
             $temp['shows'] = Application_Model_Show::getShows($now, $end_timestamp, $excludeInstance=NULL, $onlyRecord=TRUE);
         }
         $data = json_encode($temp);

airtime_mvc/application/models/Scheduler.php

@@ -651,15 +651,16 @@ class Application_Model_Scheduler {
                     }
                     
                     $this->removeItems($remove, false);
-                }
+                }
-                
-                $instance->setDbEnds($this->nowDT);
-                $instance->save($this->con);
             }
             else {
-                $instance->delete($this->con);
+                $rebroadcasts = $instance->getCcShowInstancessRelatedByDbId(null, $this->con);
-            }
+                $rebroadcasts->delete($this->con);
-               
+            }
+                
+            $instance->setDbEnds($this->nowDT);
+            $instance->save($this->con);
+   
             $this->con->commit();
             
             if ($instance->getDbRecord()) {

airtime_mvc/application/models/ShowInstance.php

@@ -543,9 +543,6 @@ class Application_Model_ShowInstance {
         }
 
         Application_Model_RabbitMq::PushSchedule();
-        if($recording){
-            Application_Model_RabbitMq::SendMessageToShowRecorder("cancel_recording");
-        }
     }
 
     public function setRecordedFile($file_id)

airtime_mvc/public/js/airtime/schedule/schedule.js

@@ -46,7 +46,7 @@ function confirmCancelShow(show_instance_id){
 }
 
 function confirmCancelRecordedShow(show_instance_id){
-    if (confirm('Erase current show and stop recording?')) {
+    if (confirm('Stop recording current show?')) {
         var url = "/Schedule/cancel-current-show";
         $.ajax({
 	        url: url,

airtime_mvc/public/js/airtime/showbuilder/builder.js

@@ -849,7 +849,7 @@ var AIRTIME = (function(AIRTIME){
 					data = $tr.data("aData");
 					
 					if (data.record === true) {
-						msg = 'Erase current show and stop recording?';
+						msg = 'Stop recording current show?';
 					}
 					
 					if (confirm(msg)) {