Replace remaining functions in include/datetime by Temporal methods

- Fix uses statements

diff --git a/include/conversation.php b/include/conversation.php
index d312c2d9e24886c05f6a78d2f1850af505d00597..f0d6bbfabac76c2aac17c1942d2463170d9e897d 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -15,9 +15,10 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Object\Post;
-use Friendica\Util\XML;
 use Friendica\Object\Thread;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
+use Friendica\Util\XML;
 
 require_once "include/bbcode.php";
 require_once "include/acl_selectors.php";
@@ -791,7 +792,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                                        'folders' => $folders,
                                        'text' => strip_tags($body_e),
                                        'localtime' => DateTimeFormat::local($item['created'], 'r'),
-                                       'ago' => (($item['app']) ? L10n::t('%s from %s', relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+                                       'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
                                        'location' => $location_e,
                                        'indent' => '',
                                        'owner_name' => $owner_name_e,
@@ -1166,7 +1167,7 @@ function builtin_activity_puller($item, &$conv_responses) {
  * @param array $arr = array of pre-linked names of likers/dislikers
  * @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
  * @param int $id  = item id
- * @return formatted text
+ * @return string formatted text
  */
 function format_like($cnt, array $arr, $type, $id) {
        $o = '';

diff --git a/include/items.php b/include/items.php
index f1c895f90fece19a2aac720a9d5fa1835c8b4b0b..0ed444da289a2e63c5eeb2dcaa37eafc37c00a35 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -17,6 +17,7 @@ use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
+use Friendica\Util\Temporal;
 
 require_once 'include/bbcode.php';
 require_once 'include/tags.php';
@@ -428,7 +429,7 @@ function list_post_dates($uid, $wall) {
        while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
                $dyear = intval(substr($dnow, 0, 4));
                $dstart = substr($dnow, 0, 8) . '01';
-               $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5)));
+               $dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
                $start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
                $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
                $str = day_translate(DateTimeFormat::utc($dnow, 'F'));

diff --git a/mod/admin.php b/mod/admin.php
index 5d6a8fbafdd29f2b95b7426b5fb911880c8d6532..5625bb98d799dc27ced82cbcc9f63a725220566c 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -21,6 +21,7 @@ use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Module\Login;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -1648,13 +1649,13 @@ function admin_page_users(App $a)
                        L10n::t('Automatic Friend Account')
                ];
                $e['page-flags'] = $accounts[$e['page-flags']];
-               $e['register_date'] = relative_date($e['register_date']);
-               $e['login_date'] = relative_date($e['login_date']);
-               $e['lastitem_date'] = relative_date($e['lastitem_date']);
+               $e['register_date'] = Temporal::getRelativeDate($e['register_date']);
+               $e['login_date'] = Temporal::getRelativeDate($e['login_date']);
+               $e['lastitem_date'] = Temporal::getRelativeDate($e['lastitem_date']);
                //$e['is_admin'] = ($e['email'] === $a->config['admin_email']);
                $e['is_admin'] = in_array($e['email'], $adminlist);
                $e['is_deletable'] = (intval($e['uid']) != local_user());
-               $e['deleted'] = ($e['account_removed'] ? relative_date($e['account_expires_on']) : False);
+               $e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);
                return $e;
        };
        $users = array_map($_setup_users, $users);

diff --git a/mod/cal.php b/mod/cal.php
index cafef3e300beede45824bccdb0f33eb44480831a..ae4928bdf2b1c44d74fff3a7c7332902ce6d9ca1 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -18,6 +18,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 require_once 'include/event.php';
 
@@ -188,7 +189,7 @@ function cal_content(App $a)
                        $prevyear --;
                }
 
-               $dim = get_dim($y, $m);
+               $dim = Temporal::getDaysInMonth($y, $m);
                $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
                $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
 
@@ -274,7 +275,7 @@ function cal_content(App $a)
                        '$view' => L10n::t('View'),
                        '$previous' => [System::baseUrl() . "/events/$prevyear/$prevmonth", L10n::t('Previous'), '', ''],
                        '$next' => [System::baseUrl() . "/events/$nextyear/$nextmonth", L10n::t('Next'), '', ''],
