Some changed logging

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
index 949f68dec59c7db8d4a7db288f38d1229ac1f300..779c7a5aadae7f9b46e33fa1525130bbf3abad9b 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -4,6 +4,7 @@
  * @brief Some functions for date and time related tasks.
  */
 
+use \Friendica\Core\Config;
 
 /**
  * @brief Two-level sort for timezones.
@@ -162,7 +163,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
  * @brief Wrapper for date selector, tailored for use in birthday fields.
  *
  * @param string $dob Date of Birth
- * @return string
+ * @return string Formatted html
  */
 function dob($dob) {
        list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
@@ -175,7 +176,18 @@ function dob($dob) {
        else
                $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));
 
-       $o = '<input type="text" name="dob" value="' . $value . '" placeholder="' . t('YYYY-MM-DD or MM-DD') . '" />';
+       $age = ((intval($value)) ? age($value, $a->user["timezone"], $a->user["timezone"]) : "");
+
+       $o = replace_macros(get_markup_template("field_input.tpl"), array(
+               '$field' => array(
+                       'dob',
+                       t('Birthday:'),
+                       $value,
+                       (((intval($age)) > 0 ) ? t('Age: ') . $age : ""),
+                       '',
+                       'placeholder="' . t('YYYY-MM-DD or MM-DD') . '"'
+               )
+       ));
 
 //     if ($dob && $dob != '0000-00-00')
 //             $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob');
@@ -260,8 +272,9 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
        $lang = substr(get_browser_language(), 0, 2);
 
        // Check if the detected language is supported by the picker
-       if (!in_array($lang, array("ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr", "it", "da", "no", "ja", "vi", "sl", "cs", "hu")))
-               $lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
+       if (!in_array($lang, array("ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr", "it", "da", "no", "ja", "vi", "sl", "cs", "hu"))) {
+               $lang = Config::get('system', 'language', 'en');
+       }
 
        $o = '';
        $dateformat = '';
@@ -314,15 +327,15 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
  * Results relative to current timezone.
  * Limited to range of timestamps.
  *
- * @param string $posted_date
+ * @param string $posted_date MySQL-formatted date string (YYYY-MM-DD HH:MM:SS)
  * @param string $format (optional) Parsed with sprintf()
  *    <tt>%1$d %2$s ago</tt>, e.g. 22 hours ago, 1 minute ago
- * 
+ *
  * @return string with relative date
  */
-function relative_date($posted_date,$format = null) {
+function relative_date($posted_date, $format = null) {
 
-       $localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date);
+       $localtime = $posted_date . ' UTC';
 
        $abs = strtotime($localtime);
 
@@ -336,13 +349,6 @@ function relative_date($posted_date,$format = null) {
                return t('less than a second ago');
        }
 
-       /*
-       $time_append = '';
-       if ($etime >= 86400) {
-               $time_append = ' ('.$localtime.')';
-       }
-       */
-
        $a = array( 12 * 30 * 24 * 60 * 60  =>  array( t('year'),   t('years')),
                                30 * 24 * 60 * 60       =>  array( t('month'),  t('months')),
                                7  * 24 * 60 * 60       =>  array( t('week'),   t('weeks')),
@@ -357,10 +363,11 @@ function relative_date($posted_date,$format = null) {
                if ($d >= 1) {
                        $r = round($d);
                        // translators - e.g. 22 hours ago, 1 minute ago
-                       if(! $format)
+                       if (!$format) {
                                $format = t('%1$d %2$s ago');
+                       }
 
-                       return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
+                       return sprintf($format, $r, (($r == 1) ? $str[0] : $str[1]));
                }
        }
 }
@@ -547,8 +554,8 @@ function update_contact_birthdays() {
        // In-network birthdays are handled within local_delivery
 
        $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` ");
-       if(count($r)) {
-               foreach($r as $rr) {
+       if (dbm::is_result($r)) {
+               foreach ($r as $rr) {
 
                        logger('update_contact_birthday: ' . $rr['bd']);