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

airtime_mvc/application/controllers/ApiController.php

@@ -203,32 +203,6 @@ class ApiController extends Zend_Controller_Action
         }
     }
     
-    public function todayInfoAction()
-    {
-        if (Application_Model_Preference::GetAllow3rdPartyApi()){
-            // disable the view and the layout
-            $this->view->layout()->disableLayout();
-            $this->_helper->viewRenderer->setNoRender(true);
-
-            $date = new Application_Model_DateHelper;
-            $utcTimeNow = $date->getUtcTimestamp();
-            $utctimeEnd = Application_Model_DateHelper::GetDayEndTimestampInUtc();
-            
-            $result = array("env"=>APPLICATION_ENV,
-                "schedulerTime"=>gmdate("Y-m-d H:i:s"),
-                "nextShow"=>Application_Model_Show::GetNextShows($utcTimeNow, 5, $utcTimeEnd));
-                
-            Application_Model_Show::ConvertToLocalTimeZone($result["nextShow"], array("starts", "ends", "start_timestamp", "end_timestamp"));
-
-            header("Content-type: text/javascript");
-            echo $_GET['callback'].'('.json_encode($result).')';
-        } else {
-            header('HTTP/1.0 401 Unauthorized');
-            print 'You are not allowed to access this resource. ';
-            exit;
-        }
-    }
-    
     public function weekInfoAction()
     {
         if (Application_Model_Preference::GetAllow3rdPartyApi()){
@@ -397,9 +371,11 @@ class ApiController extends Zend_Controller_Action
         }
 
         $upload_dir = ini_get("upload_tmp_dir");
-        Application_Model_StoredFile::uploadFile($upload_dir);
+        $tempFilePath = Application_Model_StoredFile::uploadFile($upload_dir);
+        $tempFileName = basename($tempFilePath);
+        
         $fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : '';
-        Application_Model_StoredFile::copyFileToStor($upload_dir, $fileName);
+        Application_Model_StoredFile::copyFileToStor($upload_dir, $fileName, $tempFileName);
     }
 
     public function uploadRecordedAction()

airtime_mvc/application/controllers/PluploadController.php

@@ -26,15 +26,17 @@ class PluploadController extends Zend_Controller_Action
     public function uploadAction()
     {
         $upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload";
-        Application_Model_StoredFile::uploadFile($upload_dir);
+        $tempFilePath = Application_Model_StoredFile::uploadFile($upload_dir);
+        $tempFileName = basename($tempFilePath);
 
-		die('{"jsonrpc" : "2.0"}');
+		die('{"jsonrpc" : "2.0", "tempfilepath" : "'.$tempFileName.'" }');
     }
     
     public function copyfileAction(){
         $upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload";
         $filename = $this->_getParam('name');
-        Application_Model_StoredFile::copyFileToStor($upload_dir, $filename);
+        $tempname = $this->_getParam('tempname');
+        Application_Model_StoredFile::copyFileToStor($upload_dir, $filename, $tempname);
 
         die('{"jsonrpc" : "2.0"}');
     }

airtime_mvc/application/forms/SoundcloudPreferences.php

@@ -1,4 +1,5 @@
 <?php