-                       '$calendar' => cal($y, $m, $links, ' eventcal'),
+                       '$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
                        '$events' => $events,
                        "today" => L10n::t("today"),
                        "month" => L10n::t("month"),

diff --git a/mod/events.php b/mod/events.php
index 4f45c61bf549f83013bafecc38afccbb8698c3d8..2ff97e9fd617d78122ba6fb265d3404de99e6643 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -13,6 +13,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -310,7 +311,7 @@ function events_content(App $a) {
                        $prevyear --;
                }
 
-               $dim    = get_dim($y, $m);
+               $dim    = Temporal::getDaysInMonth($y, $m);
                $start  = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
                $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
 
@@ -395,7 +396,7 @@ function events_content(App $a) {
                        '$new_event' => [System::baseUrl() . '/events/new', L10n::t('Create New Event'), '', ''],
                        '$previous'  => [System::baseUrl() . '/events/$prevyear/$prevmonth', L10n::t('Previous'), '', ''],
                        '$next'      => [System::baseUrl() . '/events/$nextyear/$nextmonth', L10n::t('Next'), '', ''],
-                       '$calendar'  => cal($y, $m, $links, ' eventcal'),
+                       '$calendar'  => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
 
                        '$events'    => $events,
 
@@ -510,11 +511,11 @@ function events_content(App $a) {
                        '$title' => L10n::t('Event details'),
                        '$desc' => L10n::t('Starting date and Title are required.'),
                        '$s_text' => L10n::t('Event Starts:') . ' <span class="required" title="' . L10n::t('Required') . '">*</span>',
-                       '$s_dsel' => datetimesel(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), L10n::t('Event Starts:'), 'start_text', true, true, '', '', true),
+                       '$s_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), L10n::t('Event Starts:'), 'start_text', true, true, '', '', true),
                        '$n_text' => L10n::t('Finish date/time is not known or not relevant'),
                        '$n_checked' => $n_checked,
                        '$f_text' => L10n::t('Event Finishes:'),
-                       '$f_dsel' => datetimesel(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), L10n::t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
+                       '$f_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), L10n::t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
                        '$a_text' => L10n::t('Adjust for viewer timezone'),
                        '$a_checked' => $a_checked,
                        '$d_text' => L10n::t('Description:'),

diff --git a/mod/localtime.php b/mod/localtime.php
index 4920962a7b443d033ea32571f21c26c048654ca0..fd1ef33a95ee2571e052659701a5ebd987f2dd6b 100644 (file)
--- a/mod/localtime.php
+++ b/mod/localtime.php
@@ -6,6 +6,7 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 
 require_once 'include/datetime.php';

diff --git a/mod/message.php b/mod/message.php
index ec5669937370a8d7709cc350869044b6c0276062..f1e3b7645882fcc62d6ccbd75ab59e22517b1406 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -12,6 +12,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 require_once 'include/acl_selectors.php';
 require_once 'include/conversation.php';
@@ -398,7 +399,7 @@ function message_content(App $a)
                                'delete' => L10n::t('Delete message'),
                                'to_name' => $to_name_e,
                                'date' => DateTimeFormat::local($message['created'], 'D, d M Y - g:i A'),
-                               'ago' => relative_date($message['created']),
+                               'ago' => Temporal::getRelativeDate($message['created']),
                        ];
 
                        $seen = $message['seen'];
@@ -499,7 +500,7 @@ function render_messages(array $msg, $t)
                        '$body' => $body_e,
                        '$to_name' => $to_name_e,
                        '$date' => DateTimeFormat::local($rr['mailcreated'], L10n::t('D, d M Y - g:i A')),
-                       '$ago' => relative_date($rr['mailcreated']),
+                       '$ago' => Temporal::getRelativeDate($rr['mailcreated']),
                        '$seen' => $rr['mailseen'],
                        '$count' => L10n::tt('%d message', '%d messages', $rr['count']),
                ]);

