get markup template

[friendica.git] / src / Module / Contact.php

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 271740a4f5d28eddec6ffba15ae6883a4ef423e7..89a98919175030e354b37c52a31a8800268ea8ad 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -6,20 +6,22 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
+use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model;
+use Friendica\Module\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Core\ACL;
-use Friendica\Module\Login;
 
 /**
  *  Manages and show Contacts and their content
@@ -81,7 +83,7 @@ class Contact extends BaseModule
                        }
 
                        /// @TODO Add nice spaces
-                       $vcard_widget = replace_macros(get_markup_template('vcard-widget.tpl'), [
+                       $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('vcard-widget.tpl'), [
                                '$name'         => htmlentities($contact['name']),
                                '$photo'        => $contact['photo'],
                                '$url'          => Model\Contact::MagicLink($contact['url']),
@@ -112,7 +114,7 @@ class Contact extends BaseModule
                        $groups_widget = null;
                }
 
-               $a->page['aside'] .= replace_macros(get_markup_template('contacts-widget-sidebar.tpl'), [
+               $a->page['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contacts-widget-sidebar.tpl'), [
                        '$vcard_widget'      => $vcard_widget,
                        '$findpeople_widget' => $findpeople_widget,
                        '$follow_widget'     => $follow_widget,
@@ -121,8 +123,8 @@ class Contact extends BaseModule
                ]);
 
                $base = $a->getBaseURL();
-               $tpl = get_markup_template('contacts-head.tpl');
-               $a->page['htmlhead'] .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
+               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(true),
                        '$base' => $base
                ]);
@@ -437,7 +439,7 @@ class Contact extends BaseModule
 
                                        $a->page['aside'] = '';
 
-                                       return replace_macros(get_markup_template('contact_drop_confirm.tpl'), [
+                                       return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
                                                '$header' => L10n::t('Drop contact'),
                                                '$contact' => self::getContactTemplateVars($orig_record),
                                                '$method' => 'get',
@@ -474,7 +476,7 @@ class Contact extends BaseModule
                        $contact_id = $a->data['contact']['id'];
                        $contact = $a->data['contact'];
 
-                       $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), [
+                       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
                                '$baseurl' => $a->getBaseURL(true),
                        ]);
 
@@ -522,9 +524,9 @@ class Contact extends BaseModule
 
                        $insecure = L10n::t('Private communications are not available for this contact.');
 
-                       $last_update = (($contact['last-update'] <= NULL_DATE) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
+                       $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
 
-                       if ($contact['last-update'] > NULL_DATE) {
+                       if ($contact['last-update'] > DBA::NULL_DATETIME) {
                                $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t('(Update was successful)') : L10n::t('(Update was not successful)'));
                        }
                        $lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
@@ -536,7 +538,7 @@ class Contact extends BaseModule
                        // tabs
                        $tab_str = self::getTabsHTML($a, $contact, 3);
 
-                       $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
+                       $lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
 
                        $fetch_further_information = null;
                        if ($contact['network'] == Protocol::FEED) {
@@ -590,8 +592,8 @@ class Contact extends BaseModule
                                $contact_settings_label = null;
                        }
 
-                       $tpl = get_markup_template('contact_edit.tpl');
-                       $o .= replace_macros($tpl, [
+                       $tpl = Renderer::getMarkupTemplate('contact_edit.tpl');
+                       $o .= Renderer::replaceMacros($tpl, [
                                '$header'         => L10n::t('Contact'),
                                '$tab_str'        => $tab_str,
                                '$submit'         => L10n::t('Submit'),
@@ -754,8 +756,8 @@ class Contact extends BaseModule
                        ],
                ];
 
-               $tab_tpl = get_markup_template('common_tabs.tpl');
-               $t = replace_macros($tab_tpl, ['$tabs' => $tabs]);
+               $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+               $t = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
                $total = 0;
                $searching = false;
@@ -778,9 +780,9 @@ class Contact extends BaseModule
                        intval($_SESSION['uid'])
                );
                if (DBA::isResult($r)) {
-                       $a->setPagerTotal($r[0]['total']);
                        $total = $r[0]['total'];
                }
+               $pager = new Pager($a->query_string);
 
                $sql_extra3 = Widget::unavailableNetworks();
 
@@ -788,8 +790,8 @@ class Contact extends BaseModule
 
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ",
                        intval($_SESSION['uid']),
-                       intval($a->pager['start']),
-                       intval($a->pager['itemspage'])
+                       $pager->getStart(),
+                       $pager->getItemsPerPage()
                );
                if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
@@ -799,8 +801,8 @@ class Contact extends BaseModule
                        }
                }
 
-               $tpl = get_markup_template('contacts-template.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('contacts-template.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$baseurl'    => System::baseUrl(),
                        '$header'     => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''),
                        '$tabs'       => $t,
@@ -821,7 +823,7 @@ class Contact extends BaseModule
                                'contacts_batch_drop'    => L10n::t('Delete'),
                        ],
                        '$h_batch_actions' => L10n::t('Batch Actions'),
-                       '$paginate'   => paginate($a),
+                       '$paginate'   => $pager->renderFull($total),
                ]);
 
                return $o;
@@ -902,8 +904,8 @@ class Contact extends BaseModule
                        ];
                }
 
-               $tab_tpl = get_markup_template('common_tabs.tpl');
-               $tab_str = replace_macros($tab_tpl, ['$tabs' => $tabs]);
+               $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+               $tab_str = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
                return $tab_str;
        }