X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Ftheme.php;h=41553cf8c4aa765795bf81d5c98dbfd48d8d1175;hb=256e845c5dd606d6e0f1d401a0859b6f8728fb2d;hp=df69e720ef9dbffb6ea0f5f8349b96f84b334342;hpb=cfa68c52b9117616fa95a4639ad74e7d220d193d;p=friendica.git diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index df69e720ef..41553cf8c4 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -12,22 +12,22 @@ use Friendica\App; use Friendica\Content\ForumManager; use Friendica\Core\Addon; -use Friendica\Core\L10n; use Friendica\Core\Config; +use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\GContact; -use Friendica\Model\Profile; - -require_once "mod/proxy.php"; +use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; function vier_init(App $a) { $a->theme_events_in_profile = false; - $a->set_template_engine('smarty3'); + Renderer::setActiveTemplateEngine('smarty3'); if (!empty($a->argv[0]) && $a->argv[0] . defaults($a->argv, 1, '') === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) { vier_community_info(); @@ -129,7 +129,7 @@ function get_vier_config($key, $default = false, $admin = false) function vier_community_info() { - $a = get_app(); + $a = \get_app(); $show_pages = get_vier_config("show_pages", 1); $show_profiles = get_vier_config("show_profiles", 1); @@ -146,16 +146,16 @@ function vier_community_info() if ($show_profiles) { $r = GContact::suggestionQuery(local_user(), 0, 9); - $tpl = get_markup_template('ch_directory_item.tpl'); + $tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl'); if (DBA::isResult($r)) { $aside['$comunity_profiles_title'] = L10n::t('Community Profiles'); $aside['$comunity_profiles_items'] = []; foreach ($r as $rr) { - $entry = replace_macros($tpl, [ + $entry = Renderer::replaceMacros($tpl, [ '$id' => $rr['id'], '$profile_link' => 'follow/?url='.urlencode($rr['url']), - '$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_MICRO), + '$photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_MICRO), '$alt_text' => $rr['name'], ]); $aside['$comunity_profiles_items'][] = $entry; @@ -168,7 +168,7 @@ function vier_community_info() $publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 "); $order = " ORDER BY `register_date` DESC "; - $tpl = get_markup_template('ch_directory_item.tpl'); + $tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl'); $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` @@ -183,10 +183,10 @@ function vier_community_info() foreach ($r as $rr) { $profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl, [ + $entry = Renderer::replaceMacros($tpl, [ '$id' => $rr['id'], '$profile_link' => $profile_link, - '$photo' => $a->remove_baseurl($rr['thumb']), + '$photo' => $a->removeBaseURL($rr['thumb']), '$alt_text' => $rr['name']]); $aside['$lastusers_items'][] = $entry; } @@ -214,10 +214,7 @@ function vier_community_info() //Community_Pages at right_aside if ($show_pages && local_user()) { - $cid = null; - if (x($_GET, 'cid') && intval($_GET['cid']) != 0) { - $cid = $_GET['cid']; - } + $cid = defaults($_GET, 'cid', null); //sort by last updated item $lastitem = true; @@ -238,16 +235,16 @@ function vier_community_info() 'name' => $contact['name'], 'cid' => $contact['id'], 'selected' => $selected, - 'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)), + 'micro' => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)), 'id' => ++$id, ]; $entries[] = $entry; } - $tpl = get_markup_template('widget_forumlist_right.tpl'); + $tpl = Renderer::getMarkupTemplate('widget_forumlist_right.tpl'); - $page = replace_macros( + $page = Renderer::replaceMacros( $tpl, [ '$title' => L10n::t('Forums'), @@ -278,7 +275,7 @@ function vier_community_info() $query .= ","; } - $query .= "'".dbesc(normalise_link(trim($helper)))."'"; + $query .= "'".DBA::escape(Strings::normaliseLink(trim($helper)))."'"; } $r = q("SELECT `url`, `name` FROM `gcontact` WHERE `nurl` IN (%s)", $query); @@ -290,7 +287,7 @@ function vier_community_info() $r[] = ["url" => "help/Quick-Start-guide", "name" => L10n::t("Quick Start")]; - $tpl = get_markup_template('ch_helpers.tpl'); + $tpl = Renderer::getMarkupTemplate('ch_helpers.tpl'); if ($r) { $helpers = []; @@ -299,7 +296,7 @@ function vier_community_info() $aside['$helpers_items'] = []; foreach ($r as $rr) { - $entry = replace_macros($tpl, [ + $entry = Renderer::replaceMacros($tpl, [ '$url' => $rr['url'], '$title' => $rr['name'], ]); @@ -316,10 +313,6 @@ function vier_community_info() /// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo) $r = []; - if (Addon::isEnabled("appnet")) { - $r[] = ["photo" => "images/appnet.png", "name" => "App.net"]; - } - if (Addon::isEnabled("buffer")) { $r[] = ["photo" => "images/buffer.png", "name" => "Buffer"]; } @@ -332,10 +325,6 @@ function vier_community_info() $r[] = ["photo" => "images/dreamwidth.png", "name" => "Dreamwidth"]; } - if (Addon::isEnabled("fbpost")) { - $r[] = ["photo" => "images/facebook.png", "name" => "Facebook"]; - } - if (Addon::isEnabled("ifttt")) { $r[] = ["photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT"]; } @@ -344,10 +333,6 @@ function vier_community_info() $r[] = ["photo" => "images/gnusocial.png", "name" => "GNU Social"]; } - if (Addon::isEnabled("gpluspost")) { - $r[] = ["photo" => "images/googleplus.png", "name" => "Google+"]; - } - /// @TODO old-lost code (and below)? //if (Addon::isEnabled("ijpost")) { // $r[] = array("photo" => "images/", "name" => ""); @@ -381,7 +366,7 @@ function vier_community_info() $r[] = ["photo" => "images/mail.png", "name" => "E-Mail"]; } - $tpl = get_markup_template('ch_connectors.tpl'); + $tpl = Renderer::getMarkupTemplate('ch_connectors.tpl'); if (DBA::isResult($r)) { $con_services = []; @@ -389,7 +374,7 @@ function vier_community_info() $aside['$con_services'] = $con_services; foreach ($r as $rr) { - $entry = replace_macros($tpl, [ + $entry = Renderer::replaceMacros($tpl, [ '$url' => $url, '$photo' => $rr['photo'], '$alt_text' => $rr['name'], @@ -401,6 +386,6 @@ function vier_community_info() //end connectable services //print right_aside - $tpl = get_markup_template('communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); + $tpl = Renderer::getMarkupTemplate('communityhome.tpl'); + $a->page['right_aside'] = Renderer::replaceMacros($tpl, $aside); }