Merge pull request #2946 from annando/1611-bugfix-groups

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
index e27f54e09cd529015c924dec7ce3634e0127654f..16b134e90b13d8525fdfd3535f3694bb451ade2e 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -213,7 +213,7 @@ function dob($dob) {
  * @return string Parsed HTML output.
  */
 function datesel($format, $min, $max, $default, $id = 'datepicker') {
-       return datetimesel($format,$min,$max,$default,$id,true,false, '','');
+       return datetimesel($format,$min,$max,$default,'',$id,true,false, '','');
 }
 
 /**
@@ -231,7 +231,7 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') {
  * @return string Parsed HTML output.
  */
 function timesel($format, $h, $m, $id='timepicker') {
-       return datetimesel($format,new DateTime(),new DateTime(),new DateTime("$h:$m"),$id,false,true);
+       return datetimesel($format,new DateTime(),new DateTime(),new DateTime("$h:$m"),'',$id,false,true);
 }
 
 /**
@@ -262,7 +262,7 @@ function timesel($format, $h, $m, $id='timepicker') {
  * @todo Once browser support is better this could probably be replaced with
  * native HTML5 date picker.
  */
-function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) {
+function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) {
 
        // First day of the week (0 = Sunday)
        $firstDay = get_pconfig(local_user(),'system','first_day_of_week');
@@ -284,7 +284,7 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic
        $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : '';
        $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : '';
 
-       $input_text = $default ? 'value="' . date($dateformat, $default->getTimestamp()) . '"' : '';
+       $input_text = $default ? date($dateformat, $default->getTimestamp()) : '';
        $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : '';
 
        $pickers = '';
@@ -294,9 +294,9 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic
        $extra_js = '';
        $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'";
        if($minfrom != '')
-               $extra_js .= "\$('#$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})";
+               $extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})";
        if($maxfrom != '')
-               $extra_js .= "\$('#$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})";
+               $extra_js .= "\$('#id_$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})";
 
        $readable_format = $dateformat;
        $readable_format = str_replace('Y','yyyy',$readable_format);
@@ -305,10 +305,13 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic
        $readable_format = str_replace('H','HH',$readable_format);
        $readable_format = str_replace('i','MM',$readable_format);
 
-       $o .= "<div class='date'><input type='text' placeholder='$readable_format' name='$id' id='$id' $input_text />";
-       $o .= '</div>';
+       $tpl = get_markup_template('field_input.tpl');
+       $o .= replace_macros($tpl,array(
+                       '$field' => array($id, $label, $input_text, '', (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'),
+               ));
+
        $o .= "<script type='text/javascript'>";
-       $o .= "\$(function () {var picker = \$('#$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs}); $extra_js})";
+       $o .= "\$(function () {var picker = \$('#id_$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs}); $extra_js})";
        $o .= "</script>";
 
        return $o;
@@ -322,15 +325,15 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic
  * 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);
 
@@ -344,13 +347,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')),
@@ -365,10 +361,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]));
                }
        }
 }