Implement functions

[friendica.git] / src / Content / Widget.php

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 0e26a9abab85a026f14013fe79a1a37590d94306..3e076729e1b660ab7e7af5c0efb4e9984ca04370 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -10,11 +10,15 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Util\XML;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -28,7 +32,7 @@ class Widget
         */
        public static function follow($value = "")
        {
-               return replace_macros(get_markup_template('follow.tpl'), array(
+               return Renderer::replaceMacros(Renderer::getMarkupTemplate('follow.tpl'), array(
                        '$connect' => L10n::t('Add New Contact'),
                        '$desc' => L10n::t('Enter address or web location'),
                        '$hint' => L10n::t('Example: bob@example.com, http://example.com/barbara'),
@@ -48,7 +52,7 @@ class Widget
                if (Config::get('system', 'invitation_only')) {
                        $x = PConfig::get(local_user(), 'system', 'invites_remaining');
                        if ($x || is_site_admin()) {
-                               $a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
+                               $a->page['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
                                        . L10n::tt('%d invitation available', '%d invitations available', $x)
                                        . '</div>';
                        }
@@ -71,7 +75,7 @@ class Widget
                $aside = [];
                $aside['$nv'] = $nv;
 
-               return replace_macros(get_markup_template('peoplefind.tpl'), $aside);
+               return Renderer::replaceMacros(Renderer::getMarkupTemplate('peoplefind.tpl'), $aside);
        }
 
        /**
@@ -79,38 +83,31 @@ class Widget
         */
        public static function unavailableNetworks()
        {
-               $networks = array();
-
-               if (!Addon::isEnabled("appnet")) {
-                       $networks[] = NETWORK_APPNET;
-               }
-
-               if (!Addon::isEnabled("fbpost") && !Addon::isEnabled("facebook")) {
-                       $networks[] = NETWORK_FACEBOOK;
-               }
+               // Always hide content from these networks
+               $networks = ['face', 'apdn'];
 
                if (!Addon::isEnabled("statusnet")) {
-                       $networks[] = NETWORK_STATUSNET;
+                       $networks[] = Protocol::STATUSNET;
                }
 
                if (!Addon::isEnabled("pumpio")) {
-                       $networks[] = NETWORK_PUMPIO;
+                       $networks[] = Protocol::PUMPIO;
                }
 
                if (!Addon::isEnabled("twitter")) {
-                       $networks[] = NETWORK_TWITTER;
+                       $networks[] = Protocol::TWITTER;
                }
 
                if (Config::get("system", "ostatus_disabled")) {
-                       $networks[] = NETWORK_OSTATUS;
+                       $networks[] = Protocol::OSTATUS;
                }
 
                if (!Config::get("system", "diaspora_enabled")) {
-                       $networks[] = NETWORK_DIASPORA;
+                       $networks[] = Protocol::DIASPORA;
                }
 
                if (!Addon::isEnabled("pnut")) {
-                       $networks[] = NETWORK_PNUT;
+                       $networks[] = Protocol::PNUT;
                }
 
                if (!sizeof($networks)) {
@@ -148,10 +145,7 @@ class Widget
 
                $nets = array();
                while ($rr = DBA::fetch($r)) {
-                       /// @TODO If 'network' is not there, this triggers an E_NOTICE
-                       if ($rr['network']) {
-                               $nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
-                       }
+                       $nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
                }
                DBA::close($r);
 
@@ -159,7 +153,7 @@ class Widget
                        return '';
                }
 
-               return replace_macros(get_markup_template('nets.tpl'), array(
+               return Renderer::replaceMacros(Renderer::getMarkupTemplate('nets.tpl'), array(
                        '$title' => L10n::t('Networks'),
                        '$desc' => '',
                        '$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -194,13 +188,14 @@ class Widget
                $terms = array();
                $cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER);
                if ($cnt) {
-                       foreach ($matches as $mtch) {
-                               $unescaped = xmlify(file_tag_decode($mtch[1]));
+                       foreach ($matches as $mtch)
+                       {
+                               $unescaped = XML::xmlify(FileTag::decode($mtch[1]));
                                $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
                        }
                }
 
-               return replace_macros(get_markup_template('fileas_widget.tpl'), array(
+               return Renderer::replaceMacros(Renderer::getMarkupTemplate('fileas_widget.tpl'), array(
                        '$title' => L10n::t('Saved Folders'),
                        '$desc' => '',
                        '$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -235,12 +230,12 @@ class Widget
 
                if ($cnt) {
                        foreach ($matches as $mtch) {
-                               $unescaped = xmlify(file_tag_decode($mtch[1]));
+                               $unescaped = XML::xmlify(FileTag::decode($mtch[1]));
                                $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
                        }
                }
 
-               return replace_macros(get_markup_template('categories_widget.tpl'), array(
+               return Renderer::replaceMacros(Renderer::getMarkupTemplate('categories_widget.tpl'), array(
                        '$title' => L10n::t('Categories'),
                        '$desc' => '',
                        '$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -307,7 +302,7 @@ class Widget
                        $r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
                }
 
-               return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
+               return Renderer::replaceMacros(Renderer::getMarkupTemplate('remote_friends_common.tpl'), array(
                        '$desc' => L10n::tt("%d contact in common", "%d contacts in common", $t),
                        '$base' => System::baseUrl(),
                        '$uid' => $profile_uid,