X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=adf6545b43c4a83ad8d2f7e09dc7eb466adcfcf3;hb=7b78ba392952a00aff12ea1c9a312eb60388c829;hp=156e9e3593b29ee849d9812265ceeac6f87aa13e;hpb=745bc7cf3f3990a8887fcc806a16d218f82e35db;p=friendica.git diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 156e9e3593..adf6545b43 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -8,15 +8,19 @@ use Friendica\Content\ContactSelector; use Friendica\Content\Feature; 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\DBM; +use Friendica\Database\DBA; +use Friendica\Model\Contact; +use Friendica\Model\FileTag; use Friendica\Model\GContact; use Friendica\Model\Profile; - -use dba; - -require_once 'boot.php'; +use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; +use Friendica\Util\XML; class Widget { @@ -27,12 +31,12 @@ class Widget */ public static function follow($value = "") { - return replace_macros(get_markup_template('follow.tpl'), array( - '$connect' => t('Add New Contact'), - '$desc' => t('Enter address or web location'), - '$hint' => t('Example: bob@example.com, http://example.com/barbara'), + 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'), '$value' => $value, - '$follow' => t('Connect') + '$follow' => L10n::t('Connect') )); } @@ -41,31 +45,36 @@ class Widget */ public static function findPeople() { - $a = get_app(); + $a = \get_app(); $global_dir = Config::get('system', 'directory'); if (Config::get('system', 'invitation_only')) { $x = PConfig::get(local_user(), 'system', 'invites_remaining'); if ($x || is_site_admin()) { - $a->page['aside'] .= '' . $inv; + $a->page['aside'] .= ''; } } - return replace_macros(get_markup_template('peoplefind.tpl'), array( - '$findpeople' => t('Find People'), - '$desc' => t('Enter name or interest'), - '$label' => t('Connect/Follow'), - '$hint' => t('Examples: Robert Morgenstein, Fishing'), - '$findthem' => t('Find'), - '$suggest' => t('Friend Suggestions'), - '$similar' => t('Similar Interests'), - '$random' => t('Random Profile'), - '$inv' => t('Invite Friends'), - '$directory' => 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 Renderer::replaceMacros(Renderer::getMarkupTemplate('peoplefind.tpl'), $aside); } /** @@ -73,38 +82,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)) { @@ -136,28 +138,25 @@ 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 NOT `deleted` AND `network` != '' $extra_sql ORDER BY `network`", local_user() ); $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' : '' )); - } + while ($rr = DBA::fetch($r)) { + $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 ''; } - return replace_macros(get_markup_template('nets.tpl'), array( - '$title' => t('Networks'), + return Renderer::replaceMacros(Renderer::getMarkupTemplate('nets.tpl'), array( + '$title' => L10n::t('Protocols'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => t('All Networks'), + '$all' => L10n::t('All Protocols'), '$nets' => $nets, '$base' => $baseurl, )); @@ -175,10 +174,6 @@ class Widget return ''; } - if (!Feature::isEnabled(local_user(), 'filing')) { - return ''; - } - $saved = PConfig::get(local_user(), 'system', 'filetags'); if (!strlen($saved)) { return; @@ -188,17 +183,18 @@ 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::escape(FileTag::decode($mtch[1])); $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('fileas_widget.tpl'), array( - '$title' => t('Saved Folders'), + return Renderer::replaceMacros(Renderer::getMarkupTemplate('fileas_widget.tpl'), array( + '$title' => L10n::t('Saved Folders'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => t('Everything'), + '$all' => L10n::t('Everything'), '$terms' => $terms, '$base' => $baseurl, )); @@ -212,7 +208,7 @@ class Widget */ public static function categories($baseurl, $selected = '') { - $a = get_app(); + $a = \get_app(); if (!Feature::isEnabled($a->profile['profile_uid'], 'categories')) { return ''; @@ -229,16 +225,16 @@ class Widget if ($cnt) { foreach ($matches as $mtch) { - $unescaped = xmlify(file_tag_decode($mtch[1])); + $unescaped = XML::escape(FileTag::decode($mtch[1])); $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); } } - return replace_macros(get_markup_template('categories_widget.tpl'), array( - '$title' => t('Categories'), + return Renderer::replaceMacros(Renderer::getMarkupTemplate('categories_widget.tpl'), array( + '$title' => L10n::t('Categories'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => t('Everything'), + '$all' => L10n::t('Everything'), '$terms' => $terms, '$base' => $baseurl, )); @@ -257,7 +253,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']; @@ -268,13 +264,13 @@ class Widget if (!$cid) { if (Profile::getMyURL()) { - $contact = dba::selectFirst('contact', ['id'], - ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $profile_uid]); - if (DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', ['id'], + ['nurl' => Strings::normaliseLink(Profile::getMyURL()), 'uid' => $profile_uid]); + 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' => Strings::normaliseLink(Profile::getMyURL())]); + if (DBA::isResult($gcontact)) { $zcid = $gcontact['id']; } } @@ -301,14 +297,56 @@ class Widget $r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true); } - return replace_macros(get_markup_template('remote_friends_common.tpl'), array( - '$desc' => tt("%d contact in common", "%d contacts in common", $t), - '$base' => System::baseUrl(), - '$uid' => $profile_uid, - '$cid' => (($cid) ? $cid : '0'), + if (!DBA::isResult($r)) { + return; + } + + $entries = []; + foreach ($r as $rr) { + $entry = [ + 'url' => Contact::magicLink($rr['url']), + 'name' => $rr['name'], + 'photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_THUMB), + ]; + $entries[] = $entry; + } + + $tpl = Renderer::getMarkupTemplate('remote_friends_common.tpl'); + return Renderer::replaceMacros($tpl, [ + '$desc' => L10n::tt("%d contact in common", "%d contacts in common", $t), + '$base' => System::baseUrl(), + '$uid' => $profile_uid, + '$cid' => (($cid) ? $cid : '0'), '$linkmore' => (($t > 5) ? 'true' : ''), - '$more' => t('show more'), - '$items' => $r) - ); + '$more' => L10n::t('show more'), + '$items' => $entries + ]); + } + + /** + * Insert a tag cloud widget for the present profile. + * + * @brief Insert a tag cloud widget for the present profile. + * @param int $limit Max number of displayed tags. + * @return string HTML formatted output. + */ + public static function tagCloud($limit = 50) + { + $a = \get_app(); + + if (!$a->profile['profile_uid'] || !$a->profile['url']) { + return ''; + } + + if (Feature::isEnabled($a->profile['profile_uid'], 'tagadelic')) { + $owner_id = Contact::getIdForURL($a->profile['url'], 0, true); + + if (!$owner_id) { + return ''; + } + return Widget\TagCloud::getHTML($a->profile['profile_uid'], $limit, $owner_id, 'wall'); + } + + return ''; } }