diff --git a/mod/notify.php b/mod/notify.php
index 3613aab39977783af1801ca93e60c8ebfbd72880..0ab2b0d4147b2e222c492fdfcd4fef57e16db6a0 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -2,13 +2,15 @@
 /**
  * @file mod/notify.php
  */
+
 use Friendica\App;
-use Friendica\Core\NotificationsManager;
 use Friendica\Core\L10n;
+use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-use Friendica\Module\Login;
 use Friendica\Model\Item;
+use Friendica\Module\Login;
+use Friendica\Util\Temporal;
 
 function notify_init(App $a)
 {
@@ -68,7 +70,7 @@ function notify_content(App $a)
                                '$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'],
                                '$item_image' => $it['photo'],
                                '$item_text' => strip_tags(bbcode($it['msg'])),
-                               '$item_when' => relative_date($it['date'])
+                               '$item_when' => Temporal::getRelativeDate($it['date'])
                        ]);
                }
        } else {

diff --git a/mod/photos.php b/mod/photos.php
index 8b3dbdc759ae4294fda0bbeab81438e99d210cd4..56c5690d95470400e61990918c98a2694a8d549a 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -22,6 +22,7 @@ use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
+use Friendica\Util\Temporal;
 
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
@@ -1622,7 +1623,7 @@ function photos_content(App $a)
                                                '$sparkle' => $sparkle,
                                                '$title' => $title_e,
                                                '$body' => $body_e,
-                                               '$ago' => relative_date($item['created']),
+                                               '$ago' => Temporal::getRelativeDate($item['created']),
                                                '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
                                                '$drop' => $drop,
                                                '$comment' => $comment

diff --git a/mod/ping.php b/mod/ping.php
index 3249624fbeb3c87388f3b64a02df584cbcf83266..87053395c103959335f42c6bbd95e7a7ad9efa92 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -15,6 +15,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
 require_once 'include/datetime.php';
@@ -370,7 +371,7 @@ function ping_init(App $a)
                                        'name'      => $notif['name'],
                                        'url'       => $notif['url'],
                                        'photo'     => $notif['photo'],
-                                       'date'      => relative_date($notif['date']),
+                                       'date'      => Temporal::getRelativeDate($notif['date']),
                                        'message'   => $notif['message'],
                                        'seen'      => $notif['seen'],
                                        'timestamp' => strtotime($local_time)

diff --git a/mod/profiles.php b/mod/profiles.php
index bde24764ff64d54f5eb9796d0a1298563c3d662c..ce71f0c741dfac61048fe5f71e840eaeb898c489 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -15,10 +15,11 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
 use Friendica\Model\Item;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 function profiles_init(App $a) {
 
@@ -714,14 +715,14 @@ function profiles_content(App $a) {
                        '$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . L10n::t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
                        '$name' => ['name', L10n::t('Your Full Name:'), $r[0]['name']],
                        '$pdesc' => ['pdesc', L10n::t('Title/Description:'), $r[0]['pdesc']],
-                       '$dob' => dob($r[0]['dob']),
+                       '$dob' => Temporal::getDateofBirthField($r[0]['dob']),
                        '$hide_friends' => $hide_friends,
                        '$address' => ['address', L10n::t('Street Address:'), $r[0]['address']],
                        '$locality' => ['locality', L10n::t('Locality/City:'), $r[0]['locality']],
                        '$region' => ['region', L10n::t('Region/State:'), $r[0]['region']],
                        '$postal_code' => ['postal_code', L10n::t('Postal/Zip Code:'), $r[0]['postal-code']],
                        '$country_name' => ['country_name', L10n::t('Country:'), $r[0]['country-name']],
-                       '$age' => ((intval($r[0]['dob'])) ? '(' . L10n::t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
+                       '$age' => ((intval($r[0]['dob'])) ? '(' . L10n::t('Age: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
                        '$gender' => ContactSelector::gender($r[0]['gender']),
                        '$marital' => ContactSelector::maritalStatus($r[0]['marital']),
                        '$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')],

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 356ed4a472e57aad7145077ecf23f3f01468199d..5cbd567a952c00fa4399dcf408df7b36c6d2ae3e 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -14,6 +14,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
 require_once 'include/dba.php';
@@ -45,7 +46,7 @@ class NotificationsManager extends BaseObject
                foreach ($notes as $n) {
                        $local_time = DateTimeFormat::local($n['date']);
                        $n['timestamp'] = strtotime($local_time);
-                       $n['date_rel'] = relative_date($n['date']);
+                       $n['date_rel'] = Temporal::getRelativeDate($n['date']);
                        $n['msg_html'] = bbcode($n['msg'], false, false, false, false);
                        $n['msg_plain'] = explode("\n", trim(html2plain($n['msg_html'], 0)))[0];
 
@@ -245,7 +246,7 @@ class NotificationsManager extends BaseObject
                                                $default_item_url = $it['url'];
                                                $default_item_text = strip_tags(bbcode($it['msg']));
                                                $default_item_when = DateTimeFormat::local($it['date'], 'r');
-                                               $default_item_ago = relative_date($it['date']);
+                                               $default_item_ago = Temporal::getRelativeDate($it['date']);
                                                break;
 
                                        case 'home':
@@ -255,7 +256,7 @@ class NotificationsManager extends BaseObject
                                                $default_item_url = $it['author-link'];
                                                $default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']);
                                                $default_item_when = DateTimeFormat::local($it['created'], 'r');
-                                               $default_item_ago = relative_date($it['created']);
+                                               $default_item_ago = Temporal::getRelativeDate($it['created']);
                                                break;
 
                                        default:
@@ -267,7 +268,7 @@ class NotificationsManager extends BaseObject
                                                                        ? L10n::t("%s created a new post", $it['author-name'])
                                                                        : L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']));
                                                $default_item_when = DateTimeFormat::local($it['created'], 'r');
-                                               $default_item_ago = relative_date($it['created']);
+                                               $default_item_ago = Temporal::getRelativeDate($it['created']);
                                }
 
                                // Transform the different types of notification in an usable array

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 0dce1c08c67e4bffa272947380a62a0fcdb69d9b..3522bab8efc4bb5385a9a9e06ac550c38ae79b3b 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -19,6 +19,7 @@ use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -258,7 +259,7 @@ class Profile
         * @param int $block
         * @param boolean $show_connect Show connect link
         *
-        * @return HTML string suitable for sidebar inclusion
+        * @return string HTML sidebar module
         *
         * @note Returns empty string if passed $profile is wrong type or not populated
         *
@@ -740,7 +741,7 @@ class Profile
 
                        if (!empty($a->profile['dob'])
                                && $a->profile['dob'] > '0001-01-01'
-                               && $age = age($a->profile['dob'], $a->profile['timezone'], '')
+                               && $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'], '')
                        ) {
                                $profile['age'] = [L10n::t('Age:'), $age];
                        }
@@ -755,7 +756,7 @@ class Profile
                        }
 
                        if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
-                               $profile['howlong'] = relative_date($a->profile['howlong'], L10n::t('for %1$d %2$s'));
+                               $profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
                        }
 
                        if ($a->profile['sexual']) {

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 198ca658061a203c9b23f7d49c13abea20f37811..16dabbb71e4405d3d6410ddce9a641111b5ec7e1 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -14,6 +14,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
@@ -125,7 +126,7 @@ class Post extends BaseObject
                        $edited = [
                                'label'    => L10n::t('This entry was edited'),
                                'date'     => DateTimeFormat::local($item['edited'], 'r'),
-                               'relative' => relative_date($item['edited'])
+                               'relative' => Temporal::getRelativeDate($item['edited'])
                        ];
                }
                $commentww = '';
@@ -365,9 +366,9 @@ class Post extends BaseObject
                        'sparkle'         => $sparkle,
                        'title'           => $title_e,
                        'localtime'       => DateTimeFormat::local($item['created'], 'r'),
-                       'ago'             => $item['app'] ? L10n::t('%s from %s', relative_date($item['created']), $item['app']) : relative_date($item['created']),
+                       'ago'             => $item['app'] ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created']),
                        'app'             => $item['app'],
-                       'created'         => relative_date($item['created']),
+                       'created'         => Temporal::getRelativeDate($item['created']),
                        'lock'            => $lock,
                        'location'        => $location_e,
                        'indent'          => $indent,

diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index e200d9073a41fe1e37a76efc93adb868106f3b6b..3c898ce4cb61494d8dbe46c73bb28eda0d598938 100644 (file)
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -135,7 +135,7 @@ class Temporal
                        $value = DateTimeFormat::utc(($year > 1000) ? $dob : '1000-' . $month . '-' . $day, 'Y-m-d');
                }
 
-               $age = (intval($value) ? age($value, $a->user["timezone"], $a->user["timezone"]) : "");
+               $age = (intval($value) ? self::getAgeByTimezone($value, $a->user["timezone"], $a->user["timezone"]) : "");
 
                $tpl = get_markup_template("field_input.tpl");
                $o = replace_macros($tpl,
@@ -165,7 +165,7 @@ class Temporal
         */
        public static function getDateField($min, $max, $default, $id = 'datepicker')
        {
-               return datetimesel($min, $max, $default, '', $id, true, false, '', '');
+               return self::getDateTimeField($min, $max, $default, '', $id, true, false, '', '');
        }
 
        /**
@@ -179,7 +179,7 @@ class Temporal
         */
        public static function getTimeField($h, $m, $id = 'timepicker')
        {
-               return datetimesel(new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
+               return self::getDateTimeField(new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
        }
 
        /**
@@ -393,7 +393,7 @@ class Temporal
         *
         * @return string day 0 = Sunday through 6 = Saturday
         */
-       public static function getFirstDayInMonth($y, $m)
+       private static function getFirstDayInMonth($y, $m)
        {
                $d = sprintf('%04d-%02d-01 00:00', intval($y), intval($m));
 
@@ -438,8 +438,8 @@ class Temporal
                }
 
                $dn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-               $f = get_first_dim($y, $m);
-               $l = get_dim($y, $m);
+               $f = self::getFirstDayInMonth($y, $m);
+               $l = self::getDaysInMonth($y, $m);
                $d = 1;
                $dow = 0;
                $started = false;

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index 25113dada135b16c315eb23c0bcaf05841c28880..6dc028ea0ef6a0b4e4f8b2e4b7c76036f83df03f 100644 (file)
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -55,7 +55,7 @@ class CronJobs
                }
 
                if ($command == 'update_contact_birthdays') {
-                       update_contact_birthdays();
+                       Contact::updateBirthdays();
                        return;
                }
 

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 822a4389df6cdfd6d7f6a243b5dadbe0034e0b0e..ce614e377cb17ea1857d9f0ed72b6dc003cf13b7 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -9,8 +9,8 @@ namespace Friendica\Worker;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Model\Item;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 use dba;
 
 require_once 'include/dba.php';

diff --git a/src/Worker/GProbe.php b/src/Worker/GProbe.php
index 5222fb61ccfdba1d7ac8eae3fe2c8fa000341f91..bd209b5782f3e5873ae8b81b6bd7defb5959932c 100644 (file)
--- a/src/Worker/GProbe.php
+++ b/src/Worker/GProbe.php
@@ -6,7 +6,6 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Cache;
-use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Model\GContact;
 use Friendica\Network\Probe;

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index b95f43c382833401b9b95d8ba98a8140b0c90efe..f8ea311c29d31d689b33f8be0e3b0604b5b4085b 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -4,18 +4,17 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use Friendica\Content\Text\BBCode;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
-use Friendica\Util\Temporal;
-use Friendica\Util\DateTimeFormat;
 use dba;
 
 require_once 'include/dba.php';

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index daa8fcb5ccd54febb0b671ef1e3e91582a74864f..e73018f5176588d1e0201f60be81d5e706cb56a0 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -6,12 +6,11 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
-use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Queue as QueueModel;
-use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
+use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
 use dba;