Merge branch 'master' of git://github.com/friendica/friendica

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
index 087e6cb20dc2f1879838be38204544dea2444eb9..f4dcfce62e9fb90952a65c1158781ca7ed8a339a 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -15,7 +15,6 @@ function timezone_cmp($a, $b) {
 }}
 
 // emit a timezone selector grouped (primarily) by continent
-
 if(! function_exists('select_timezone')) {
 function select_timezone($current = 'America/Los_Angeles') {
 
@@ -55,6 +54,23 @@ function select_timezone($current = 'America/Los_Angeles') {
        return $o;
 }}
 
+// return a select using 'field_select_raw' template, with timezones 
+// groupped (primarily) by continent
+// arguments follow convetion as other field_* template array:
+// 'name', 'label', $value, 'help'
+if (!function_exists('field_timezone')){
+function field_timezone($name='timezone', $label='', $current = 'America/Los_Angeles', $help){
+       $options = select_timezone($current);
+       $options = str_replace('<select id="timezone_select" name="timezone">','', $options);
+       $options = str_replace('</select>','', $options);
+       
+       $tpl = get_markup_template('field_select_raw.tpl');
+       return replace_macros($tpl, array(
+               '$field' => array($name, $label, $current, $help, $options),
+       ));
+       
+}}
+
 // General purpose date parse/convert function.
 // $from = source timezone
 // $to   = dest timezone
@@ -64,6 +80,16 @@ function select_timezone($current = 'America/Los_Angeles') {
 if(! function_exists('datetime_convert')) {
 function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
 
+       // Defaults to UTC if nothing is set, but throws an exception if set to empty string.
+       // Provide some sane defaults regardless.
+
+       if($from === '')
+               $from = 'UTC';
+       if($to === '')
+               $to = 'UTC';
+       if($s === '')
+               $s = 'now';
+
        // Slight hackish adjustment so that 'zero' datetime actually returns what is intended
        // otherwise we end up with -0001-11-30 ...
        // add 32 days so that we at least get year 00, and then hack around the fact that 
@@ -244,10 +270,11 @@ function relative_date($posted_date) {
        );
     
        foreach ($a as $secs => $str) {
-       $d = $etime / $secs;
-       if ($d >= 1) {
-               $r = round($d);
-               return $r . ' ' . (($r == 1) ? $str[0] : $str[1]) . t(' ago');
+               $d = $etime / $secs;
+               if ($d >= 1) {
+                       $r = round($d);
+                       // translators - e.g. 22 hours ago, 1 minute ago
+                       return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1]));
         }
     }
 }}
@@ -446,4 +473,4 @@ function update_contact_birthdays() {
 
                }
        }
-}
\ No newline at end of file
+}