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

-doctrine 2.0 alpha upgrade scripts

Browse source
This commit is contained in:
martin 2011-03-08 16:44:47 -05:00
parent 3253d521d1
commit 7c1739247d
8 changed files with 20 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
application/forms/Preferences.php
View file

@ -38,7 +38,6 @@ class Application_Form_Preferences extends Zend_Form
$stream_format->setLabel('Stream Label:');
$stream_format->setMultiOptions(array("Artist - Title",
"Show - Artist - Title",
"Show",
"Station name - Show name"));
$stream_format->setValue(Application_Model_Preference::GetStreamLabelFormat());
$this->addElement($stream_format);

3
application/models/Nowplaying.php
View file

@ -82,6 +82,9 @@ class Application_Model_Nowplaying
$type = "n";
}
if (strtotime($item['item_ends']) > strtotime($item['show_ends']))
$type = "over";
array_push($data, array($type, $item["item_starts"], $item["item_starts"], $item["item_ends"], $item["clip_length"], $item["track_title"], $item["artist_name"], $item["album_title"], $item["playlist_name"], $item["show_name"], $item["instance_id"]));
}
}

1
application/models/Shows.php
View file

@ -788,6 +788,7 @@ class Show_DAL{
." WHERE ((si.starts < TIMESTAMP '$timeNow' - INTERVAL '$start seconds' AND si.ends > TIMESTAMP '$timeNow' - INTERVAL '$start seconds')"
." OR (si.starts > TIMESTAMP '$timeNow' - INTERVAL '$start seconds' AND si.ends < TIMESTAMP '$timeNow' + INTERVAL '$end seconds')"
." OR (si.starts < TIMESTAMP '$timeNow' + INTERVAL '$end seconds' AND si.ends > TIMESTAMP '$timeNow' + INTERVAL '$end seconds'))"
//checking for st.starts IS NULL so that the query also returns shows that do not have any items scheduled.
." AND (st.starts < si.ends OR st.starts IS NULL)"
." ORDER BY st.starts";