X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Ftheme.php;h=41553cf8c4aa765795bf81d5c98dbfd48d8d1175;hb=34bc0b0c97b7ba4a29d217c33227906e2ced6a73;hp=22345c2e1fa8a74da43673a71d89acda5a320e21;hpb=219182d41ea84faec0164aed80d0dfbe15f2067d;p=friendica.git diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 22345c2e1f..41553cf8c4 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -12,23 +12,24 @@ 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\DBM; +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 ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) { + 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(); $a->page['htmlhead'] .= "\n"; @@ -103,7 +104,7 @@ EOT; // Hide the left menu bar /// @TODO maybe move this static array out where it should belong? - if (($a->page['aside'] == "") && in_array($a->argv[0], ["community", "events", "help", "manage", "notifications", + if (empty($a->page['aside']) && in_array($a->argv[0], ["community", "events", "help", "manage", "notifications", "probe", "webfinger", "login", "invite", "credits"])) { $a->page['htmlhead'] .= ""; } @@ -128,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); @@ -145,17 +146,16 @@ function vier_community_info() if ($show_profiles) { $r = GContact::suggestionQuery(local_user(), 0, 9); - $tpl = get_markup_template('ch_directory_item.tpl'); - if (DBM::is_result($r)) { + $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' => Profile::zrl($rr['url']), '$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` @@ -177,16 +177,16 @@ function vier_community_info() 9 ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $aside['$lastusers_title'] = L10n::t('Last users'); $aside['$lastusers_items'] = []; 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; } @@ -196,28 +196,25 @@ function vier_community_info() //right_aside FIND FRIENDS if ($show_friends && local_user()) { $nv = []; - $nv['title'] = ["", L10n::t('Find Friends'), "", ""]; - $nv['directory'] = ['directory', L10n::t('Local Directory'), "", ""]; - $nv['global_directory'] = [get_server(), L10n::t('Global Directory'), "", ""]; - $nv['match'] = ['match', L10n::t('Similar Interests'), "", ""]; - $nv['suggest'] = ['suggest', L10n::t('Friend Suggestions'), "", ""]; - $nv['invite'] = ['invite', L10n::t('Invite Friends'), "", ""]; - - $nv['search'] = '