Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x

This commit is contained in:
James 2012-02-27 18:10:58 -05:00
parent 33b6c2a390 fc2b18923e
commit 6eb7372909
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/Schedule.php
View File

@ -177,7 +177,7 @@ class Application_Model_Schedule {
$sql = "Select ft.artist_name, ft.track_title, st.starts as starts, st.ends as ends, st.media_item_played as media_item_played
FROM cc_schedule st LEFT JOIN cc_files ft ON st.file_id = ft.id LEFT JOIN cc_show_instances sit ON st.instance_id = sit.id
WHERE st.starts > (TIMESTAMP '$p_timeNow'-INTERVAL '1 hours') AND st.starts < (TIMESTAMP '$p_timeNow'+INTERVAL '1 hours') AND st.starts < sit.ends
WHERE st.starts > (TIMESTAMP '$p_timeNow'-INTERVAL '24 hours') AND st.starts < (TIMESTAMP '$p_timeNow'+INTERVAL '24 hours') AND st.starts < sit.ends
ORDER BY st.starts";
$row = $CC_DBC->GetAll($sql);

6
airtime_mvc/application/views/helpers/VersionNotify.php
View File

@ -27,7 +27,7 @@ class Airtime_View_Helper_VersionNotify extends Zend_View_Helper_Abstract{
}
// Calculate the version difference;
// Example: if current = 1.9.5 and latest = 3.0.0, diff = 115
// Example: if current = 1.9.5 and latest = 3.0.0, diff = 105
// Note: algorithm assumes the number after 1st dot never goes above 9
$versionDifference = (intval($latestExploded[0]) * 100 + intval($latestExploded[1]) *10 + intval($latestExploded[2]))
- (intval($currentExploded[0]) * 100 + intval($currentExploded[1] *10 + intval($currentExploded[2])));
@ -36,10 +36,10 @@ class Airtime_View_Helper_VersionNotify extends Zend_View_Helper_Abstract{
if($versionDifference <= 0) {
// current version is up to date or newer
$class = "uptodate";
} else if($versionDifference <= 20) {
} else if($versionDifference < 20) {
// 2 or less major versions back
$class = "update";
} else if($versionDifference == 30) {
} else if($versionDifference < 30) {
// 3 major versions back
$class = "update2";
} else {