+require_once 'customvalidators/ConditionalNotEmpty.php';
 
 class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 {
@@ -42,24 +43,40 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
         //SoundCloud Username
         $this->addElement('text', 'SoundCloudUser', array(
             'class'      => 'input_text',
-            'label'      => 'SoundCloud Email:',
+            'label'      => 'SoundCloud Email',
-            'required'   => false,
             'filters'    => array('StringTrim'),
+            'autocomplete' => 'off',
             'value' => Application_Model_Preference::GetSoundCloudUser(),
             'decorators' => array(
                 'ViewHelper'
+            ),
+            
+            // By default, 'allowEmpty' is true. This means that our custom
+            // validators are going to be skipped if this field is empty,
+            // which is something we don't want
+            'allowEmpty' => false,
+            'validators' => array(
+                new ConditionalNotEmpty(array('UploadToSoundcloudOption'=>'1'))
             )
         ));
 
         //SoundCloud Password
         $this->addElement('password', 'SoundCloudPassword', array(
             'class'      => 'input_text',
-            'label'      => 'SoundCloud Password:',
+            'label'      => 'SoundCloud Password',
-            'required'   => false,
             'filters'    => array('StringTrim'),
+            'autocomplete' => 'off',
             'value' => Application_Model_Preference::GetSoundCloudPassword(),
             'decorators' => array(
                 'ViewHelper'
+            ),
+            
+            // By default, 'allowEmpty' is true. This means that our custom
+            // validators are going to be skipped if this field is empty,
+            // which is something we don't want
+            'allowEmpty' => false,
+            'validators' => array(
+                new ConditionalNotEmpty(array('UploadToSoundcloudOption'=>'1'))
             )
         ));
 

airtime_mvc/application/forms/customfilters/ImageSize.php

@@ -1,7 +1,6 @@
 <?php
 
 class Zend_Filter_ImageSize implements Zend_Filter_Interface {
-    
     public function filter($value) {
         if (!file_exists($value)) {
             throw new Zend_Filter_Exception('Image does not exist: ' . $value);
@@ -17,11 +16,9 @@ class Zend_Filter_ImageSize implements Zend_Filter_Interface {
         $origWidth = imagesx($image);
         $origHeight = imagesy($image);
         $ratio = max($origWidth, $origHeight) / 600;
-        if($ratio < 1) {
-        	return;
-        }
         
-        // create a scaled down image
+        if ($ratio > 1) {
+            // img too big! create a scaled down image
             $newWidth = round($origWidth / $ratio);
             $newHeight = round($origHeight / $ratio);
             $resized = imagecreatetruecolor($newWidth, $newHeight);
@@ -29,7 +26,7 @@ class Zend_Filter_ImageSize implements Zend_Filter_Interface {
 
             // determine type and store to disk
             $explodeResult = explode(".", $value);
-        $type = $explodeResult[count($explodeResult) - 1];
+            $type = strtolower($explodeResult[count($explodeResult) - 1]);
             $writeFunc = 'image' . $type;
             if ($type == 'jpeg' || $type == 'jpg') {
                 imagejpeg($resized, $value, 100);
@@ -37,6 +34,9 @@ class Zend_Filter_ImageSize implements Zend_Filter_Interface {
                 $writeFunc($resized, $value);
             }
         }
+        
+        return $value;
+    }
 }
 
 ?>

airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Check if a field is empty but only when specific fields have specific values
+ */
+class ConditionalNotEmpty extends Zend_Validate_Abstract {
+    
+    const KEY_IS_EMPTY   = 'keyIsEmpty';
+    
+    protected $_messageTemplates = array(
+        self::KEY_IS_EMPTY   => 'Value is required and can\'t be empty'
+    );
+    
+    protected $_fieldValues;
+    
+    /**
+     * Constructs a new ConditionalNotEmpty validator.
+     * 
+     * @param array $fieldValues - the names and expected values of the fields we're depending on;
+     * E.g., if we have a field that should only be validated when two other
+     * fields PARENT_1 and PARENT_2 have values of '1' and '0' respectively, then 
+     * $fieldValues should contain ('PARENT_1'=>'1', 'PARENT_2'=>'0')
+     */
+    public function __construct($fieldValues)
+    {
+        $this->_fieldValues = $fieldValues;
+    }
+    
+    /**
+     * Implements Zend_Validate_Abstract.
+     * Given names and expected values of the fields we're depending on ($_fieldValues),
+     * this function returns true if the expected values doesn't match the actual user input,
+     * or if $value is not empty. Returns false otherwise.
+     * 
+     * @param String $value - this field's value
+     * @param array $context - names and values of the rest of the fields in this form
+     * @return boolean - true if valid; false otherwise
+     */
+    public function isValid($value, $context = null)
+    {
+        if ($value != "") {
+            return true;
+        }
+        
+        if (is_array($context)) {
+            foreach($this->_fieldValues as $fieldName=>$fieldValue) {
+                if (!isset($context[$fieldName]) || $context[$fieldName] != $fieldValue) {
+                    return true;
+                }
+            }
+        } elseif (is_string($context)) {
+            if (!isset($context) || $context != $fieldValue) {
+                return true;
+            }
+        }
+        
+        $this->_error(self::KEY_IS_EMPTY);
+        return false;
+    }
+}
+
+?>

airtime_mvc/application/models/Show.php

@@ -1071,16 +1071,13 @@ class Application_Model_Show {
         $timezone = $p_showRow["timezone"];
 
         $start = $first_show." ".$start_time;
-        $utcStartDateTime = Application_Model_DateHelper::ConvertToUtcDateTime($start, $timezone);
+
+        //start & end UTC DateTimes for the show.
+        list($utcStartDateTime, $utcEndDateTime) = Application_Model_Show::createUTCStartEndDateTime($start, $duration, $timezone);
 
         if ($utcStartDateTime->getTimestamp() < $p_dateTime->getTimestamp()) {
 
-            $utcStart = $utcStartDateTime->format("Y-m-d H:i:s");
+            $currentUtcTimestamp = gmdate("Y-m-d H:i:s");
-            $sql = "SELECT timestamp '{$utcStart}' + interval '{$duration}'";
-            $utcEndDateTime = new DateTime($CC_DBC->GetOne($sql), new DateTimeZone("UTC"));
-
-            $date = new Application_Model_DateHelper();
-            $currentUtcTimestamp = $date->getUtcTimestamp();
 
             $show = new Application_Model_Show($show_id);
             if ($show->hasInstance()){
@@ -1141,8 +1138,7 @@ class Application_Model_Show {
         $record = $p_showRow["record"];
         $timezone = $p_showRow["timezone"];
 
-        $date = new Application_Model_DateHelper();
+        $currentUtcTimestamp = gmdate("Y-m-d H:i:s");
-        $currentUtcTimestamp = $date->getUtcTimestamp();
 
         if(isset($next_pop_date)) {
             $start = $next_pop_date." ".$start_time;
@@ -1162,9 +1158,7 @@ class Application_Model_Show {
         while($utcStartDateTime->getTimestamp() <= $p_dateTime->getTimestamp()
                 && (is_null($utcLastShowDateTime) || $utcStartDateTime->getTimestamp() < $utcLastShowDateTime->getTimestamp())){
 
-            $utcStart = $utcStartDateTime->format("Y-m-d H:i:s");
+            list($utcStartDateTime, $utcEndDateTime) = Application_Model_Show::createUTCStartEndDateTime($start, $duration, $timezone);
-            $sql = "SELECT timestamp '{$utcStart}' + interval '{$duration}'";
-            $utcEndDateTime = new DateTime($CC_DBC->GetOne($sql), new DateTimeZone("UTC"));
 
             if ($show->hasInstanceOnDate($utcStartDateTime)){
                 $ccShowInstance = $show->getInstanceOnDate($utcStartDateTime);
@@ -1236,49 +1230,78 @@ class Application_Model_Show {
         Application_Model_Show::setNextPop($start, $show_id, $day);
     }
 
+    /*
+     * @param   $p_start
+     *              timestring format "Y-m-d H:i:s" (not UTC)
+     * @param   $p_duration
+     *              string time interval (h)h:(m)m(:ss)
+     * @param   $p_timezone
+     *              string "Europe/Prague"
+     * @param   $p_offset
+     *              array (days, hours, mins) used for rebroadcast shows.
+     *
+     * @return
+     *      array of 2 DateTime objects, start/end time of the show in UTC.
+     */
+    private static function createUTCStartEndDateTime($p_start, $p_duration, $p_timezone=null, $p_offset=null)
+    {
+        $timezone = $p_timezone ? $p_timezone : date_default_timezone_get();
+
+        $startDateTime = new DateTime($p_start, new DateTimeZone($timezone));
+        if (isset($p_offset)) {
+            $startDateTime->add(new DateInterval("P{$p_offset["days"]}DT{$p_offset["hours"]}H{$p_offset["mins"]}M"));
+        }
+        //convert time to UTC
+        $startDateTime->setTimezone(new DateTimeZone('UTC'));
+
+        $endDateTime = clone $startDateTime;
+        $duration = explode(":", $p_duration);
+        list($hours, $mins) = array_slice($duration, 0, 2);
+        $endDateTime->add(new DateInterval("PT{$hours}H{$mins}M"));
+
+        return array($startDateTime, $endDateTime);
+    }
+
     /*  Create rebroadcast instances for a created show marked for recording
      *
-     *  @param $p_rebroadcasts rows gotten from the db table cc_show_rebroadcasts, tells airtime when to schedule the rebroadcasts.
+     *  @param $p_rebroadcasts
-     *  @param $p_currentUtcTimestamp a timestring in format "Y-m-d H:i:s", current UTC time.
+     *      rows gotten from the db table cc_show_rebroadcasts, tells airtime when to schedule the rebroadcasts.
-     *  @param $p_showId int of the show it belongs to (from cc_show)
+     *  @param $p_currentUtcTimestamp
-     *  @param $p_showInstanceId the instance id of the created recorded show instance
+     *      a timestring in format "Y-m-d H:i:s", current UTC time.
+     *  @param $p_showId
+     *      int of the show it belongs to (from cc_show)
+     *  @param $p_showInstanceId
+     *      the instance id of the created recorded show instance
      *      (from cc_show_instances), used to associate rebroadcasts to this show.
-     *  @param $p_startTime a timestring in format "Y-m-d H:i:s" in the timezone, not UTC of the rebroadcasts' parent recorded show.
+     *  @param $p_startTime
-     *  @param $p_duration duration of the show in format 1:0
+     *      a timestring in format "Y-m-d H:i:s" in the timezone, not UTC of the rebroadcasts' parent recorded show.
-     *  @param $p_timezone string of user's timezone "Europe/Prague"
+     *  @param $p_duration
+     *      string time interval (h)h:(m)m:(ss) length of the show.
+     *  @param $p_timezone
+     *      string of user's timezone "Europe/Prague"
      *
      */
     private static function createRebroadcastInstances($p_rebroadcasts, $p_currentUtcTimestamp, $p_showId, $p_showInstanceId, $p_startTime, $p_duration, $p_timezone=null){
-        global $CC_DBC;
 
-        Logging::log('Count of rebroadcasts '. count($p_rebroadcasts));
+        //Y-m-d
+        //use only the date part of the show start time stamp for the offsets to work properly.
+        $date = explode(" ", $p_startTime);
+        $start_date = $date[0];
 
         foreach($p_rebroadcasts as $rebroadcast) {
 
-            //use only the date part of the show start time stamp for the offsets to work properly.
+            $days = explode(" ", $rebroadcast["day_offset"]);
-            $sql = "SELECT date '{$p_startTime}' + interval '{$rebroadcast["day_offset"]}' + interval '{$rebroadcast["start_time"]}'";
+            $time = explode(":", $rebroadcast["start_time"]);
-            $rebroadcast_start_time = $CC_DBC->GetOne($sql);
+            $offset = array("days"=>$days[0], "hours"=>$time[0], "mins"=>$time[1]);
-            Logging::log('rebroadcast start '.$rebroadcast_start_time);
 
-            $sql = "SELECT timestamp '{$rebroadcast_start_time}' + interval '{$p_duration}'";
+            list($utcStartDateTime, $utcEndDateTime) = Application_Model_Show::createUTCStartEndDateTime($start_date, $p_duration, $p_timezone, $offset);
-            $rebroadcast_end_time = $CC_DBC->GetOne($sql);
-            Logging::log('rebroadcast end '.$rebroadcast_end_time);
 
-            //convert to UTC, after we have used the defined offsets to calculate rebroadcasts.
+            if ($utcStartDateTime->format("Y-m-d H:i:s") > $p_currentUtcTimestamp){
-            $utc_rebroadcast_start_time = Application_Model_DateHelper::ConvertToUtcDateTime($rebroadcast_start_time, $p_timezone);
-            $utc_rebroadcast_end_time = Application_Model_DateHelper::ConvertToUtcDateTime($rebroadcast_end_time, $p_timezone);
-
-            Logging::log('UTC rebroadcast start '.$utc_rebroadcast_start_time->format("Y-m-d H:i:s"));
-            Logging::log('UTC rebroadcast end '.$utc_rebroadcast_end_time->format("Y-m-d H:i:s"));
-            Logging::log('Current UTC timestamp '.$p_currentUtcTimestamp);
-
-            if ($utc_rebroadcast_start_time->format("Y-m-d H:i:s") > $p_currentUtcTimestamp){
-                Logging::log('Creating rebroadcast show starting at UTC '.$utc_rebroadcast_start_time->format("Y-m-d H:i:s"));
 
                 $newRebroadcastInstance = new CcShowInstances();
                 $newRebroadcastInstance->setDbShowId($p_showId);
-                $newRebroadcastInstance->setDbStarts($utc_rebroadcast_start_time->format("Y-m-d H:i:s"));
+                $newRebroadcastInstance->setDbStarts($utcStartDateTime);
-                $newRebroadcastInstance->setDbEnds($utc_rebroadcast_end_time->format("Y-m-d H:i:s"));
+                $newRebroadcastInstance->setDbEnds($utcEndDateTime);
                 $newRebroadcastInstance->setDbRecord(0);
                 $newRebroadcastInstance->setDbRebroadcast(1);
                 $newRebroadcastInstance->setDbOriginalShow($p_showInstanceId);

airtime_mvc/application/models/StoredFile.php

@@ -809,10 +809,18 @@ class Application_Model_StoredFile {
 		if (isset($_SERVER["CONTENT_TYPE"]))
 			$contentType = $_SERVER["CONTENT_TYPE"];
 
+        // create temp file name (CC-3086)
+        $command = "mktemp --tmpdir=".$p_targetDir;
+        $tempFilePath= exec($command);
+        
+        if($tempFilePath == ""){
+            die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Unable to create tmp file."}, "id" : "id"}');
+        }
+        
 		if (strpos($contentType, "multipart") !== false) {
 			if (isset($_FILES['file']['tmp_name']) && is_uploaded_file($_FILES['file']['tmp_name'])) {
 				// Open temp file
-				$out = fopen($p_targetDir . DIRECTORY_SEPARATOR . $fileName, $chunk == 0 ? "wb" : "ab");
+				$out = fopen($tempFilePath, $chunk == 0 ? "wb" : "ab");
 				if ($out) {
 					// Read binary input stream and append it to temp file
 					$in = fopen($_FILES['file']['tmp_name'], "rb");
@@ -831,7 +839,7 @@ class Application_Model_StoredFile {
 				die('{"jsonrpc" : "2.0", "error" : {"code": 103, "message": "Failed to move uploaded file."}, "id" : "id"}');
 		} else {
 			// Open temp file
-			$out = fopen($p_targetDir . DIRECTORY_SEPARATOR . $fileName, $chunk == 0 ? "wb" : "ab");
+			$out = fopen($tempFilePath, $chunk == 0 ? "wb" : "ab");
 			if ($out) {
 				// Read binary input stream and append it to temp file
 				$in = fopen("php://input", "rb");
@@ -847,33 +855,11 @@ class Application_Model_StoredFile {
 				die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}');
 		}
 		
-		/*$audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName;
+		return $tempFilePath;
-
-		$md5 = md5_file($audio_file);
-		$duplicate = Application_Model_StoredFile::RecallByMd5($md5);
-		if ($duplicate) {
-			if (PEAR::isError($duplicate)) {
-				die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' . $duplicate->getMessage() .'}}');
-			}
-            if (file_exists($duplicate->getFilePath())) {
-			    $duplicateName = $duplicate->getMetadataValue('MDATA_KEY_TITLE');
-			    die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}');
-            }
     }
 
-        $storDir = Application_Model_MusicDir::getStorDir();
+    public static function copyFileToStor($p_targetDir, $fileName, $tempname){
-        $stor = $storDir->getDirectory();
+        $audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $tempname;
-
-        $stor .= "/organize";
-
-	    $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName;
-
-        $r = @copy($audio_file, $audio_stor);*/
-
-    }
-
-    public static function copyFileToStor($p_targetDir, $fileName){
-        $audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName;
         Logging::log('copyFileToStor: moving file '.$audio_file);
         $md5 = md5_file($audio_file);
         $duplicate = Application_Model_StoredFile::RecallByMd5($md5);
@@ -895,7 +881,7 @@ class Application_Model_StoredFile {
         $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName;
 
         $r = @copy($audio_file, $audio_stor);
-        //$r = @unlink($audio_file);
+        $r = @unlink($audio_file);
     }
 
     public static function getFileCount()

airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml

@@ -40,7 +40,9 @@
             <?php endif; ?> 
         </dd>
         <dt id="SoundCloudUser-label" class="block-display">
-            <label class="optional" for="SoundCloudUser"><?php echo $this->element->getElement('SoundCloudUser')->getLabel() ?></label>
+            <label class="optional" for="SoundCloudUser"><?php echo $this->element->getElement('SoundCloudUser')->getLabel() ?>
+                <span class="info-text-small">(Required)</span> :
+            </label>
         </dt>
         <dd id="SoundCloudUser-element" class="block-display">
             <?php echo $this->element->getElement('SoundCloudUser') ?>
@@ -53,7 +55,9 @@
             <?php endif; ?> 
         </dd>
         <dt id="SoundCloudPassword-label" class="block-display">
-            <label class="optional" for="SoundCloudPassword"><?php echo $this->element->getElement('SoundCloudPassword')->getLabel() ?></label>
+            <label class="optional" for="SoundCloudPassword"><?php echo $this->element->getElement('SoundCloudPassword')->getLabel() ?>
+                <span class="info-text-small">(Required)</span> :
+            </label>
         </dt>
         <dd id="SoundCloudPassword-element" class="block-display">
             <?php echo $this->element->getElement('SoundCloudPassword') ?>

airtime_mvc/public/js/airtime/library/plupload.js

@@ -18,14 +18,14 @@ $(document).ready(function() {
 		var j = jQuery.parseJSON(json.response);
 		
 		if(j.error !== undefined) {
-
 			var row = $("<tr/>")
 				.append('<td>' + file.name +'</td>')
 				.append('<td>' + j.error.message + '</td>');
 				
 			$("#plupload_error").find("table").append(row);
 		}else{
-		    $.get('/Plupload/copyfile/format/json/name/'+encodeURIComponent(file.name), function(json){
+		    var tempFileName = j.tempfilepath;
+		    $.get('/Plupload/copyfile/format/json/name/'+encodeURIComponent(file.name)+'/tempname/'+encodeURIComponent(tempFileName), function(json){
 		        var jr = jQuery.parseJSON(json);
 		        if(jr.error !== undefined) {
 		            var row = $("<tr/>")

widgets/js/jquery.showinfo.js

@@ -16,7 +16,9 @@
         getServerData();
 
         function updateWidget(){
-            var shows = sd.getNextShows();
+            var currentShow = sd.getCurrentShow();
+            var nextShows = sd.getNextShows();
+            var shows = currentShow.length == 0 ? nextShows : currentShow.concat(nextShows);
 
             tableString = "";
             tableString += "<h3>" + options.text.onAirToday + "</h3>";
@@ -50,7 +52,7 @@
         }
 
         function getServerData(){
-            $.ajax({ url: options.sourceDomain + "api/today-info/", dataType:"jsonp", success:function(data){
+            $.ajax({ url: options.sourceDomain + "api/live-info/", dataType:"jsonp", success:function(data){
                         processData(data);
                   }, error:airtimeScheduleJsonpError});
             setTimeout(getServerData, options.updatePeriod*1000);