diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index 501f8081bff9969d2d3b4b4317c03176d92d0395..0aa2b27b96be5dde13d6663dd4d1b8a26d0e5e4d 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -85,22 +85,51 @@ function human_file_size( $bytes ) {
return OC_Helper::humanFileSize( $bytes );
}
-function relative_modified_date($timestamp) {
+/**
+ * @brief Strips the timestamp of its time value
+ * @param int $timestamp UNIX timestamp to strip
+ * @return $timestamp without time value
+ */
+function strip_time($timestamp){
+ $date = new \DateTime("@{$timestamp}");
+ $date->setTime(0, 0, 0);
+ return intval($date->format('U'));
+}
+
+/**
+ * @brief Formats timestamp relatively to the current time using
+ * a human-friendly format like "x minutes ago" or "yesterday"
+ * @param int $timestamp timestamp to format
+ * @param int $fromTime timestamp to compare from, defaults to current time
+ * @param bool $dateOnly whether to strip time information
+ * @return formatted timestamp
+ */
+function relative_modified_date($timestamp, $fromTime = null, $dateOnly = false) {
$l=OC_L10N::get('lib');
- $timediff = time() - $timestamp;
+ if (!isset($fromTime) || $fromTime === null){
+ $fromTime = time();
+ }
+ if ($dateOnly){
+ $fromTime = strip_time($fromTime);
+ $timestamp = strip_time($timestamp);
+ }
+ $timediff = $fromTime - $timestamp;
$diffminutes = round($timediff/60);
$diffhours = round($diffminutes/60);
$diffdays = round($diffhours/24);
$diffmonths = round($diffdays/31);
- if($timediff < 60) { return $l->t('seconds ago'); }
- else if($timediff < 3600) { return $l->n('%n minute ago', '%n minutes ago', $diffminutes); }
- else if($timediff < 86400) { return $l->n('%n hour ago', '%n hours ago', $diffhours); }
- else if((date('G')-$diffhours) > 0) { return $l->t('today'); }
- else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); }
+ if(!$dateOnly && $timediff < 60) { return $l->t('seconds ago'); }
+ else if(!$dateOnly && $timediff < 3600) { return $l->n('%n minute ago', '%n minutes ago', $diffminutes); }
+ else if(!$dateOnly && $timediff < 86400) { return $l->n('%n hour ago', '%n hours ago', $diffhours); }
+ else if((date('G', $fromTime)-$diffhours) >= 0) { return $l->t('today'); }
+ else if((date('G', $fromTime)-$diffhours) >= -24) { return $l->t('yesterday'); }
+ // 86400 * 31 days = 2678400
else if($timediff < 2678400) { return $l->n('%n day go', '%n days ago', $diffdays); }
+ // 86400 * 60 days = 518400
else if($timediff < 5184000) { return $l->t('last month'); }
- else if((date('n')-$diffmonths) > 0) { return $l->n('%n month ago', '%n months ago', $diffmonths); }
+ else if((date('n', $fromTime)-$diffmonths) > 0) { return $l->n('%n month ago', '%n months ago', $diffmonths); }
+ // 86400 * 365.25 days * 2 = 63113852
else if($timediff < 63113852) { return $l->t('last year'); }
else { return $l->t('years ago'); }
}
diff --git a/lib/public/template.php b/lib/public/template.php
index 3b1a4ed4906763fae906314ec3fcc436c86e4771..a5c500b0e25a90b09270394017b74162d73c699c 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -90,8 +90,8 @@ function human_file_size( $bytes ) {
* @param $timestamp unix timestamp
* @returns human readable interpretation of the timestamp
*/
-function relative_modified_date($timestamp) {
- return(\relative_modified_date($timestamp));
+function relative_modified_date($timestamp, $dateOnly = false) {
+ return(\relative_modified_date($timestamp, null, $dateOnly));
}
diff --git a/tests/lib/template.php b/tests/lib/template.php
index fd12119da580aa5ed241a0784cdd4de389c27ae6..b4f1a4c40533f9b8cf1d587763ae83de7fe49388 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -46,7 +46,6 @@ class Test_TemplateFunctions extends PHPUnit_Framework_TestCase {
$this->assertEquals("This is a good string!", $result);
}
-
public function testPrintUnescaped() {
$htmlString = "<script>alert('xss');</script>";
@@ -66,5 +65,194 @@ class Test_TemplateFunctions extends PHPUnit_Framework_TestCase {
$this->assertEquals("This is a good string!", $result);
}
+ // ---------------------------------------------------------------------------
+ // Test relative_modified_date with dates only
+ // ---------------------------------------------------------------------------
+ public function testRelativeDateToday(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('today', $result);
+
+ // 2 hours ago is still today
+ $elementTime = $currentTime - 2 * 3600;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('today', $result);
+ }
+
+ public function testRelativeDateYesterday(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 24 * 3600;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('yesterday', $result);
+
+ // yesterday - 2 hours is still yesterday
+ $elementTime = $currentTime - 26 * 3600;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('yesterday', $result);
+ }
+
+ public function testRelativeDate2DaysAgo(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 48 * 3600;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('2 days ago', $result);
+
+ // 2 days ago minus 4 hours is still 2 days ago
+ $elementTime = $currentTime - 52 * 3600;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('2 days ago', $result);
+ }
+
+ public function testRelativeDateLastMonth(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 86400 * 31;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('last month', $result);
+
+ $elementTime = $currentTime - 86400 * 35;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('last month', $result);
+ }
+
+ public function testRelativeDateMonthsAgo(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 86400 * 60;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('2 months ago', $result);
+
+ $elementTime = $currentTime - 86400 * 65;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('2 months ago', $result);
+ }
+
+ public function testRelativeDateLastYear(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 86400 * 365;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('last year', $result);
+
+ $elementTime = $currentTime - 86400 * 450;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('last year', $result);
+ }
+
+ public function testRelativeDateYearsAgo(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 86400 * 365.25 * 2;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('years ago', $result);
+
+ $elementTime = $currentTime - 86400 * 365.25 * 3;
+ $result = (string)relative_modified_date($elementTime, $currentTime, true);
+
+ $this->assertEquals('years ago', $result);
+ }
+ // ---------------------------------------------------------------------------
+ // Test relative_modified_date with timestamps only (date + time value)
+ // ---------------------------------------------------------------------------
+
+ public function testRelativeTimeSecondsAgo(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 5;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('seconds ago', $result);
+ }
+
+ public function testRelativeTimeMinutesAgo(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 190;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('3 minutes ago', $result);
+ }
+
+ public function testRelativeTimeHoursAgo(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 7500;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('2 hours ago', $result);
+ }
+
+ public function testRelativeTime2DaysAgo(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 48 * 3600;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('2 days ago', $result);
+
+ // 2 days ago minus 4 hours is still 2 days ago
+ $elementTime = $currentTime - 52 * 3600;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('2 days ago', $result);
+ }
+
+ public function testRelativeTimeLastMonth(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 86400 * 31;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('last month', $result);
+
+ $elementTime = $currentTime - 86400 * 35;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('last month', $result);
+ }
+
+ public function testRelativeTimeMonthsAgo(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 86400 * 60;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('2 months ago', $result);
+
+ $elementTime = $currentTime - 86400 * 65;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('2 months ago', $result);
+ }
+
+ public function testRelativeTimeLastYear(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 86400 * 365;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('last year', $result);
+
+ $elementTime = $currentTime - 86400 * 450;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('last year', $result);
+ }
+
+ public function testRelativeTimeYearsAgo(){
+ $currentTime = 1380703592;
+ $elementTime = $currentTime - 86400 * 365.25 * 2;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('years ago', $result);
+
+ $elementTime = $currentTime - 86400 * 365.25 * 3;
+ $result = (string)relative_modified_date($elementTime, $currentTime, false);
+
+ $this->assertEquals('years ago', $result);
+ }
}