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

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

Browse source
This commit is contained in:
Martin Konecny 2012-05-14 16:10:02 -04:00
commit 04a0166315
3 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/RegisterAirtime.php
View file

@ -134,7 +134,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
'readonly' => true, 'readonly' => true,
'rows' => 5, 'rows' => 5,
'cols' => 61, 'cols' => 61,
'value' => Application_Model_Preference::GetSystemInfo(), 'value' => Application_Model_Preference::GetSystemInfo(false, true),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
) )

2
airtime_mvc/application/forms/SupportSettings.php
View file

@ -139,7 +139,7 @@ class Application_Form_SupportSettings extends Zend_Form
'readonly' => true, 'readonly' => true,
'cols' => 61, 'cols' => 61,
'rows' => 5, 'rows' => 5,
'value' => Application_Model_Preference::GetSystemInfo(), 'value' => Application_Model_Preference::GetSystemInfo(false, true),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
) )

39
airtime_mvc/application/models/LiveLog.php
View file

@ -32,9 +32,17 @@ class Application_Model_LiveLog
$duration = $start->diff($end); $duration = $start->diff($end);
$duration = $duration->format("%H:%i:%s"); $duration = $duration->format("%H:%i:%s");
$intervals = explode(":", $duration); $intervals = explode(":", $duration);
for ($i = 0; $i < sizeof($intervals); $i++) {
if (!isset($intervals[$i])) {
$intervals[$i] = 0;
}
}
// Trim milliseconds (DateInterval does not support) // Trim milliseconds (DateInterval does not support)
$sec = explode(".", $intervals[2]); $sec = explode(".", $intervals[2]);
if (isset($sec[0])) {
$intervals[2] = $sec[0]; $intervals[2] = $sec[0];
}
$seconds += $intervals[2]; $seconds += $intervals[2];
if ($seconds / 60 >= 1) { if ($seconds / 60 >= 1) {
@ -59,9 +67,12 @@ class Application_Model_LiveLog
} }
//Trim milliseconds //Trim milliseconds
$seconds = explode(".", $seconds); $seconds = explode(".", $seconds);
if (isset($seconds[0])) {
$minutes = (double)(($hours*60)+$minutes . "." . $seconds[0]); $minutes = (double)(($hours*60)+$minutes . "." . $seconds[0]);
//$duration = new DateInterval("PT" . $minutes . "M" . $seconds[0] ."S"); }
//return $duration->format("%i.%s"); else {
$minutes = (double)(($hours*60)+$minutes);
}
return $minutes; return $minutes;
} catch (Exception $e) { } catch (Exception $e) {
header('HTTP/1.0 503 Service Unavailable'); header('HTTP/1.0 503 Service Unavailable');
@ -118,11 +129,21 @@ class Application_Model_LiveLog
$clip_length = $track['clip_length']; $clip_length = $track['clip_length'];
//Convert clip_length into seconds //Convert clip_length into seconds
$clip_length_intervals = explode(":", $clip_length); $clip_length_intervals = explode(":", $clip_length);
for ($i = 0; $i < sizeof($clip_length_intervals); $i++) {
if (!isset($clip_length_intervals[$i])) {
$clip_length_intervals[$i] = 0;
}
}
$clip_length_seconds = $clip_length_intervals[0]*3600 + $clip_length_intervals[1]*60 + $clip_length_intervals[2]; $clip_length_seconds = $clip_length_intervals[0]*3600 + $clip_length_intervals[1]*60 + $clip_length_intervals[2];
$extra_time = $extra_time->format("%H:%i:%s"); $extra_time = $extra_time->format("%H:%i:%s");
//Convert extra_time into seconds; //Convert extra_time into seconds;
$extra_time_intervals = explode(":", $extra_time); $extra_time_intervals = explode(":", $extra_time);
for ($i = 0; $i < sizeof($extra_time_intervals); $i++) {
if (!isset($extra_time_intervals[$i])) {
$extra_time_intervals[$i] = 0;
}
}
$extra_time_seconds = $extra_time_intervals[0]*3600 + $extra_time_intervals[1]*60 + $extra_time_intervals[2]; $extra_time_seconds = $extra_time_intervals[0]*3600 + $extra_time_intervals[1]*60 + $extra_time_intervals[2];
$clip_length_seconds -= $extra_time_seconds; $clip_length_seconds -= $extra_time_seconds;
@ -152,9 +173,16 @@ class Application_Model_LiveLog
} }
$intervals = explode(":", $clip_length); $intervals = explode(":", $clip_length);
for ($i = 0; $i < sizeof($intervals); $i++) {
if (!isset($intervals[$i])) {
$intervals[$i] = 0;
}
}
// Trim milliseconds (DateInteral does not support) // Trim milliseconds (DateInteral does not support)
$sec = explode(".", $intervals[2]); $sec = explode(".", $intervals[2]);
if (isset($sec[0])) {
$intervals[2] = $sec[0]; $intervals[2] = $sec[0];
}
$seconds += $intervals[2]; $seconds += $intervals[2];
if ($seconds / 60 >= 1) { if ($seconds / 60 >= 1) {
@ -181,9 +209,12 @@ class Application_Model_LiveLog
$seconds = explode(".", $seconds); $seconds = explode(".", $seconds);
if (isset($seconds[0])) {
$minutes = (double)(($hours*60)+$minutes . "." . $seconds[0]); $minutes = (double)(($hours*60)+$minutes . "." . $seconds[0]);
//$duration = new DateInterval("PT". $minutes . "M" . $seconds[0] ."S"); }
//return $duration->format("%i.%s"); else {
$minutes = (double)(($hours*60)+$minutes);
}
return $minutes; return $minutes;
} catch (Exception $e) { } catch (Exception $e) {
header('HTTP/1.0 503 Service Unavailable'); header('HTTP/1.0 503 Service Unavailable');