Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / view / theme / frio / theme.php

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index d2737a65ac7a421276f5d983090aa9af0a77c7c8..f46b42788fe9253da7355c6e9285f695cff474f2 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -2,7 +2,7 @@
 /*
  * Name: frio
  * Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/friendica/friendica/tree/develop/view/theme/frio/README.md">ReadMe</a>.
- * Version: V.0.8
+ * Version: V.0.8.5
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
  *
  */
@@ -16,7 +16,8 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\Profile;
+use Friendica\Model;
+use Friendica\Module;
 
 $frio = 'view/theme/frio';
 
@@ -28,7 +29,7 @@ function frio_init(App $a)
        $a->theme_events_in_profile = false;
        $a->videowidth = 622;
 
-       $a->set_template_engine('smarty3');
+       $a->setActiveTemplateEngine('smarty3');
 
        $baseurl = System::baseUrl();
 
@@ -150,8 +151,18 @@ function frio_item_photo_menu(App $a, &$arr)
 function frio_contact_photo_menu(App $a, &$args)
 {
        $cid = $args['contact']['id'];
-       $pokelink = $args['menu']['poke'][1];
-       $pmlink = $args['menu']['pm'][1];
+
+       if (!empty($args['menu']['poke'])) {
+               $pokelink = $args['menu']['poke'][1];
+       } else {
+               $pokelink = '';
+       }
+
+       if (!empty($args['menu']['poke'])) {
+               $pmlink = $args['menu']['pm'][1];
+       } else {
+               $pmlink = '';
+       }
 
        // Set the the indicator for opening the status, profile and photo pages
        // in a new tab to false if the contact a dfrn (friendica) contact
@@ -198,7 +209,7 @@ function frio_contact_photo_menu(App $a, &$args)
 function frio_remote_nav($a, &$nav)
 {
        // get the homelink from $_XSESSION
-       $homelink = Profile::getMyURL();
+       $homelink = Model\Profile::getMyURL();
        if (!$homelink) {
                $homelink = defaults($_SESSION, 'visitor_home', '');
        }
@@ -231,12 +242,12 @@ function frio_remote_nav($a, &$nav)
                // user info
                $r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
 
-               $r[0]['photo'] = (DBA::isResult($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg');
+               $r[0]['photo'] = (DBA::isResult($r) ? $a->removeBaseURL($r[0]['micro']) : 'images/person-48.jpg');
                $r[0]['name'] = $a->user['username'];
        } elseif (!local_user() && remote_user()) {
                $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
                $nav['remote'] = L10n::t('Guest');
-       } elseif (Profile::getMyURL()) {
+       } elseif (Model\Profile::getMyURL()) {
                $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
                                WHERE `addr` = '%s' AND `network` = 'dfrn'",
                        DBA::escape($webbie));
@@ -267,7 +278,7 @@ function frio_remote_nav($a, &$nav)
                $nav['events'] = [$server_url . '/events', L10n::t('Events'), '', L10n::t('Events and Calendar')];
                $nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')];
                $nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')];
-               $nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
+               $nav['contacts'] = [$server_url . '/contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
                $nav['sitename'] = Config::get('config', 'sitename');
        }
 }
@@ -276,7 +287,7 @@ function frio_remote_nav($a, &$nav)
  * @brief: Search for contacts
  *
  * This function search for a users contacts. The code is copied from contact search
- * in /mod/contacts.php. With this function the contacts will permitted to acl_lookup()
+ * in /src/Module/Contact.php. With this function the contacts will permitted to acl_lookup()
  * and can grabbed as json. For this we use the type="r". This is usful to to let js
  * grab the contact data.
  * We use this to give the data to textcomplete and have a filter function at the
@@ -287,12 +298,10 @@ function frio_remote_nav($a, &$nav)
  */
 function frio_acl_lookup(App $a, &$results)
 {
-       require_once 'mod/contacts.php';
-
        $nets = x($_GET, 'nets') ? notags(trim($_GET['nets'])) : '';
 
        // we introduce a new search type, r should do the same query like it's
-       // done in /mod/contacts for connections
+       // done in /src/Module/Contact.php for connections
        if ($results['type'] !== 'r') {
                return;
        }
@@ -324,7 +333,7 @@ function frio_acl_lookup(App $a, &$results)
 
        if (DBA::isResult($r)) {
                foreach ($r as $rr) {
-                       $contacts[] = _contact_detail_for_template($rr);
+                       $contacts[] = Module\Contact::getContactTemplateVars($rr);
                }
        }