tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-03-20 Sergio Martin <sergio.martin@artica.es> 

* include/functions.php: Recoded the human_time_description_raw
	function fixing bugs and improving exactly mode even years accuracy



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5802 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-03-20 16:45:32 +00:00
parent dfca5db6da
commit 172e349dd9
2 changed files with 81 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-03-20 Sergio Martin <sergio.martin@artica.es>
* include/functions.php: Recoded the human_time_description_raw
function fixing bugs and improving exactly mode even years accuracy
2012-03-20 Sergio Martin <sergio.martin@artica.es> 2012-03-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php * include/functions_reporting.php

91
pandora_console/include/functions.php
View File

@ -425,6 +425,7 @@ function human_time_description_raw ($seconds, $exactly = false, $units = 'large
$secondsString = __('seconds'); $secondsString = __('seconds');
$daysString = __('days'); $daysString = __('days');
$monthsString = __('months'); $monthsString = __('months');
$yearsString = __('years');
$minutesString = __('minutes'); $minutesString = __('minutes');
$hoursString = __('hours'); $hoursString = __('hours');
$nowString = __('Now'); $nowString = __('Now');
@ -433,6 +434,7 @@ function human_time_description_raw ($seconds, $exactly = false, $units = 'large
$secondsString = __('s'); $secondsString = __('s');
$daysString = __('d'); $daysString = __('d');
$monthsString = __('M'); $monthsString = __('M');
$yearsString = __('Y');
$minutesString = __('m'); $minutesString = __('m');
$hoursString = __('h'); $hoursString = __('h');
$nowString = __('N'); $nowString = __('N');
@ -447,22 +449,81 @@ function human_time_description_raw ($seconds, $exactly = false, $units = 'large
} }
if ($exactly) { if ($exactly) {
$secs = $seconds % 60; $returnDate = '';
$mins = ($seconds /60) % 60;
$hours = ($seconds / 3600) % 24; $years = floor($seconds / 31104000);
$days = ($seconds / 86400) % 30;
$months = format_numeric ($seconds / 2592000, 0); if($years != 0) {
$seconds = $seconds - ($years * 31104000);
$returnDate .= "$years $yearsString ";
}
$months = floor($seconds / 2592000);
if($months != 0) {
$seconds = $seconds - ($months * 2592000);
$returnDate .= "$months $monthsString ";
}
$days = floor($seconds / 86400);
if($days != 0) {
$seconds = $seconds - ($days * 86400);
$returnDate .= "$days $daysString ";
}
$returnTime = '';
$hours = floor($seconds / 3600);
if($hours != 0) {
$seconds = $seconds - ($hours * 3600);
$returnTime .= "$hours $hoursString ";
}
$mins = floor($seconds / 60);
if($mins != 0) {
$seconds = $seconds - ($mins * 60);
if($hours == 0) {
$returnTime .= "$mins $minutesString ";
}
else {
$returnTime = sprintf("%02d",$hours).':'.sprintf("%02d",$mins);
}
}
if($seconds != 0) {
if($hours == 0) {
$returnTime .= "$seconds $secondsString ";
}
else {
$returnTime = sprintf("%02d",$hours).':'.sprintf("%02d",$mins).':'.sprintf("%02d",$seconds);
}
}
$return = ' ';
if($returnDate != '') {
$return = $returnDate;
}
if($returnTime != '') {
$return .= $returnTime;
}
if($return == ' ') {
return $nowString;
}
else {
return $return;
}
if (($mins == 0) && ($hours == 0) && ($days == 0) && ($months == 0))
return format_numeric ($secs, 0).' '. $secondsString;
else if (($hours == 0) && ($days == 0) && ($months == 0))
return sprintf("%02d",$mins).':'.sprintf("%02d",$secs);
else if (($days == 0) && ($months == 0))
return sprintf("%02d",$hours).':'.sprintf("%02d",$mins).':'.sprintf("%02d",$secs);
else if (($months == 0))
return $days.' ' . $daysString . ' '.sprintf("%02d",$hours).':'.sprintf("%02d",$mins).':'.sprintf("%02d",$secs);
else
return $months.' '. $monthsString .' '.$days.' ' . $daysString . ' '.sprintf("%02d",$hours).':'.sprintf("%02d",$mins).':'.sprintf("%02d",$secs);
} }
if ($seconds < 60) if ($seconds < 60)