X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fdatetime.php;h=3578698240053115ea3c5f9738ee98deb082bdd0;hb=217a8ce6ee8fd163d81c71044d9497646296862f;hp=da454a32a5f467c980135ecdd3a1688568dda0f3;hpb=affb3938d2b3e81971b55e00613c4cd7fee513bd;p=friendica.git diff --git a/include/datetime.php b/include/datetime.php index da454a32a5..3578698240 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -4,7 +4,7 @@ * @brief Some functions for date and time related tasks. */ -use \Friendica\Core\Config; +use Friendica\Core\Config; /** * @brief Two-level sort for timezones. @@ -34,7 +34,7 @@ function timezone_cmp($a, $b) { /** * @brief Emit a timezone selector grouped (primarily) by continent - * + * * @param string $current Timezone * @return string Parsed HTML output */ @@ -81,17 +81,17 @@ function select_timezone($current = 'America/Los_Angeles') { /** * @brief Generating a Timezone selector - * + * * 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' - * + * * @param string $name Name of the selector * @param string $label Label for the selector * @param string $current Timezone * @param string $help Help text - * + * * @return string Parsed HTML */ function field_timezone($name='timezone', $label='', $current = 'America/Los_Angeles', $help){ @@ -114,7 +114,7 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang * @param string $s Some parseable date/time string * @param string $fmt Output format recognised from php's DateTime class * http://www.php.net/manual/en/datetime.format.php - * + * * @return string Formatted date according to given format */ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") { @@ -178,7 +178,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d function dob($dob) { list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); - $f = get_config('system','birthday_input_format'); + $f = get_config('system', 'birthday_input_format'); if (! $f) { $f = 'ymd'; } @@ -203,7 +203,7 @@ function dob($dob) { /// @TODO Old-lost code? // if ($dob && $dob > '0001-01-01') -// $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); +// $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year), 'dob'); // else // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob'); @@ -212,7 +212,7 @@ function dob($dob) { /** * @brief Returns a date selector - * + * * @param string $format * Format string, e.g. 'ymd' or 'mdy'. Not currently supported * @param string $min @@ -223,7 +223,7 @@ function dob($dob) { * Unix timestamp of default date * @param string $id * ID and name of datetimepicker (defaults to "datetimepicker") - * + * * @return string Parsed HTML output. */ function datesel($format, $min, $max, $default, $id = 'datepicker') { @@ -232,7 +232,7 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') { /** * @brief Returns a time selector - * + * * @param string $format * Format string, e.g. 'ymd' or 'mdy'. Not currently supported * @param $h @@ -241,7 +241,7 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') { * Already selected minute * @param string $id * ID and name of datetimepicker (defaults to "timepicker") - * + * * @return string Parsed HTML output. */ function timesel($format, $h, $m, $id = 'timepicker') { @@ -270,7 +270,7 @@ function timesel($format, $h, $m, $id = 'timepicker') { * @param $maxfrom * set maximum date from picker with id $maxfrom (none by default) * @param bool $required default false - * + * * @return string Parsed HTML output. * * @todo Once browser support is better this could probably be replaced with @@ -279,7 +279,7 @@ function timesel($format, $h, $m, $id = 'timepicker') { 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'); + $firstDay = get_pconfig(local_user(), 'system', 'first_day_of_week'); if ($firstDay === false) { $firstDay=0; } @@ -312,14 +312,14 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $pickers = ''; if (!$pickdate) { - $pickers .= ',datepicker: false'; + $pickers .= ', datepicker: false'; } if (!$picktime) { $pickers .= ',timepicker: false'; } $extra_js = ''; - $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'"; + $pickers .= ",dayOfWeekStart: " . $firstDay . ",lang:'" . $lang . "'"; if ($minfrom != '') { $extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; } @@ -335,7 +335,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $readable_format = str_replace('i','MM',$readable_format); $tpl = get_markup_template('field_input.tpl'); - $o .= replace_macros($tpl,array( + $o .= replace_macros($tpl, array( '$field' => array($id, $label, $input_text, '', (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'), )); @@ -417,7 +417,7 @@ function relative_date($posted_date, $format = null) { * @param string $dob Date of Birth * @param string $owner_tz (optional) Timezone of the person of interest * @param string $viewer_tz (optional) Timezone of the person viewing - * + * * @return int Age in years */ function age($dob, $owner_tz = '', $viewer_tz = '') { @@ -431,11 +431,11 @@ function age($dob, $owner_tz = '', $viewer_tz = '') { $viewer_tz = date_default_timezone_get(); } - $birthdate = datetime_convert('UTC',$owner_tz,$dob . ' 00:00:00+00:00','Y-m-d'); - list($year,$month,$day) = explode("-",$birthdate); - $year_diff = datetime_convert('UTC',$viewer_tz,'now','Y') - $year; - $curr_month = datetime_convert('UTC',$viewer_tz,'now','m'); - $curr_day = datetime_convert('UTC',$viewer_tz,'now','d'); + $birthdate = datetime_convert('UTC', $owner_tz,$dob . ' 00:00:00+00:00','Y-m-d'); + list($year, $month, $day) = explode("-", $birthdate); + $year_diff = datetime_convert('UTC',$viewer_tz, 'now', 'Y') - $year; + $curr_month = datetime_convert('UTC',$viewer_tz, 'now', 'm'); + $curr_day = datetime_convert('UTC',$viewer_tz, 'now', 'd'); if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) { $year_diff--; @@ -452,10 +452,10 @@ function age($dob, $owner_tz = '', $viewer_tz = '') { * * @param int $y Year * @param int $m Month (1=January, 12=December) - * + * * @return int Number of days in the given month */ -function get_dim($y,$m) { +function get_dim($y, $m) { $dim = array( 0, 31, 28, 31, 30, 31, 30, @@ -477,7 +477,7 @@ function get_dim($y,$m) { * * @param int $y Year * @param int $m Month (1=January, 12=December) - * + * * @return string day 0 = Sunday through 6 = Saturday */ function get_first_dim($y,$m) { @@ -498,7 +498,7 @@ function get_first_dim($y,$m) { * @param int $m Month * @param bool $links (default false) * @param string $class - * + * * @return string * * @todo Provide (prev,next) links, define class variations for different size calendars @@ -507,14 +507,14 @@ function cal($y = 0,$m = 0, $links = false, $class='') { // month table - start at 1 to match human usage. $mtab = array(' ', - 'January','February','March', - 'April','May','June', - 'July','August','September', - 'October','November','December' + 'January', 'February', 'March', + 'April' , 'May' , 'June', + 'July' , 'August' , 'September', + 'October', 'November', 'December' ); - $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); - $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); + $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now','Y'); + $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now','m'); if (! $y) { $y = $thisyear; } @@ -530,14 +530,14 @@ function cal($y = 0,$m = 0, $links = false, $class='') { $started = false; if (($y == $thisyear) && ($m == $thismonth)) { - $tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j')); + $tddate = intval(datetime_convert('UTC', date_default_timezone_get(), 'now', 'j')); } $str_month = day_translate($mtab[$m]); $o = '
' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . ' | '; + $o .= '' . mb_substr(day_translate($dn[$a]), 0, 3, 'UTF-8') . ' | '; } $o .= '
---|---|
"; - $day = str_replace(' ',' ',sprintf('%2.2d', $d)); + $day = str_replace(' ', ' ', sprintf('%2.2d', $d)); if ($started) { if (is_array($links) && isset($links[$d])) { $o .= "$day"; @@ -590,22 +590,20 @@ function update_contact_birthdays() { // This only handles foreign or alien networks where a birthday has been provided. // In-network birthdays are handled within local_delivery - $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`,1,4) != `bdyear` "); + $r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` "); if (dbm::is_result($r)) { foreach ($r as $rr) { logger('update_contact_birthday: ' . $rr['bd']); - $nextbd = datetime_convert('UTC','UTC','now','Y') . substr($rr['bd'],4); + $nextbd = datetime_convert('UTC','UTC','now','Y') . substr($rr['bd'], 4); - /** - * + /* * Add new birthday event for this person * * $bdtext is just a readable placeholder in case the event is shared * with others. We will replace it during presentation to our $importer * to contain a sparkle link and perhaps a photo. - * */ // Check for duplicates @@ -638,7 +636,6 @@ function update_contact_birthdays() { // update bdyear - q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", dbesc(substr($nextbd,0,4)), dbesc($nextbd), |