Merge branch '2018.08-rc'

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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 058a7a1fb51c47e82bc2e00e1e299bd03829427c..f245f0d95e064819b1b6d4ae4a37cc4540f07a72 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -10,12 +10,12 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
-use dba;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -49,25 +49,30 @@ 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>';
                        }
                }
 
-               return replace_macros(get_markup_template('peoplefind.tpl'), array(
-                       '$findpeople' => L10n::t('Find People'),
-                       '$desc' => L10n::t('Enter name or interest'),
-                       '$label' => L10n::t('Connect/Follow'),
-                       '$hint' => L10n::t('Examples: Robert Morgenstein, Fishing'),
-                       '$findthem' => L10n::t('Find'),
-                       '$suggest' => L10n::t('Friend Suggestions'),
-                       '$similar' => L10n::t('Similar Interests'),
-                       '$random' => L10n::t('Random Profile'),
-                       '$inv' => L10n::t('Invite Friends'),
-                       '$directory' => L10n::t('View Global Directory'),
-                       '$global_dir' => $global_dir
-               ));
+               $nv = [];
+               $nv['findpeople'] = L10n::t('Find People');
+               $nv['desc'] = L10n::t('Enter name or interest');
+               $nv['label'] = L10n::t('Connect/Follow');
+               $nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing');
+               $nv['findthem'] = L10n::t('Find');
+               $nv['suggest'] = L10n::t('Friend Suggestions');
+               $nv['similar'] = L10n::t('Similar Interests');
+               $nv['random'] = L10n::t('Random Profile');
+               $nv['inv'] = L10n::t('Invite Friends');
+               $nv['directory'] = L10n::t('Global Directory');
+               $nv['global_dir'] = $global_dir;
+               $nv['local_directory'] = L10n::t('Local Directory');
+
+               $aside = [];
+               $aside['$nv'] = $nv;
+
+               return replace_macros(get_markup_template('peoplefind.tpl'), $aside);
        }
 
        /**
@@ -75,38 +80,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)) {
@@ -138,18 +136,18 @@ class Widget
 
                $extra_sql = self::unavailableNetworks();
 
-               $r = dba::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
+               $r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
                        local_user()
                );
 
                $nets = array();
-               while ($rr = dba::fetch($r)) {
+               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' : '' ));
                        }
                }
-               dba::close($r);
+               DBA::close($r);
 
                if (count($nets) < 2) {
                        return '';
@@ -259,7 +257,7 @@ class Widget
 
                $cid = $zcid = 0;
 
-               if (is_array($_SESSION['remote'])) {
+               if (!empty($_SESSION['remote'])) {
                        foreach ($_SESSION['remote'] as $visitor) {
                                if ($visitor['uid'] == $profile_uid) {
                                        $cid = $visitor['cid'];
@@ -270,13 +268,13 @@ class Widget
 
                if (!$cid) {
                        if (Profile::getMyURL()) {
-                               $contact = dba::selectFirst('contact', ['id'],
+                               $contact = DBA::selectFirst('contact', ['id'],
                                                ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $profile_uid]);
-                               if (DBM::is_result($contact)) {
+                               if (DBA::isResult($contact)) {
                                        $cid = $contact['id'];
                                } else {
-                                       $gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
-                                       if (DBM::is_result($gcontact)) {
+                                       $gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+                                       if (DBA::isResult($gcontact)) {
                                                $zcid = $gcontact['id'];
                                        }
                                }