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

- CRLF fix

Browse source
This commit is contained in:
James 2012-10-30 18:03:03 -04:00
parent cbee9422ec
commit 1899d588ee
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/forms/SmartBlockCriteria.php
View file

@ -212,11 +212,11 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
}//for }//for
$repeatTracks = new Zend_Form_Element_Checkbox('sp_repeat_tracks'); $repeatTracks = new Zend_Form_Element_Checkbox('sp_repeat_tracks');
$repeatTracks->setDecorators(array('viewHelper')) $repeatTracks->setDecorators(array('viewHelper'))
->setLabel('Allow Repeat Tracks:'); ->setLabel('Allow Repeat Tracks:');
if (isset($storedCrit["repeat_tracks"])) { if (isset($storedCrit["repeat_tracks"])) {
$repeatTracks->setChecked($storedCrit["repeat_tracks"]["value"] == 1?true:false); $repeatTracks->setChecked($storedCrit["repeat_tracks"]["value"] == 1?true:false);
} }
$this->addElement($repeatTracks); $this->addElement($repeatTracks);

24
airtime_mvc/application/models/Block.php
View file

@ -1097,9 +1097,9 @@ SQL;
// insert repeate track option // insert repeate track option
$qry = new CcBlockcriteria(); $qry = new CcBlockcriteria();
$qry->setDbCriteria("repeat_tracks") $qry->setDbCriteria("repeat_tracks")
->setDbModifier("N/A") ->setDbModifier("N/A")
->setDbValue($p_criteriaData['etc']['sp_repeat_tracks']) ->setDbValue($p_criteriaData['etc']['sp_repeat_tracks'])
->setDbBlockId($this->id) ->setDbBlockId($this->id)
->save(); ->save();
} }
@ -1161,9 +1161,9 @@ SQL;
$totalTime += $length; $totalTime += $length;
$totalItems++; $totalItems++;
if ((!is_null($limit['items']) && $limit['items'] == count($insertList)) || $totalItems > 500 || $totalTime > $limit['time']) { if ((!is_null($limit['items']) && $limit['items'] == count($insertList)) || $totalItems > 500 || $totalTime > $limit['time']) {
$isBlockFull = true; $isBlockFull = true;
break; break;
} }
$iterator->next(); $iterator->next();
@ -1172,10 +1172,10 @@ SQL;
// if block is not full and reapeat_track is check, fill up more // if block is not full and reapeat_track is check, fill up more
while (!$isBlockFull && $repeat == 1) { while (!$isBlockFull && $repeat == 1) {
if (!$iterator->valid()) { if (!$iterator->valid()) {
$iterator->closeCursor(); $iterator->closeCursor();
$info = $this->getListofFilesMeetCriteria(); $info = $this->getListofFilesMeetCriteria();
$files = $info['files']; $files = $info['files'];
$files->getFirst(); $files->getFirst();
$iterator = $files->getIterator(); $iterator = $files->getIterator();
} }
$id = $iterator->current()->getDbId(); $id = $iterator->current()->getDbId();
@ -1184,8 +1184,8 @@ SQL;
$totalTime += $length; $totalTime += $length;
$totalItems++; $totalItems++;
if ((!is_null($limit['items']) && $limit['items'] == count($insertList)) || $totalItems > 500 || $totalTime > $limit['time']) { if ((!is_null($limit['items']) && $limit['items'] == count($insertList)) || $totalItems > 500 || $totalTime > $limit['time']) {
break; break;
} }
$iterator->next(); $iterator->next();