]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #6053 from zeroadam/CoreRenderer
authorHypolite Petovan <hypolite@mrpetovan.com>
Wed, 31 Oct 2018 17:57:12 +0000 (13:57 -0400)
committerGitHub <noreply@github.com>
Wed, 31 Oct 2018 17:57:12 +0000 (13:57 -0400)
Core Renderer Class

94 files changed:
doc/Addons.md
doc/smarty3-templates.md
include/conversation.php
include/enotify.php
include/items.php
include/text.php
mod/admin.php
mod/allfriends.php
mod/api.php
mod/apps.php
mod/babel.php
mod/cal.php
mod/common.php
mod/community.php
mod/credits.php
mod/crepair.php
mod/delegate.php
mod/dfrn_request.php
mod/directory.php
mod/dirfind.php
mod/display.php
mod/editpost.php
mod/events.php
mod/fbrowser.php
mod/feedtest.php
mod/filer.php
mod/follow.php
mod/group.php
mod/help.php
mod/home.php
mod/hostxrd.php
mod/hovercard.php
mod/invite.php
mod/lostpass.php
mod/maintenance.php
mod/manage.php
mod/manifest.php
mod/match.php
mod/message.php
mod/network.php
mod/notifications.php
mod/notify.php
mod/oexchange.php
mod/opensearch.php
mod/photos.php
mod/poco.php
mod/poke.php
mod/profile_photo.php
mod/profiles.php
mod/register.php
mod/removeme.php
mod/search.php
mod/settings.php
mod/suggest.php
mod/uexport.php
mod/uimport.php
mod/unfollow.php
mod/videos.php
mod/viewcontacts.php
mod/wallmessage.php
mod/xrd.php
src/App.php
src/Content/ForumManager.php
src/Content/Nav.php
src/Content/OEmbed.php
src/Content/Pager.php
src/Content/Text/BBCode.php
src/Content/Widget.php
src/Content/Widget/CalendarExport.php
src/Content/Widget/TagCloud.php
src/Core/ACL.php
src/Core/Installer.php
src/Core/Renderer.php [new file with mode: 0644]
src/Core/System.php
src/Model/Event.php
src/Model/Group.php
src/Model/Profile.php
src/Module/Contact.php
src/Module/Install.php
src/Module/Itemsource.php
src/Module/Login.php
src/Module/Tos.php
src/Object/Post.php
src/Render/FriendicaSmarty.php
src/Util/Temporal.php
util/README
view/theme/duepuntozero/config.php
view/theme/duepuntozero/theme.php
view/theme/frio/config.php
view/theme/frio/theme.php
view/theme/quattro/config.php
view/theme/smoothly/theme.php
view/theme/vier/config.php
view/theme/vier/theme.php

index f7dfcc870c72ca56a877df3503969ec37e743694..50febf7214abde7abcd9dbc1550604a82004875b 100644 (file)
@@ -160,11 +160,11 @@ In your code, like in the function addon_name_content(), load the template file
 ```php
 # load template file. first argument is the template name,
 # second is the addon path relative to friendica top folder
-$tpl = get_markup_template('mytemplate.tpl', 'addon/addon_name/');
+$tpl = Renderer::getMarkupTemplate('mytemplate.tpl', 'addon/addon_name/');
 
 # apply template. first argument is the loaded template,
 # second an array of 'name' => 'values' to pass to template
-$output = replace_macros($tpl, array(
+$output = Renderer::replaceMacros($tpl, array(
        'title' => 'My beautiful addon',
 ));
 ```
index d44f263255fcece30edb561288355cfab92f28a5..599e3597e7554baf2e3c53dc3b3f262e6165832d 100644 (file)
@@ -20,10 +20,10 @@ Templates that are only used by addons shall be placed in the
 
 directory.
 
-To render a template use the function *get_markup_template* to load the template and *replace_macros* to replace the macros/variables in the just loaded template file.
+To render a template use the function *getMarkupTemplate* to load the template and *replaceMacros* to replace the macros/variables in the just loaded template file.
 
-               $tpl = get_markup_template('install_settings.tpl');
-        $o .= replace_macros($tpl, array( ... ));
+               $tpl = Renderer::getMarkupTemplate('install_settings.tpl');
+        $o .= Renderer::replaceMacros($tpl, array( ... ));
 
 the array consists of an association of an identifier and the value for that identifier, i.e.
 
index 8317746dd3a39c1a91ae13cf99a3ec66b81379b8..c1d428f24486fa3857d626fb35dde7a7bfc9d1d7 100644 (file)
@@ -14,6 +14,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -553,7 +554,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
        $threads = [];
        $threadsid = -1;
 
-       $page_template = get_markup_template("conversation.tpl");
+       $page_template = Renderer::getMarkupTemplate("conversation.tpl");
 
        if (!empty($items)) {
                if (in_array($mode, ['community', 'contacts'])) {
@@ -712,7 +713,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
                        }
                } else {
                        // Normal View
-                       $page_template = get_markup_template("threaded_conversation.tpl");
+                       $page_template = Renderer::getMarkupTemplate("threaded_conversation.tpl");
 
                        $conv = new Thread($mode, $preview, $writable);
 
@@ -758,7 +759,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
                }
        }
 
-       $o = replace_macros($page_template, [
+       $o = Renderer::replaceMacros($page_template, [
                '$baseurl' => System::baseUrl($ssl_state),
                '$return_path' => $a->query_string,
                '$live_update' => $live_update_div,
@@ -1062,7 +1063,7 @@ function format_like($cnt, array $arr, $type, $id) {
        }
 
        $phrase .= EOL ;
-       $o .= replace_macros(get_markup_template('voting_fakelink.tpl'), [
+       $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
                '$phrase' => $phrase,
                '$type' => $type,
                '$id' => $id
@@ -1076,10 +1077,10 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 {
        $o = '';
 
-       $geotag = x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), []) : '';
+       $geotag = x($x, 'allow_location') ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
 
-       $tpl = get_markup_template('jot-header.tpl');
-       $a->page['htmlhead'] .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$newpost'   => 'true',
                '$baseurl'   => System::baseUrl(true),
                '$geotag'    => $geotag,
@@ -1117,10 +1118,10 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
                $public_post_link = '&public=1';
        }
 
-       // $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
-       $tpl = get_markup_template("jot.tpl");
+       // $tpl = Renderer::replaceMacros($tpl,array('$jotplugins' => $jotplugins));
+       $tpl = Renderer::getMarkupTemplate("jot.tpl");
 
-       $o .= replace_macros($tpl,[
+       $o .= Renderer::replaceMacros($tpl,[
                '$new_post' => L10n::t('New Post'),
                '$return_path'  => $query_str,
                '$action'       => 'item',
index bc9a7b9b0e6b6028ab9585131270a5a8c28e3fd2..339e31a3c810e01c14d3fc681e2462e687e42086 100644 (file)
@@ -8,6 +8,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -517,7 +518,7 @@ function notification($params)
                }
 
                $itemlink = System::baseUrl().'/notify/view/'.$notify_id;
-               $msg = replace_macros($epreamble, ['$itemlink' => $itemlink]);
+               $msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $itemlink]);
                $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg)));
 
                $fields = ['msg' => $msg, 'msg_cache' => $msg_cache];
@@ -589,8 +590,8 @@ function notification($params)
                $content_allowed = ((!Config::get('system', 'enotify_no_content')) || ($params['type'] == SYSTEM_EMAIL));
 
                // load the template for private message notifications
-               $tpl = get_markup_template('email_notify_html.tpl');
-               $email_html_body = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('email_notify_html.tpl');
+               $email_html_body = Renderer::replaceMacros($tpl, [
                        '$banner'       => $datarray['banner'],
                        '$product'      => $datarray['product'],
                        '$preamble'     => str_replace("\n", "<br>\n", $datarray['preamble']),
@@ -610,8 +611,8 @@ function notification($params)
                ]);
 
                // load the template for private message notifications
-               $tpl = get_markup_template('email_notify_text.tpl');
-               $email_text_body = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('email_notify_text.tpl');
+               $email_text_body = Renderer::replaceMacros($tpl, [
                        '$banner'       => $datarray['banner'],
                        '$product'      => $datarray['product'],
                        '$preamble'     => $datarray['preamble'],
index 104547ab831137cbf75fd50ab95e98b81f01a4ed..887bbb5b685b5d387d0d163d795b6cce82c6e660 100644 (file)
@@ -11,6 +11,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
@@ -390,7 +391,7 @@ function drop_item($id)
                                }
                        }
 
-                       return replace_macros(get_markup_template('confirm.tpl'), [
+                       return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'get',
                                '$message' => L10n::t('Do you really want to delete this item?'),
                                '$extra_inputs' => $inputs,
@@ -481,7 +482,7 @@ function posted_date_widget($url, $uid, $wall)
        $cutoff_year = intval(DateTimeFormat::localNow('Y')) - $visible_years;
        $cutoff = ((array_key_exists($cutoff_year, $ret))? true : false);
 
-       $o = replace_macros(get_markup_template('posted_date_widget.tpl'),[
+       $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('posted_date_widget.tpl'),[
                '$title' => L10n::t('Archives'),
                '$size' => $visible_years,
                '$cutoff_year' => $cutoff_year,
index aa4b2c8dba3f694fb66c1a61043a4d74e6fef2cb..7f66268ad4925aa3ff60528ad628cc2ceefb4a07 100644 (file)
@@ -24,40 +24,11 @@ use Friendica\Util\Map;
 use Friendica\Util\Proxy as ProxyUtils;
 
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Model\FileTag;
 
 require_once "include/conversation.php";
 
-/**
- * This is our template processor
- *
- * @param string|FriendicaSmarty $s the string requiring macro substitution,
- *                             or an instance of FriendicaSmarty
- * @param array $r key value pairs (search => replace)
- * @return string substituted string
- */
-function replace_macros($s, $r) {
-
-       $stamp1 = microtime(true);
-
-       $a = get_app();
-
-       // pass $baseurl to all templates
-       $r['$baseurl'] = System::baseUrl();
-
-       $t = $a->getTemplateEngine();
-       try {
-               $output = $t->replaceMacros($s, $r);
-       } catch (Exception $e) {
-               echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
-               killme();
-       }
-
-       $a->saveTimestamp($stamp1, "rendering");
-
-       return $output;
-}
-
 /**
  * @brief Generates a pseudo-random string of hexadecimal characters
  *
@@ -270,8 +241,8 @@ function unxmlify($s) {
  * @return string html for loader
  */
 function scroll_loader() {
-       $tpl = get_markup_template("scroll_loader.tpl");
-       return replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate("scroll_loader.tpl");
+       return Renderer::replaceMacros($tpl, [
                'wait' => L10n::t('Loading more entries...'),
                'end' => L10n::t('The end')
        ]);
@@ -339,30 +310,6 @@ function perms2str($p) {
        return $ret;
 }
 
-/**
- * load template $s
- *
- * @param string $s
- * @param string $root
- * @return string
- */
-function get_markup_template($s, $root = '') {
-       $stamp1 = microtime(true);
-
-       $a = get_app();
-       $t = $a->getTemplateEngine();
-       try {
-               $template = $t->getTemplateFile($s, $root);
-       } catch (Exception $e) {
-               echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
-               killme();
-       }
-
-       $a->saveTimestamp($stamp1, "file");
-
-       return $template;
-}
-
 /**
  *  for html,xml parsing - let's say you've got
  *  an attribute foobar="class1 class2 class3"
@@ -541,8 +488,8 @@ function contact_block() {
                }
        }
 
-       $tpl = get_markup_template('contact_block.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('contact_block.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$contacts' => $contacts,
                '$nickname' => $a->profile['nickname'],
                '$viewcontacts' => L10n::t('View Contacts'),
@@ -599,7 +546,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
                $url = '';
        }
 
-       return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),[
+       return Renderer::replaceMacros(Renderer::getMarkupTemplate(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),[
                '$click' => defaults($contact, 'click', ''),
                '$class' => $class,
                '$url' => $url,
@@ -654,7 +601,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
                }
        }
 
-       return replace_macros(get_markup_template('searchbox.tpl'), $values);
+       return Renderer::replaceMacros(Renderer::getMarkupTemplate('searchbox.tpl'), $values);
 }
 
 /**
@@ -932,14 +879,14 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
                if (strpos($mime, 'video') !== false) {
                        if (!$vhead) {
                                $vhead = true;
-                               $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), [
+                               $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'), [
                                        '$baseurl' => System::baseUrl(),
                                ]);
                        }
 
                        $url_parts = explode('/', $the_url);
                        $id = end($url_parts);
-                       $as .= replace_macros(get_markup_template('video_top.tpl'), [
+                       $as .= Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
                                '$video' => [
                                        'id'     => $id,
                                        'title'  => L10n::t('View Video'),
@@ -1034,8 +981,8 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
 function apply_content_filter($html, array $reasons)
 {
        if (count($reasons)) {
-               $tpl = get_markup_template('wall/content_filter.tpl');
-               $html = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('wall/content_filter.tpl');
+               $html = Renderer::replaceMacros($tpl, [
                        '$reasons'   => $reasons,
                        '$rnd'       => random_string(8),
                        '$openclose' => L10n::t('Click to open/close'),
index d97bac194dc596b534eb3f598aa4afb853e2293e..272b97a8879d3495aa259f51c7b0ab4d847cb0ff 100644 (file)
@@ -14,6 +14,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Update;
@@ -91,7 +92,7 @@ function admin_post(App $a)
 
                                $theme = $a->argv[2];
                                if (is_file("view/theme/$theme/config.php")) {
-                                       $orig_theme = $a->theme;
+                                       $orig_theme = Renderer::$theme;
                                        $orig_page = $a->page;
                                        $orig_session_theme = $_SESSION['theme'];
                                        require_once "view/theme/$theme/theme.php";
@@ -107,7 +108,7 @@ function admin_post(App $a)
                                        }
 
                                        $_SESSION['theme'] = $orig_session_theme;
-                                       $a->theme = $orig_theme;
+                                       Renderer::$theme = $orig_theme;
                                        $a->page = $orig_page;
                                }
 
@@ -175,7 +176,7 @@ function admin_content(App $a)
        //      apc_delete($toDelete);
        //}
        // Header stuff
-       $a->page['htmlhead'] .= replace_macros(get_markup_template('admin/settings_head.tpl'), []);
+       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []);
 
        /*
         * Side bar links
@@ -226,8 +227,8 @@ function admin_content(App $a)
                $addons_admin[] = $addon;
        }
 
-       $t = get_markup_template('admin/aside.tpl');
-       $a->page['aside'] .= replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/aside.tpl');
+       $a->page['aside'] .= Renderer::replaceMacros($t, [
                '$admin' => $aside_tools,
                '$subpages' => $aside_sub,
                '$admtxt' => L10n::t('Admin'),
@@ -314,8 +315,8 @@ function admin_content(App $a)
 function admin_page_tos(App $a)
 {
        $tos = new Tos();
-       $t = get_markup_template('admin/tos.tpl');
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/tos.tpl');
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Terms of Service'),
                '$displaytos' => ['displaytos', L10n::t('Display Terms of Service'), Config::get('system', 'tosdisplay'), L10n::t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')],
@@ -376,8 +377,8 @@ function admin_page_blocklist(App $a)
                        ];
                }
        }
-       $t = get_markup_template('admin/blocklist.tpl');
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/blocklist.tpl');
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Server Blocklist'),
                '$intro' => L10n::t('This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server.'),
@@ -491,8 +492,8 @@ function admin_page_contactblock(App $a)
 
        $contacts = DBA::toArray($statement);
 
-       $t = get_markup_template('admin/contactblock.tpl');
-       $o = replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/contactblock.tpl');
+       $o = Renderer::replaceMacros($t, [
                // strings //
                '$title'       => L10n::t('Administration'),
                '$page'        => L10n::t('Remote Contact Blocklist'),
@@ -533,9 +534,9 @@ function admin_page_contactblock(App $a)
  */
 function admin_page_deleteitem(App $a)
 {
-       $t = get_markup_template('admin/deleteitem.tpl');
+       $t = Renderer::getMarkupTemplate('admin/deleteitem.tpl');
 
-       return replace_macros($t, [
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Delete Item'),
                '$submit' => L10n::t('Delete this Item'),
@@ -726,8 +727,8 @@ function admin_page_federation(App $a)
        $hint = L10n::t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.');
 
        // load the template, replace the macros and return the page content
-       $t = get_markup_template('admin/federation.tpl');
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/federation.tpl');
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Federation Statistics'),
                '$intro' => $intro,
@@ -769,8 +770,8 @@ function admin_page_queue(App $a)
        }
        DBA::close($entries);
 
-       $t = get_markup_template('admin/queue.tpl');
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/queue.tpl');
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Inspect Queue'),
                '$count' => count($r),
@@ -820,8 +821,8 @@ function admin_page_workerqueue(App $a, $deferred)
        }
        DBA::close($entries);
 
-       $t = get_markup_template('admin/workerqueue.tpl');
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/workerqueue.tpl');
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => $sub_title,
                '$count' => count($r),
@@ -938,8 +939,8 @@ function admin_page_summary(App $a)
                                                  'memory_limit' => ini_get('memory_limit')],
                                'mysql' => ['max_allowed_packet' => $max_allowed_packet]];
 
-       $t = get_markup_template('admin/summary.tpl');
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/summary.tpl');
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Summary'),
                '$queues' => $queues,
@@ -1449,8 +1450,8 @@ function admin_page_site(App $a)
                $optimize_max_tablesize = -1;
        }
 
-       $t = get_markup_template('admin/site.tpl');
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/site.tpl');
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Site'),
                '$submit' => L10n::t('Save Settings'),
@@ -1644,13 +1645,13 @@ function admin_page_dbsync(App $a)
        }
 
        if (!count($failed)) {
-               $o = replace_macros(get_markup_template('structure_check.tpl'), [
+               $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('structure_check.tpl'), [
                        '$base' => System::baseUrl(true),
                        '$banner' => L10n::t('No failed updates.'),
                        '$check' => L10n::t('Check database structure'),
                ]);
        } else {
-               $o = replace_macros(get_markup_template('failed_updates.tpl'), [
+               $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('failed_updates.tpl'), [
                        '$base' => System::baseUrl(true),
                        '$banner' => L10n::t('Failed Updates'),
                        '$desc' => L10n::t('This does not include updates prior to 1139, which did not return a status.'),
@@ -1911,8 +1912,8 @@ function admin_page_users(App $a)
 
        $th_users = array_map(null, [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Type')], $valid_orders);
 
-       $t = get_markup_template('admin/users.tpl');
-       $o = replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/users.tpl');
+       $o = Renderer::replaceMacros($t, [
                // strings //
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Users'),
@@ -2027,9 +2028,9 @@ function admin_page_addons(App $a, array $addons_admin)
                        $func($a, $admin_form);
                }
 
-               $t = get_markup_template('admin/addon_details.tpl');
+               $t = Renderer::getMarkupTemplate('admin/addon_details.tpl');
 
-               return replace_macros($t, [
+               return Renderer::replaceMacros($t, [
                        '$title' => L10n::t('Administration'),
                        '$page' => L10n::t('Addons'),
                        '$toggle' => L10n::t('Toggle'),
@@ -2088,8 +2089,8 @@ function admin_page_addons(App $a, array $addons_admin)
                }
        }
 
-       $t = get_markup_template('admin/addons.tpl');
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/addons.tpl');
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Addons'),
                '$submit' => L10n::t('Save Settings'),
@@ -2272,7 +2273,7 @@ function admin_page_themes(App $a)
 
                $admin_form = '';
                if (is_file("view/theme/$theme/config.php")) {
-                       $orig_theme = $a->theme;
+                       $orig_theme = Renderer::$theme;
                        $orig_page = $a->page;
                        $orig_session_theme = $_SESSION['theme'];
                        require_once "view/theme/$theme/theme.php";
@@ -2289,7 +2290,7 @@ function admin_page_themes(App $a)
                        }
 
                        $_SESSION['theme'] = $orig_session_theme;
-                       $a->theme = $orig_theme;
+                       Renderer::$theme = $orig_theme;
                        $a->page = $orig_page;
                }
 
@@ -2298,8 +2299,8 @@ function admin_page_themes(App $a)
                        $screenshot = null;
                }
 
-               $t = get_markup_template('admin/addon_details.tpl');
-               return replace_macros($t, [
+               $t = Renderer::getMarkupTemplate('admin/addon_details.tpl');
+               return Renderer::replaceMacros($t, [
                        '$title' => L10n::t('Administration'),
                        '$page' => L10n::t('Themes'),
                        '$toggle' => L10n::t('Toggle'),
@@ -2342,8 +2343,8 @@ function admin_page_themes(App $a)
                $addons[] = [$th['name'], (($th['allowed']) ? "on" : "off"), Theme::getInfo($th['name'])];
        }
 
-       $t = get_markup_template('admin/addons.tpl');
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate('admin/addons.tpl');
+       return Renderer::replaceMacros($t, [
                '$title'               => L10n::t('Administration'),
                '$page'                => L10n::t('Themes'),
                '$submit'              => L10n::t('Save Settings'),
@@ -2416,9 +2417,9 @@ function admin_page_logs(App $a)
                $phplogenabled = L10n::t('PHP log currently disabled.');
        }
 
-       $t = get_markup_template('admin/logs.tpl');
+       $t = Renderer::getMarkupTemplate('admin/logs.tpl');
 
-       return replace_macros($t, [
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Logs'),
                '$submit' => L10n::t('Save Settings'),
@@ -2457,7 +2458,7 @@ function admin_page_logs(App $a)
  */
 function admin_page_viewlogs(App $a)
 {
-       $t = get_markup_template('admin/viewlogs.tpl');
+       $t = Renderer::getMarkupTemplate('admin/viewlogs.tpl');
        $f = Config::get('system', 'logfile');
        $data = '';
 
@@ -2485,7 +2486,7 @@ function admin_page_viewlogs(App $a)
                        fclose($fp);
                }
        }
-       return replace_macros($t, [
+       return Renderer::replaceMacros($t, [
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('View Logs'),
                '$data' => $data,
@@ -2563,8 +2564,8 @@ function admin_page_features(App $a)
                        }
                }
 
-               $tpl = get_markup_template('admin/settings_features.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('admin/settings_features.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$form_security_token' => BaseModule::getFormSecurityToken("admin_manage_features"),
                        '$title' => L10n::t('Manage Additional Features'),
                        '$features' => $arr,
index 83ea73af6b97222890bbd3395fa79a99cbff9070..b233a46182050ddc8d37b3d266950117bb300132 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model;
@@ -98,9 +99,9 @@ function allfriends_content(App $a)
 
        $tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
 
-       $tpl = get_markup_template('viewcontact_template.tpl');
+       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-       $o .= replace_macros($tpl, [
+       $o .= Renderer::replaceMacros($tpl, [
                //'$title' => L10n::t('Friends of %s', htmlentities($c[0]['name'])),
                '$tab_str' => $tab_str,
                '$contacts' => $entries,
index 716b484461aeff250e902a856a040da6e1ddbec7..52ddf37bead61f9c287972b5ef895a07c1e5c4ea 100644 (file)
@@ -5,6 +5,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Module\Login;
@@ -81,8 +82,8 @@ function api_content(App $a)
                                killme();
                        }
 
-                       $tpl = get_markup_template("oauth_authorize_done.tpl");
-                       $o = replace_macros($tpl, [
+                       $tpl = Renderer::getMarkupTemplate("oauth_authorize_done.tpl");
+                       $o = Renderer::replaceMacros($tpl, [
                                '$title' => L10n::t('Authorize application connection'),
                                '$info' => L10n::t('Return to your app and insert this Securty Code:'),
                                '$code' => $verifier,
@@ -103,8 +104,8 @@ function api_content(App $a)
                        return "Invalid request. Unknown token.";
                }
 
-               $tpl = get_markup_template('oauth_authorize.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('oauth_authorize.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$title' => L10n::t('Authorize application connection'),
                        '$app' => $app,
                        '$authorize' => L10n::t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
index 80138f78dc9654d1c959dfcd0f9614d38e790c82..d497ce93a2812c6695dbc160bd491c8734562c65 100644 (file)
@@ -5,6 +5,7 @@
 use Friendica\Content\Nav;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
 function apps_content()
 {
@@ -24,8 +25,8 @@ function apps_content()
                notice(L10n::t('No installed applications.') . EOL);
        }
 
-       $tpl = get_markup_template('apps.tpl');
-       return replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('apps.tpl');
+       return Renderer::replaceMacros($tpl, [
                '$title' => $title,
                '$apps'  => $apps,
        ]);
index 65287b9f2b590eeeabdf66c36d797998170edb59..b9846e4fb433a16867f7d6afd20bedff2cbd0aac 100644 (file)
@@ -5,6 +5,7 @@
 
 use Friendica\Content\Text;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
 function visible_whitespace($s)
 {
@@ -139,8 +140,8 @@ function babel_content()
                }
        }
 
-       $tpl = get_markup_template('babel.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('babel.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$text'          => ['text', L10n::t('Source text'), htmlentities(defaults($_REQUEST, 'text', '')), ''],
                '$type_bbcode'   => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'],
                '$type_markdown' => ['type', L10n::t('Markdown'), 'markdown', '', defaults($_REQUEST, 'type', 'bbcode') == 'markdown'],
index 6f483acc163478853847b72c36b343bccb0117d4..29095082db65f0ff4e41efd006b5350ce3e227c0 100644 (file)
@@ -12,6 +12,7 @@ use Friendica\Content\Nav;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -59,9 +60,9 @@ function cal_init(App $a)
 
        $account_type = Contact::getAccountType($profile);
 
-       $tpl = get_markup_template("vcard-widget.tpl");
+       $tpl = Renderer::getMarkupTemplate("vcard-widget.tpl");
 
-       $vcard_widget = replace_macros($tpl, [
+       $vcard_widget = Renderer::replaceMacros($tpl, [
                '$name' => $profile['name'],
                '$photo' => $profile['photo'],
                '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
@@ -88,8 +89,8 @@ function cal_content(App $a)
        // get the translation strings for the callendar
        $i18n = Event::getStrings();
 
-       $htpl = get_markup_template('event_head.tpl');
-       $a->page['htmlhead'] .= replace_macros($htpl, [
+       $htpl = Renderer::getMarkupTemplate('event_head.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
                '$baseurl' => System::baseUrl(),
                '$module_url' => '/cal/' . $a->data['user']['nickname'],
                '$modparams' => 2,
@@ -248,12 +249,12 @@ function cal_content(App $a)
 
                // links: array('href', 'text', 'extra css classes', 'title')
                if (x($_GET, 'id')) {
-                       $tpl = get_markup_template("event.tpl");
+                       $tpl = Renderer::getMarkupTemplate("event.tpl");
                } else {
 //                     if (Config::get('experimentals','new_calendar')==1){
-                       $tpl = get_markup_template("events_js.tpl");
+                       $tpl = Renderer::getMarkupTemplate("events_js.tpl");
 //                     } else {
-//                             $tpl = get_markup_template("events.tpl");
+//                             $tpl = Renderer::getMarkupTemplate("events.tpl");
 //                     }
                }
 
@@ -267,7 +268,7 @@ function cal_content(App $a)
                        $events[$key]['item'] = $event_item;
                }
 
-               $o = replace_macros($tpl, [
+               $o = Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(),
                        '$tabs' => $tabs,
                        '$title' => L10n::t('Events'),
index 8fb19b57cdbac15675121b57c3a4b93879f836c8..0f9bc096a27cfbc36acdd6584d448d6c6757622d 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module;
@@ -48,7 +49,7 @@ function common_content(App $a)
                $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
 
                if (DBA::isResult($contact)) {
-                       $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
+                       $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("vcard-widget.tpl"), [
                                '$name'  => htmlentities($contact['name']),
                                '$photo' => $contact['photo'],
                                'url'    => 'contact/' . $cid
@@ -142,9 +143,9 @@ function common_content(App $a)
                $title = L10n::t('Common Friends');
        }
 
-       $tpl = get_markup_template('viewcontact_template.tpl');
+       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-       $o .= replace_macros($tpl, [
+       $o .= Renderer::replaceMacros($tpl, [
                '$title'    => $title,
                '$tab_str'  => $tab_str,
                '$contacts' => $entries,
index 1017698eaa5c134f5f5f24115f4f9f68070f8fc1..36668817323c2357e0c5c1cf09748cc2f3c26a1c 100644 (file)
@@ -10,6 +10,7 @@ use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
@@ -119,8 +120,8 @@ function community_content(App $a, $update = 0)
                        ];
                }
 
-               $tab_tpl = get_markup_template('common_tabs.tpl');
-               $o .= replace_macros($tab_tpl, ['$tabs' => $tabs]);
+               $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+               $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
                Nav::setSelected('community');
 
@@ -198,8 +199,8 @@ function community_content(App $a, $update = 0)
                $o .= $pager->renderMinimal(count($r));
        }
 
-       $t = get_markup_template("community.tpl");
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate("community.tpl");
+       return Renderer::replaceMacros($t, [
                '$content' => $o,
                '$header' => '',
                '$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'),
index 880b4b34c4cdbaab87a18a9c1383340ef51d32ab..c53c86b8b9882b3b1913cb2db2ab651a8069d7f1 100644 (file)
@@ -7,14 +7,15 @@
  */
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
 function credits_content()
 {
        /* fill the page with credits */
        $credits_string = file_get_contents('util/credits.txt');
        $names = explode("\n", htmlspecialchars($credits_string));
-       $tpl = get_markup_template('credits.tpl');
-       return replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('credits.tpl');
+       return Renderer::replaceMacros($tpl, [
                '$title'  => L10n::t('Credits'),
                '$thanks' => L10n::t('Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!'),
                '$names'  => $names,
index 1ca04af50dc2bce40e2e56ba1d2ac03228a2a702..3308315593e73f1fcb80af7249c419a5027c773b 100644 (file)
@@ -8,6 +8,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module;
@@ -136,8 +137,8 @@ function crepair_content(App $a)
 
        $tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
 
-       $tpl = get_markup_template('crepair.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('crepair.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$tab_str'        => $tab_str,
                '$warning'        => $warning,
                '$info'           => $info,
index e38ce058e57305d4eca69a7f484e54a59b3baf2e..1162458125295a8f8d88f970c40be3e327c73ac0 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
@@ -163,7 +164,7 @@ function delegate_content(App $a)
                $parent_password = ['parent_password', L10n::t('Parent Password:'), '', L10n::t('Please enter the password of the parent account to legitimize your request.')];
        }
 
-       $o = replace_macros(get_markup_template('delegate.tpl'), [
+       $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('delegate.tpl'), [
                '$form_security_token' => BaseModule::getFormSecurityToken('delegate'),
                '$parent_header' => L10n::t('Parent User'),
                '$parent_user' => $parent_user,
index 674248be2292457859accc94d63c22d6d7347bc0..fdb1a42ee292ac1810ba2b215b0ac7b91b86d86c 100644 (file)
@@ -17,6 +17,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -514,8 +515,8 @@ function dfrn_request_content(App $a)
                        return; // NOTREACHED
                }
 
-               $tpl = get_markup_template("dfrn_req_confirm.tpl");
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
+               $o = Renderer::replaceMacros($tpl, [
                        '$dfrn_url' => $dfrn_url,
                        '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
                        '$hidethem' => L10n::t('Hide this contact'),
@@ -627,9 +628,9 @@ function dfrn_request_content(App $a)
                 * it doesn't matter if they know you or not.
                 */
                if ($a->profile['page-flags'] == Contact::PAGE_NORMAL) {
-                       $tpl = get_markup_template('dfrn_request.tpl');
+                       $tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
                } else {
-                       $tpl = get_markup_template('auto_request.tpl');
+                       $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
                }
 
                $page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:");
@@ -639,7 +640,7 @@ function dfrn_request_content(App $a)
                        get_server() . '/servers'
                );
 
-               $o = replace_macros($tpl, [
+               $o = Renderer::replaceMacros($tpl, [
                        '$header' => L10n::t('Friend/Connection Request'),
                        '$desc' => L10n::t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
                        '$pls_answer' => L10n::t('Please answer the following:'),
index 6c8be7c3c5da26587de1f35753114299abe330e3..10eaa449225c207dbaf15c379db000917bde62fe 100644 (file)
@@ -10,6 +10,7 @@ use Friendica\Content\Widget;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
@@ -201,9 +202,9 @@ function directory_content(App $a)
                }
                DBA::close($r);
 
-               $tpl = get_markup_template('directory_header.tpl');
+               $tpl = Renderer::getMarkupTemplate('directory_header.tpl');
 
-               $o .= replace_macros($tpl, [
+               $o .= Renderer::replaceMacros($tpl, [
                        '$search'    => $search,
                        '$globaldir' => L10n::t('Global Directory'),
                        '$gdirpath'  => $gdirpath,
index 5d7815bd808836bacc326082944c5cb7bfa59ebf..2451beb18cd3f5fbe184bf7879425a2c1af43b8e 100644 (file)
@@ -10,6 +10,7 @@ use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -249,8 +250,8 @@ function dirfind_content(App $a, $prefix = "") {
                                $entries[] = $entry;
                        }
 
-                       $tpl = get_markup_template('viewcontact_template.tpl');
-                       $o .= replace_macros($tpl,[
+                       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+                       $o .= Renderer::replaceMacros($tpl,[
                                'title' => $header,
                                '$contacts' => $entries,
                                '$paginate' => $pager->renderFull($j->total),
index d95404a5b135ead15ce714a898b5b19525ba3599..ac345d5412a56258fe7fe2f4a33a547bbb9cec98 100644 (file)
@@ -12,6 +12,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -263,7 +264,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $conversation = '';
        }
 
-       $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'),
+       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
                                ['$alternate' => $alternate,
                                        '$conversation' => $conversation]);
 
index 83fcdca56627287114b38f44c2d49ba5078dad32..329e0c9a0a59b1c4dee8297df20a4061c047c5ab 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendcia\Model\FileTag;
 use Friendica\Model\Item;
@@ -40,19 +41,19 @@ function editpost_content(App $a)
 
        $geotag = '';
 
-       $o .= replace_macros(get_markup_template("section_title.tpl"), [
+       $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [
                '$title' => L10n::t('Edit post')
        ]);
 
-       $tpl = get_markup_template('jot-header.tpl');
-       $a->page['htmlhead'] .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$baseurl' => System::baseUrl(),
                '$ispublic' => '&nbsp;', // L10n::t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
                '$nickname' => $a->user['nickname']
        ]);
 
-       $tpl = get_markup_template("jot.tpl");
+       $tpl = Renderer::getMarkupTemplate("jot.tpl");
 
        if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
                $lockstate = 'lock';
@@ -85,7 +86,7 @@ function editpost_content(App $a)
        Addon::callHooks('jot_tool', $jotplugins);
        //Addon::callHooks('jot_networks', $jotnets);
 
-       $o .= replace_macros($tpl, [
+       $o .= Renderer::replaceMacros($tpl, [
                '$is_edit' => true,
                '$return_path' => '/display/' . $item['guid'],
                '$action' => 'item',
index a13080a8e306b361ff861c7bec0d916cbd42b795..c9461a48ec3c12547bea6835f219234943e44088 100644 (file)
@@ -10,6 +10,7 @@ use Friendica\Content\Widget\CalendarExport;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -225,8 +226,8 @@ function events_content(App $a)
        // get the translation strings for the callendar
        $i18n = Event::getStrings();
 
-       $htpl = get_markup_template('event_head.tpl');
-       $a->page['htmlhead'] .= replace_macros($htpl, [
+       $htpl = Renderer::getMarkupTemplate('event_head.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
                '$baseurl' => System::baseUrl(),
                '$module_url' => '/events',
                '$modparams' => 1,
@@ -367,9 +368,9 @@ function events_content(App $a)
                }
 
                if (!empty($_GET['id'])) {
-                       $tpl = get_markup_template("event.tpl");
+                       $tpl = Renderer::getMarkupTemplate("event.tpl");
                } else {
-                       $tpl = get_markup_template("events_js.tpl");
+                       $tpl = Renderer::getMarkupTemplate("events_js.tpl");
                }
 
                // Get rid of dashes in key names, Smarty3 can't handle them
@@ -382,7 +383,7 @@ function events_content(App $a)
                        $events[$key]['item'] = $event_item;
                }
 
-               $o = replace_macros($tpl, [
+               $o = Renderer::replaceMacros($tpl, [
                        '$baseurl'   => System::baseUrl(),
                        '$tabs'      => $tabs,
                        '$title'     => L10n::t('Events'),
@@ -497,9 +498,9 @@ function events_content(App $a)
                        $uri = '';
                }
 
-               $tpl = get_markup_template('event_form.tpl');
+               $tpl = Renderer::getMarkupTemplate('event_form.tpl');
 
-               $o .= replace_macros($tpl, [
+               $o .= Renderer::replaceMacros($tpl, [
                        '$post' => System::baseUrl() . '/events',
                        '$eid'  => $eid,
                        '$cid'  => $cid,
index 3839bcc1cdef93749db9270798dea249ac4839a5..cc51d41995301def0f1fe7f7a43ed910da538aa2 100644 (file)
@@ -7,6 +7,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Object\Image;
@@ -93,9 +94,9 @@ function fbrowser_content(App $a)
                        }
                        $files = array_map("_map_files1", $r);
 
-                       $tpl = get_markup_template($template_file);
+                       $tpl = Renderer::getMarkupTemplate($template_file);
 
-                       $o =  replace_macros($tpl, [
+                       $o =  Renderer::replaceMacros($tpl, [
                                '$type'     => 'image',
                                '$baseurl'  => System::baseUrl(),
                                '$path'     => $path,
@@ -125,8 +126,8 @@ function fbrowser_content(App $a)
                                $files = array_map("_map_files2", $files);
 
 
-                               $tpl = get_markup_template($template_file);
-                               $o = replace_macros($tpl, [
+                               $tpl = Renderer::getMarkupTemplate($template_file);
+                               $o = Renderer::replaceMacros($tpl, [
                                        '$type'     => 'file',
                                        '$baseurl'  => System::baseUrl(),
                                        '$path'     => [ [ "", L10n::t("Files")] ],
index e75e7a1b8ec3cafebfdd9c814f40507e3fa9cb48..edb75aefc160cb1eb6d57da709a28cf62c5d6100 100644 (file)
@@ -6,6 +6,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\Feed;
@@ -43,8 +44,8 @@ function feedtest_content(App $a)
                ];
        }
 
-       $tpl = get_markup_template('feedtest.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('feedtest.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$url'    => ['url', L10n::t('Source URL'), defaults($_REQUEST, 'url', ''), ''],
                '$result' => $result
        ]);
index 050fa70633eea4b3eeaa8152a267eb35817ecfe5..11a5dd0576b6a8ee3513c795076cdce892130a75 100644 (file)
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Model\FileTag;
 
 require_once 'include/items.php';
@@ -30,8 +31,8 @@ function filer_content(App $a)
                $filetags = FileTag::fileToList($filetags, 'file');
                $filetags = explode(",", $filetags);
 
-               $tpl = get_markup_template("filer_dialog.tpl");
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
+               $o = Renderer::replaceMacros($tpl, [
                        '$field' => ['term', L10n::t("Save to Folder:"), '', '', $filetags, L10n::t('- select -')],
                        '$submit' => L10n::t('Save'),
                ]);
index adc3fcc3bd5125465e4c3a0720053869360f8cfb..5c6c6d9d34c37a50d3404f4fced854702aa001d6 100644 (file)
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
@@ -108,10 +109,10 @@ function follow_content(App $a)
 
        if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($r)) {
                $request = $ret['request'];
-               $tpl = get_markup_template('dfrn_request.tpl');
+               $tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
        } else {
                $request = System::baseUrl() . '/follow';
-               $tpl = get_markup_template('auto_request.tpl');
+               $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
        }
 
        $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
@@ -144,7 +145,7 @@ function follow_content(App $a)
 
        $header = L10n::t('Connect/Follow');
 
-       $o = replace_macros($tpl, [
+       $o = Renderer::replaceMacros($tpl, [
                '$header'        => htmlentities($header),
                //'$photo'         => ProxyUtils::proxifyUrl($ret['photo'], false, ProxyUtils::SIZE_SMALL),
                '$desc'          => '',
@@ -187,7 +188,7 @@ function follow_content(App $a)
        }
 
        if ($gcontact_id <> 0) {
-               $o .= replace_macros(get_markup_template('section_title.tpl'),
+               $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
                        ['$title' => L10n::t('Status Messages and Posts')]
                );
 
index 404448ebb77008b9175365c583ea452432823b0b..8b2ce9ca12eb829e9efcc19abf08bbc612934c1c 100644 (file)
@@ -10,6 +10,7 @@ use Friendica\BaseModule;
 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;
@@ -97,7 +98,7 @@ function group_content(App $a) {
                $switchtotext = Config::get('system', 'groupedit_image_limit', 400);
        }
 
-       $tpl = get_markup_template('group_edit.tpl');
+       $tpl = Renderer::getMarkupTemplate('group_edit.tpl');
 
        $context = [
                '$submit' => L10n::t('Save Group'),
@@ -105,7 +106,7 @@ function group_content(App $a) {
        ];
 
        if (($a->argc == 2) && ($a->argv[1] === 'new')) {
-               return replace_macros($tpl, $context + [
+               return Renderer::replaceMacros($tpl, $context + [
                        '$title' => L10n::t('Create a group of contacts/friends.'),
                        '$gname' => ['groupname', L10n::t('Group Name: '), '', ''],
                        '$gid' => 'new',
@@ -214,8 +215,8 @@ function group_content(App $a) {
                        }
                }
 
-               $drop_tpl = get_markup_template('group_drop.tpl');
-               $drop_txt = replace_macros($drop_tpl, [
+               $drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl');
+               $drop_txt = Renderer::replaceMacros($drop_tpl, [
                        '$id' => $group['id'],
                        '$delete' => L10n::t('Delete Group'),
                        '$form_security_token' => BaseModule::getFormSecurityToken("group_drop"),
@@ -306,11 +307,11 @@ function group_content(App $a) {
        $context['$shortmode'] = (($switchtotext && ($total > $switchtotext)) ? true : false);
 
        if ($change) {
-               $tpl = get_markup_template('groupeditor.tpl');
-               echo replace_macros($tpl, $context);
+               $tpl = Renderer::getMarkupTemplate('groupeditor.tpl');
+               echo Renderer::replaceMacros($tpl, $context);
                killme();
        }
 
-       return replace_macros($tpl, $context);
+       return Renderer::replaceMacros($tpl, $context);
 
 }
index 53118544fb1a72781e73090f1266f550817c134d..2c8f68ff35fbef42763fd000c95b9df60708ef97 100644 (file)
@@ -8,6 +8,7 @@ use Friendica\Content\Nav;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 
 function load_doc_file($s)
@@ -60,8 +61,8 @@ function help_content(App $a)
 
        if (!strlen($text)) {
                header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
-               $tpl = get_markup_template("404.tpl");
-               return replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("404.tpl");
+               return Renderer::replaceMacros($tpl, [
                        '$message' => L10n::t('Page not found.')
                ]);
        }
index bf5b5d27fffa2fc5627f961e3391518392822cfd..b375707404a2cf52799c54649ba5a13a607fa0d0 100644 (file)
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Module\Login;
 
@@ -53,8 +54,8 @@ function home_content(App $a) {
        Addon::callHooks("home_content",$content);
 
 
-       $tpl = get_markup_template('home.tpl');
-       return replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('home.tpl');
+       return Renderer::replaceMacros($tpl, [
                '$defaultheader' => $defaultheader,
                '$customhome' => $customhome,
                '$login' => $login,
index 30343381c393c9ff119c4cc637a93bf121a17ac1..93a9d833c9626426826b4b983789f2f0fae9845b 100644 (file)
@@ -4,6 +4,7 @@
  */
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\Crypto;
@@ -21,8 +22,8 @@ function hostxrd_init(App $a)
                Config::set('system','site_pubkey', $res['pubkey']);
        }
 
-       $tpl = get_markup_template('xrd_host.tpl');
-       echo replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('xrd_host.tpl');
+       echo Renderer::replaceMacros($tpl, [
                '$zhost' => $a->getHostName(),
                '$zroot' => System::baseUrl(),
                '$domain' => System::baseUrl(),
index 8b51eb00ae6b14881dde6128b32603b10e2228ea..1e2e14afb634b8bd74151c31df8881be0ae4e189 100644 (file)
@@ -10,6 +10,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -110,8 +111,8 @@ function hovercard_content()
                'actions'  => $actions,
        ];
        if ($datatype == 'html') {
-               $tpl = get_markup_template('hovercard.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('hovercard.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$profile' => $profile,
                ]);
 
@@ -133,7 +134,7 @@ function get_template_content($template, $root = '')
 {
        // We load the whole template system to get the filename.
        // Maybe we can do it a little bit smarter if I get time.
-       $t = get_markup_template($template, $root);
+       $t = Renderer::getMarkupTemplate($template, $root);
        $filename = $t->filename;
 
        // Get the content of the template file
index 7f479157f81afbf93d0a7463c7d0d9a4dbc99fd6..1e02ae9ca9f4ce274c744ec2f3ea77843c5cd3fe 100644 (file)
@@ -11,6 +11,7 @@ use Friendica\BaseModule;
 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\Protocol\Email;
@@ -110,7 +111,7 @@ function invite_content(App $a) {
                return;
        }
 
-       $tpl = get_markup_template('invite.tpl');
+       $tpl = Renderer::getMarkupTemplate('invite.tpl');
        $invonly = false;
 
        if (Config::get('system', 'invitation_only')) {
@@ -140,7 +141,7 @@ function invite_content(App $a) {
                }
        }
 
-       $o = replace_macros($tpl, [
+       $o = Renderer::replaceMacros($tpl, [
                '$form_security_token' => BaseModule::getFormSecurityToken("send_invite"),
                '$title'               => L10n::t('Send invitations'),
                '$recipients'          => ['recipients', L10n::t('Enter email addresses, one per line:')],
index 9cde1c9ff4a637edf2398b99efe62c50c7bffd02..ae94fbbbea72a4c7ed6437cf81a50bdbc3f0776e 100644 (file)
@@ -6,6 +6,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
@@ -115,8 +116,8 @@ function lostpass_content(App $a)
 
 function lostpass_form()
 {
-       $tpl = get_markup_template('lostpass.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('lostpass.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$title' => L10n::t('Forgot your Password?'),
                '$desc' => L10n::t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
                '$name' => L10n::t('Nickname or Email: '),
@@ -134,8 +135,8 @@ function lostpass_generate_password($user)
        $new_password = User::generateNewPassword();
        $result = User::updatePassword($user['uid'], $new_password);
        if (DBA::isResult($result)) {
-               $tpl = get_markup_template('pwdreset.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('pwdreset.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$lbl1'    => L10n::t('Password Reset'),
                        '$lbl2'    => L10n::t('Your password has been reset as requested.'),
                        '$lbl3'    => L10n::t('Your new password is'),
index 8727e4afb9f11f96c4efb25de694db22c7020e02..a1b032a617425cb6973accc83d4dbe7c8fc17a13 100644 (file)
@@ -5,6 +5,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
 function maintenance_content(App $a)
 {
@@ -20,7 +21,7 @@ function maintenance_content(App $a)
        header('Status: 503 Service Temporarily Unavailable');
        header('Retry-After: 600');
 
-       return replace_macros(get_markup_template('maintenance.tpl'), [
+       return Renderer::replaceMacros(Renderer::getMarkupTemplate('maintenance.tpl'), [
                '$sysdown' => L10n::t('System down for maintenance'),
                '$reason' => $reason
        ]);
index b98fcac6f747bae0c58254b5aa2348dfd0f86d81..f92a9454903ac5ddd11684886965afa67e71c2ce 100644 (file)
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\Authentication;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 
@@ -176,7 +177,7 @@ function manage_content(App $a) {
                $identities[$key]['notifications'] = $notifications;
        }
 
-       $o = replace_macros(get_markup_template('manage.tpl'), [
+       $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('manage.tpl'), [
                '$title' => L10n::t('Manage Identities and/or Pages'),
                '$desc' => L10n::t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
                '$choose' => L10n::t('Select an identity to manage: '),
index a651f51662a923d5a55d90cdd1c51002ef01ac5c..9fbfde448eb9a68b47362d5350ebe8e5c65cf8f6 100644 (file)
@@ -3,10 +3,11 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\Renderer;
 
 function manifest_content(App $a) {
 
-       $tpl = get_markup_template('manifest.tpl');
+       $tpl = Renderer::getMarkupTemplate('manifest.tpl');
 
        header('Content-type: application/manifest+json');
 
@@ -15,7 +16,7 @@ function manifest_content(App $a) {
                $touch_icon = 'images/friendica-128.png';
        }
 
-       $o = replace_macros($tpl, [
+       $o = Renderer::replaceMacros($tpl, [
                '$baseurl' => System::baseUrl(),
                '$touch_icon' => $touch_icon,
                '$title' => Config::get('config', 'sitename', 'Friendica'),
index 43a3916506621252e8fd952dd183dc2d28eefed1..e924722aa3b02b7efe2332fb831144be020b2b07 100644 (file)
@@ -8,6 +8,7 @@ use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -112,9 +113,9 @@ function match_content(App $a)
                                }
                        }
 
-                       $tpl = get_markup_template('viewcontact_template.tpl');
+                       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-                       $o .= replace_macros($tpl, [
+                       $o .= Renderer::replaceMacros($tpl, [
                                '$title'    => L10n::t('Profile Match'),
                                '$contacts' => $entries,
                                '$paginate' => $pager->renderFull($j->total)
index 5f7ffb2b7067f75d737848916b10a1d710d21aaf..23c08f5a3c41f0a3e745c486179e8bdef3ec46bb 100644 (file)
@@ -10,6 +10,7 @@ use Friendica\Content\Smilies;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -36,15 +37,15 @@ function message_init(App $a)
                'accesskey' => 'm',
        ];
 
-       $tpl = get_markup_template('message_side.tpl');
-       $a->page['aside'] = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('message_side.tpl');
+       $a->page['aside'] = Renderer::replaceMacros($tpl, [
                '$tabs' => $tabs,
                '$new' => $new,
        ]);
        $base = System::baseUrl();
 
-       $head_tpl = get_markup_template('message-head.tpl');
-       $a->page['htmlhead'] .= replace_macros($head_tpl, [
+       $head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
                '$baseurl' => System::baseUrl(true),
                '$base' => $base
        ]);
@@ -104,7 +105,7 @@ function message_content(App $a)
 
        $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
 
-       $tpl = get_markup_template('mail_head.tpl');
+       $tpl = Renderer::getMarkupTemplate('mail_head.tpl');
        if ($a->argc > 1 && $a->argv[1] == 'new') {
                $button = [
                        'label' => L10n::t('Discard'),
@@ -119,7 +120,7 @@ function message_content(App $a)
                        'accesskey' => 'm',
                ];
        }
-       $header = replace_macros($tpl, [
+       $header = Renderer::replaceMacros($tpl, [
                '$messages' => L10n::t('Messages'),
                '$button' => $button,
        ]);
@@ -143,7 +144,7 @@ function message_content(App $a)
                        }
 
                        //$a->page['aside'] = '';
-                       return replace_macros(get_markup_template('confirm.tpl'), [
+                       return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'get',
                                '$message' => L10n::t('Do you really want to delete this message?'),
                                '$extra_inputs' => $inputs,
@@ -198,8 +199,8 @@ function message_content(App $a)
        if (($a->argc > 1) && ($a->argv[1] === 'new')) {
                $o .= $header;
 
-               $tpl = get_markup_template('msg-header.tpl');
-               $a->page['htmlhead'] .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
+               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(true),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => L10n::t('Please enter a link URL:')
@@ -243,8 +244,8 @@ function message_content(App $a)
                // the ugly select box
                $select = ACL::getMessageContactSelectHTML('messageto', 'message-to-select', $preselect, 4, 10);
 
-               $tpl = get_markup_template('prv_message.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('prv_message.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$header' => L10n::t('Send Private Message'),
                        '$to' => L10n::t('To:'),
                        '$showinputs' => 'true',
@@ -338,8 +339,8 @@ function message_content(App $a)
                        intval(local_user())
                );
 
-               $tpl = get_markup_template('msg-header.tpl');
-               $a->page['htmlhead'] .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('msg-header.tpl');
+               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(true),
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => L10n::t('Please enter a link URL:')
@@ -398,8 +399,8 @@ function message_content(App $a)
                $select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
                $parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
 
-               $tpl = get_markup_template('mail_display.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('mail_display.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$thread_id' => $a->argv[1],
                        '$thread_subject' => $message['title'],
                        '$thread_seen' => $seen,
@@ -453,7 +454,7 @@ function render_messages(array $msg, $t)
 {
        $a = get_app();
 
-       $tpl = get_markup_template($t);
+       $tpl = Renderer::getMarkupTemplate($t);
        $rslt = '';
 
        $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
@@ -478,7 +479,7 @@ function render_messages(array $msg, $t)
                        $from_photo = (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']);
                }
 
-               $rslt .= replace_macros($tpl, [
+               $rslt .= Renderer::replaceMacros($tpl, [
                        '$id' => $rr['id'],
                        '$from_name' => $participants,
                        '$from_url' => Contact::magicLink($rr['url']),
index 6ba353d7e51c75dbf080ba8c465ec0c844792e41..11b297329d0d19855ff271e35730722c5a1461c6 100644 (file)
@@ -18,6 +18,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
@@ -200,8 +201,8 @@ function saved_searches($search)
                ];
        }
 
-       $tpl = get_markup_template('saved_searches_aside.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('saved_searches_aside.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$title'     => L10n::t('Saved Searches'),
                '$add'       => L10n::t('add'),
                '$searchbox' => search($search, 'netsearch-box', $srchurl, true),
@@ -653,7 +654,7 @@ function networkThreadedView(App $a, $update, $parent)
                        info(L10n::t('Group is empty'));
                }
 
-               $o = replace_macros(get_markup_template('section_title.tpl'), [
+               $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
                        '$title' => L10n::t('Group: %s', $group['name'])
                ]) . $o;
        } elseif ($cid) {
@@ -674,7 +675,7 @@ function networkThreadedView(App $a, $update, $parent)
 
                        $entries[0]['account_type'] = Contact::getAccountType($contact);
 
-                       $o = replace_macros(get_markup_template('viewcontact_template.tpl'), [
+                       $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('viewcontact_template.tpl'), [
                                'contacts' => $entries,
                                'id' => 'network',
                        ]) . $o;
@@ -1032,9 +1033,9 @@ function network_tabs(App $a)
        $arr = ['tabs' => $tabs];
        Addon::callHooks('network_tabs', $arr);
 
-       $tpl = get_markup_template('common_tabs.tpl');
+       $tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
 
-       return replace_macros($tpl, ['$tabs' => $arr['tabs']]);
+       return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]);
 
        // --- end item filter tabs
 }
@@ -1058,8 +1059,8 @@ function network_infinite_scroll_head(App $a, &$htmlhead)
        if (PConfig::get(local_user(), 'system', 'infinite_scroll')
                && defaults($_GET, 'mode', '') != 'minimal'
        ) {
-               $tpl = get_markup_template('infinite_scroll_head.tpl');
-               $htmlhead .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
+               $htmlhead .= Renderer::replaceMacros($tpl, [
                        '$pageno'     => $pager->getPage(),
                        '$reload_uri' => $pager->getBaseQueryString()
                ]);
index 81084c1bc3f180a5c71297d2cdcdf01e6efcc65a..54c54fa222b00009b4390bb5d23710ed6d5391f5 100644 (file)
@@ -11,6 +11,7 @@ use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Module\Login;
@@ -132,7 +133,7 @@ function notifications_content(App $a)
                System::jsonExit($notifs);
        }
 
-       $notif_tpl = get_markup_template('notifications.tpl');
+       $notif_tpl = Renderer::getMarkupTemplate('notifications.tpl');
 
        $notif_show_lnk = [
                'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
@@ -141,8 +142,8 @@ function notifications_content(App $a)
 
        // Process the data for template creation
        if (defaults($notifs, 'ident', '') === 'introductions') {
-               $sugg = get_markup_template('suggestions.tpl');
-               $tpl = get_markup_template('intros.tpl');
+               $sugg = Renderer::getMarkupTemplate('suggestions.tpl');
+               $tpl = Renderer::getMarkupTemplate('intros.tpl');
 
                // The link to switch between ignored and normal connection requests
                $notif_show_lnk = [
@@ -158,7 +159,7 @@ function notifications_content(App $a)
                        // We have to distinguish between these two because they use different data.
                        switch ($notif['label']) {
                                case 'friend_suggestion':
-                                       $notif_content[] = replace_macros($sugg, [
+                                       $notif_content[] = Renderer::replaceMacros($sugg, [
                                                '$type'       => $notif['label'],
                                                '$str_notifytype' => L10n::t('Notification type:'),
                                                '$notify_type'=> $notif['notify_type'],
@@ -208,8 +209,8 @@ function notifications_content(App $a)
                                                $helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
                                        }
 
-                                       $dfrn_tpl = get_markup_template('netfriend.tpl');
-                                       $dfrn_text = replace_macros($dfrn_tpl, [
+                                       $dfrn_tpl = Renderer::getMarkupTemplate('netfriend.tpl');
+                                       $dfrn_text = Renderer::replaceMacros($dfrn_tpl, [
                                                '$intro_id'    => $notif['intro_id'],
                                                '$friend_selected' => $friend_selected,
                                                '$fan_selected'=> $fan_selected,
@@ -234,7 +235,7 @@ function notifications_content(App $a)
                                                $discard = '';
                                        }
 
-                                       $notif_content[] = replace_macros($tpl, [
+                                       $notif_content[] = Renderer::replaceMacros($tpl, [
                                                '$type'        => $notif['label'],
                                                '$header'      => htmlentities($header),
                                                '$str_notifytype' => L10n::t('Notification type:'),
@@ -293,9 +294,9 @@ function notifications_content(App $a)
                                'notify'      => 'notify.tpl',
                        ];
 
-                       $tpl_notif = get_markup_template($notification_templates[$notif['label']]);
+                       $tpl_notif = Renderer::getMarkupTemplate($notification_templates[$notif['label']]);
 
-                       $notif_content[] = replace_macros($tpl_notif, [
+                       $notif_content[] = Renderer::replaceMacros($tpl_notif, [
                                '$item_label' => $notif['label'],
                                '$item_link'  => $notif['link'],
                                '$item_image' => $notif['image'],
@@ -310,7 +311,7 @@ function notifications_content(App $a)
                $notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
        }
 
-       $o .= replace_macros($notif_tpl, [
+       $o .= Renderer::replaceMacros($notif_tpl, [
                '$notif_header'    => $notif_header,
                '$tabs'            => $tabs,
                '$notif_content'   => $notif_content,
index 6ec36d8f99f7fe387a77df94c049a9c908e52931..959b581d59a25942b19cb824ec4b11cd1e479a8a 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
@@ -59,14 +60,14 @@ function notify_content(App $a)
 
        $nm = new NotificationsManager();
 
-       $notif_tpl = get_markup_template('notifications.tpl');
+       $notif_tpl = Renderer::getMarkupTemplate('notifications.tpl');
 
-       $not_tpl = get_markup_template('notify.tpl');
+       $not_tpl = Renderer::getMarkupTemplate('notify.tpl');
 
        $r = $nm->getAll(['seen'=>0]);
        if (DBA::isResult($r) > 0) {
                foreach ($r as $it) {
-                       $notif_content .= replace_macros($not_tpl, [
+                       $notif_content .= Renderer::replaceMacros($not_tpl, [
                                '$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'],
                                '$item_image' => $it['photo'],
                                '$item_text' => strip_tags(BBCode::convert($it['msg'])),
@@ -77,7 +78,7 @@ function notify_content(App $a)
                $notif_content .= L10n::t('No more system notifications.');
        }
 
-       $o = replace_macros($notif_tpl, [
+       $o = Renderer::replaceMacros($notif_tpl, [
                '$notif_header' => L10n::t('System Notifications'),
                '$tabs' => false, // $tabs,
                '$notif_content' => $notif_content,
index 72577ab4ef67183fdbcbe3871159a789bba8e065..296869aac9eb0d9f1f12afd2b8285c9063522c4e 100644 (file)
@@ -4,6 +4,7 @@
  */
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Module\Login;
 use Friendica\Util\Network;
@@ -11,9 +12,9 @@ use Friendica\Util\Network;
 function oexchange_init(App $a) {
 
        if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
-               $tpl = get_markup_template('oexchange_xrd.tpl');
+               $tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl');
 
-               $o = replace_macros($tpl, ['$base' => System::baseUrl()]);
+               $o = Renderer::replaceMacros($tpl, ['$base' => System::baseUrl()]);
                echo $o;
                killme();
        }
index 541002410076f22c7409a5a6ef72b715b2a03e36..f4765b0621b16107cc379aee3a684355595bbf0d 100644 (file)
@@ -1,15 +1,16 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 
 function opensearch_content(App $a) {
 
-       $tpl = get_markup_template('opensearch.tpl');
+       $tpl = Renderer::getMarkupTemplate('opensearch.tpl');
 
        header("Content-type: application/opensearchdescription+xml");
 
-       $o = replace_macros($tpl, [
+       $o = Renderer::replaceMacros($tpl, [
                '$baseurl' => System::baseUrl(),
                '$nodename' => $a->getHostName(),
        ]);
index 8ddb0010d13ca79db6cd041951d9e1f06eceabc0..82a6ccca2962e9292e6bec004354a224301c8273 100644 (file)
@@ -13,6 +13,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -62,9 +63,9 @@ function photos_init(App $a) {
 
                $account_type = Contact::getAccountType($profile);
 
-               $tpl = get_markup_template("vcard-widget.tpl");
+               $tpl = Renderer::getMarkupTemplate("vcard-widget.tpl");
 
-               $vcard_widget = replace_macros($tpl, [
+               $vcard_widget = Renderer::replaceMacros($tpl, [
                        '$name' => $profile['name'],
                        '$photo' => $profile['photo'],
                        '$addr' => defaults($profile, 'addr', ''),
@@ -109,7 +110,7 @@ function photos_init(App $a) {
                }
 
                if ($ret['success']) {
-                       $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), [
+                       $photo_albums_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('photo_albums.tpl'), [
                                '$nick'     => $a->data['user']['nickname'],
                                '$title'    => L10n::t('Photo Albums'),
                                '$recent'   => L10n::t('Recent Photos'),
@@ -130,9 +131,9 @@ function photos_init(App $a) {
                        $a->page['aside'] .= $photo_albums_widget;
                }
 
-               $tpl = get_markup_template("photos_head.tpl");
+               $tpl = Renderer::getMarkupTemplate("photos_head.tpl");
 
-               $a->page['htmlhead'] .= replace_macros($tpl,[
+               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
                        '$ispublic' => L10n::t('everybody')
                ]);
        }
@@ -246,7 +247,7 @@ function photos_post(App $a)
                                        ['name' => 'albumname', 'value' => $_POST['albumname']],
                                ];
 
-                               $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
+                               $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                        '$method' => 'post',
                                        '$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
                                        '$extra_inputs' => $extra_inputs,
@@ -318,7 +319,7 @@ function photos_post(App $a)
                if (!empty($_REQUEST['confirm'])) {
                        $drop_url = $a->query_string;
 
-                       $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
+                       $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'post',
                                '$message' => L10n::t('Do you really want to delete this photo?'),
                                '$extra_inputs' => [],
@@ -1084,18 +1085,18 @@ function photos_content(App $a)
 
                Addon::callHooks('photo_upload_form',$ret);
 
-               $default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), []);
-               $default_upload_submit = replace_macros(get_markup_template('photos_default_uploader_submit.tpl'), [
+               $default_upload_box = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []);
+               $default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [
                        '$submit' => L10n::t('Submit'),
                ]);
 
                $usage_message = '';
 
-               $tpl = get_markup_template('photos_upload.tpl');
+               $tpl = Renderer::getMarkupTemplate('photos_upload.tpl');
 
                $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML($a->user));
 
-               $o .= replace_macros($tpl,[
+               $o .= Renderer::replaceMacros($tpl,[
                        '$pagename' => L10n::t('Upload Photos'),
                        '$sessid' => session_id(),
                        '$usage' => $usage_message,
@@ -1165,11 +1166,11 @@ function photos_content(App $a)
                if ($cmd === 'edit') {
                        if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos'))) {
                                if ($can_post) {
-                                       $edit_tpl = get_markup_template('album_edit.tpl');
+                                       $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
 
                                        $album_e = $album;
 
-                                       $o .= replace_macros($edit_tpl,[
+                                       $o .= Renderer::replaceMacros($edit_tpl,[
                                                '$nametext' => L10n::t('New album name: '),
                                                '$nickname' => $a->data['user']['nickname'],
                                                '$album' => $album_e,
@@ -1219,8 +1220,8 @@ function photos_content(App $a)
                        }
                }
 
-               $tpl = get_markup_template('photo_album.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('photo_album.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$photos' => $photos,
                        '$album' => $album,
                        '$can_post' => $can_post,
@@ -1341,8 +1342,8 @@ function photos_content(App $a)
                }
 
                if ($cmd === 'edit') {
-                       $tpl = get_markup_template('photo_edit_head.tpl');
-                       $a->page['htmlhead'] .= replace_macros($tpl,[
+                       $tpl = Renderer::getMarkupTemplate('photo_edit_head.tpl');
+                       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
                                '$prevlink' => $prevlink,
                                '$nextlink' => $nextlink
                        ]);
@@ -1428,13 +1429,13 @@ function photos_content(App $a)
 
                $edit = Null;
                if ($cmd === 'edit' && $can_post) {
-                       $edit_tpl = get_markup_template('photo_edit.tpl');
+                       $edit_tpl = Renderer::getMarkupTemplate('photo_edit.tpl');
 
                        $album_e = $ph[0]['album'];
                        $caption_e = $ph[0]['desc'];
                        $aclselect_e = ACL::getFullSelectorHTML($a->user, false, $ph[0]);
 
-                       $edit = replace_macros($edit_tpl, [
+                       $edit = Renderer::replaceMacros($edit_tpl, [
                                '$id' => $ph[0]['id'],
                                '$album' => ['albname', L10n::t('New album name'), $album_e,''],
                                '$caption' => ['desc', L10n::t('Caption'), $caption_e, ''],
@@ -1467,13 +1468,13 @@ function photos_content(App $a)
                $responses = '';
 
                if (count($linked_items)) {
-                       $cmnt_tpl = get_markup_template('comment_item.tpl');
-                       $tpl = get_markup_template('photo_item.tpl');
+                       $cmnt_tpl = Renderer::getMarkupTemplate('comment_item.tpl');
+                       $tpl = Renderer::getMarkupTemplate('photo_item.tpl');
                        $return_path = $a->cmd;
 
                        if ($can_post || Security::canWriteToUserWall($owner_uid)) {
-                               $like_tpl = get_markup_template('like_noshare.tpl');
-                               $likebuttons = replace_macros($like_tpl, [
+                               $like_tpl = Renderer::getMarkupTemplate('like_noshare.tpl');
+                               $likebuttons = Renderer::replaceMacros($like_tpl, [
                                        '$id' => $link_item['id'],
                                        '$likethis' => L10n::t("I like this \x28toggle\x29"),
                                        '$nolike' => (Feature::isEnabled(local_user(), 'dislike') ? L10n::t("I don't like this \x28toggle\x29") : ''),
@@ -1484,7 +1485,7 @@ function photos_content(App $a)
 
                        if (!DBA::isResult($items)) {
                                if (($can_post || Security::canWriteToUserWall($owner_uid))) {
-                                       $comments .= replace_macros($cmnt_tpl, [
+                                       $comments .= Renderer::replaceMacros($cmnt_tpl, [
                                                '$return_path' => '',
                                                '$jsreload' => $return_path,
                                                '$id' => $link_item['id'],
@@ -1523,7 +1524,7 @@ function photos_content(App $a)
                                }
 
                                if (($can_post || Security::canWriteToUserWall($owner_uid))) {
-                                       $comments .= replace_macros($cmnt_tpl,[
+                                       $comments .= Renderer::replaceMacros($cmnt_tpl,[
                                                '$return_path' => '',
                                                '$jsreload' => $return_path,
                                                '$id' => $link_item['id'],
@@ -1568,7 +1569,7 @@ function photos_content(App $a)
                                        $title_e = $item['title'];
                                        $body_e = BBCode::convert($item['body']);
 
-                                       $comments .= replace_macros($template,[
+                                       $comments .= Renderer::replaceMacros($template,[
                                                '$id' => $item['id'],
                                                '$profile_url' => $profile_url,
                                                '$name' => $item['author-name'],
@@ -1583,7 +1584,7 @@ function photos_content(App $a)
                                        ]);
 
                                        if (($can_post || Security::canWriteToUserWall($owner_uid))) {
-                                               $comments .= replace_macros($cmnt_tpl, [
+                                               $comments .= Renderer::replaceMacros($cmnt_tpl, [
                                                        '$return_path' => '',
                                                        '$jsreload' => $return_path,
                                                        '$id' => $item['item_id'],
@@ -1611,8 +1612,8 @@ function photos_content(App $a)
                        $paginate = $pager->renderFull($total);
                }
 
-               $photo_tpl = get_markup_template('photo_view.tpl');
-               $o .= replace_macros($photo_tpl, [
+               $photo_tpl = Renderer::getMarkupTemplate('photo_view.tpl');
+               $o .= Renderer::replaceMacros($photo_tpl, [
                        '$id' => $ph[0]['id'],
                        '$album' => [$album_link, $ph[0]['album']],
                        '$tools' => $tools,
@@ -1703,8 +1704,8 @@ function photos_content(App $a)
                }
        }
 
-       $tpl = get_markup_template('photos_recent.tpl');
-       $o .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('photos_recent.tpl');
+       $o .= Renderer::replaceMacros($tpl, [
                '$title' => L10n::t('Recent Photos'),
                '$can_post' => $can_post,
                '$upload' => [L10n::t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
index 7a33a69d0b9d1d7f707dbb77c2aae8a10d82edc0..41fabff4ea66c98bfcab7552e55c4ff6a98dc278 100644 (file)
@@ -10,6 +10,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Protocol\PortableContact;
@@ -374,7 +375,7 @@ function poco_init(App $a) {
 
        if ($format === 'xml') {
                header('Content-type: text/xml');
-               echo replace_macros(get_markup_template('poco_xml.tpl'), array_xmlify(['$response' => $ret]));
+               echo Renderer::replaceMacros(Renderer::getMarkupTemplate('poco_xml.tpl'), array_xmlify(['$response' => $ret]));
                killme();
        }
        if ($format === 'json') {
index 3eefeb9aba3f6620f0141c0ba4f10516b6f0bf3b..be26254384d485aa5df31aa34fd5a303fb19a38b 100644 (file)
@@ -17,6 +17,7 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -159,8 +160,8 @@ function poke_content(App $a)
 
        $base = System::baseUrl();
 
-       $head_tpl = get_markup_template('poke_head.tpl');
-       $a->page['htmlhead'] .= replace_macros($head_tpl,[
+       $head_tpl = Renderer::getMarkupTemplate('poke_head.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl,[
                '$baseurl' => System::baseUrl(true),
                '$base' => $base
        ]);
@@ -178,9 +179,9 @@ function poke_content(App $a)
                }
        }
 
-       $tpl = get_markup_template('poke_content.tpl');
+       $tpl = Renderer::getMarkupTemplate('poke_content.tpl');
 
-       $o = replace_macros($tpl,[
+       $o = Renderer::replaceMacros($tpl,[
                '$title' => L10n::t('Poke/Prod'),
                '$desc' => L10n::t('poke, prod or do other things to somebody'),
                '$clabel' => L10n::t('Recipient'),
index da45226fe02bbc20f983774eac313f21a5e5c946..3304e3cab2c44762e2e8f72d737ee9a1bf8d5641 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -238,9 +239,9 @@ function profile_photo_content(App $a)
        );
 
        if (empty($imagecrop)) {
-               $tpl = get_markup_template('profile_photo.tpl');
+               $tpl = Renderer::getMarkupTemplate('profile_photo.tpl');
 
-               $o = replace_macros($tpl,
+               $o = Renderer::replaceMacros($tpl,
                        [
                        '$user' => $a->user['nickname'],
                        '$lbl_upfile' => L10n::t('Upload File:'),
@@ -256,8 +257,8 @@ function profile_photo_content(App $a)
                return $o;
        } else {
                $filename = $imagecrop['hash'] . '-' . $imagecrop['resolution'] . '.' . $imagecrop['ext'];
-               $tpl = get_markup_template("cropbody.tpl");
-               $o = replace_macros($tpl,
+               $tpl = Renderer::getMarkupTemplate("cropbody.tpl");
+               $o = Renderer::replaceMacros($tpl,
                        [
                        '$filename'  => $filename,
                        '$profile'   => (isset($_REQUEST['profile']) ? intval($_REQUEST['profile']) : 0),
@@ -318,7 +319,7 @@ function profile_photo_crop_ui_head(App $a, Image $image)
                }
        }
 
-       $a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
+       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("crophead.tpl"), []);
 
        $imagecrop = [
                'hash'       => $hash,
index a4a49ec785ad1b4e5dfda67a1430bff5adfec849..a535f2fc204b4b52e0da063f12e3b81a05db272f 100644 (file)
@@ -12,6 +12,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -526,12 +527,12 @@ function profiles_content(App $a) {
                        return;
                }
 
-               $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), [
+               $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [
                        '$baseurl' => System::baseUrl(true),
                ]);
 
-               $opt_tpl = get_markup_template("profile-hide-friends.tpl");
-               $hide_friends = replace_macros($opt_tpl,[
+               $opt_tpl = Renderer::getMarkupTemplate("profile-hide-friends.tpl");
+               $hide_friends = Renderer::replaceMacros($opt_tpl,[
                        '$yesno' => [
                                'hide-friends', //Name
                                L10n::t('Hide contacts and friends:'), //Label
@@ -552,8 +553,8 @@ function profiles_content(App $a) {
                $detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
 
                $is_default = (($r[0]['is-default']) ? 1 : 0);
-               $tpl = get_markup_template("profile_edit.tpl");
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("profile_edit.tpl");
+               $o .= Renderer::replaceMacros($tpl, [
                        '$personal_account' => $personal_account,
                        '$detailled_profile' => $detailled_profile,
 
@@ -663,11 +664,11 @@ function profiles_content(App $a) {
 
                if (DBA::isResult($r)) {
 
-                       $tpl = get_markup_template('profile_entry.tpl');
+                       $tpl = Renderer::getMarkupTemplate('profile_entry.tpl');
 
                        $profiles = '';
                        foreach ($r as $rr) {
-                               $profiles .= replace_macros($tpl, [
+                               $profiles .= Renderer::replaceMacros($tpl, [
                                        '$photo'        => $a->removeBaseURL($rr['thumb']),
                                        '$id'           => $rr['id'],
                                        '$alt'          => L10n::t('Profile Image'),
@@ -677,8 +678,8 @@ function profiles_content(App $a) {
                                ]);
                        }
 
-                       $tpl_header = get_markup_template('profile_listing_header.tpl');
-                       $o .= replace_macros($tpl_header,[
+                       $tpl_header = Renderer::getMarkupTemplate('profile_listing_header.tpl');
+                       $o .= Renderer::replaceMacros($tpl_header,[
                                '$header'      => L10n::t('Edit/Manage Profiles'),
                                '$chg_photo'   => L10n::t('Change profile photo'),
                                '$cr_new'      => L10n::t('Create New Profile'),
index 73b57124a21613219d5f4363f05991a3eb789f81..d8231bd21e0aa306f82903628ea62396bbf40df9 100644 (file)
@@ -11,6 +11,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Model;
@@ -228,8 +229,8 @@ function register_content(App $a)
        if (Config::get('system', 'publish_all')) {
                $profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
        } else {
-               $publish_tpl = get_markup_template("profile_publish.tpl");
-               $profile_publish = replace_macros($publish_tpl, [
+               $publish_tpl = Renderer::getMarkupTemplate("profile_publish.tpl");
+               $profile_publish = Renderer::replaceMacros($publish_tpl, [
                        '$instance' => 'reg',
                        '$pubdesc' => L10n::t('Include your profile in member directory?'),
                        '$yes_selected' => '',
@@ -244,7 +245,7 @@ function register_content(App $a)
 
        $license = '';
 
-       $tpl = get_markup_template("register.tpl");
+       $tpl = Renderer::getMarkupTemplate("register.tpl");
 
        $arr = ['template' => $tpl];
 
@@ -254,7 +255,7 @@ function register_content(App $a)
 
        $tos = new Tos();
 
-       $o = replace_macros($tpl, [
+       $o = Renderer::replaceMacros($tpl, [
                '$oidhtml' => $oidhtml,
                '$invitations' => Config::get('system', 'invitation_only'),
                '$permonly'    => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE,
index 86d46a177b26fc31a5f0bee87ce0dadacef8a1cf..c2ceb7d4cf6d10aee8c66959c223f03fb44a0af7 100644 (file)
@@ -6,6 +6,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
@@ -74,8 +75,8 @@ function removeme_content(App $a)
 
        $_SESSION['remove_account_verify'] = $hash;
 
-       $tpl = get_markup_template('removeme.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('removeme.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$basedir' => $a->getBaseURL(),
                '$hash' => $hash,
                '$title' => L10n::t('Remove My Account'),
index 4be378ba9a96609757251057c8a7b4b98eeb8723..37dacadddf1131c8810a4af4236c1cbc7b2403d6 100644 (file)
@@ -11,6 +11,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
@@ -43,9 +44,9 @@ function search_saved_searches() {
                }
 
 
-               $tpl = get_markup_template("saved_searches_aside.tpl");
+               $tpl = Renderer::getMarkupTemplate("saved_searches_aside.tpl");
 
-               $o .= replace_macros($tpl, [
+               $o .= Renderer::replaceMacros($tpl, [
                        '$title'        => L10n::t('Saved Searches'),
                        '$add'          => '',
                        '$searchbox'    => '',
@@ -158,7 +159,7 @@ function search_content(App $a) {
        }
 
        // contruct a wrapper for the search header
-       $o = replace_macros(get_markup_template("content_wrapper.tpl"),[
+       $o = Renderer::replaceMacros(Renderer::getMarkupTemplate("content_wrapper.tpl"),[
                'name' => "search-header",
                '$title' => L10n::t("Search"),
                '$title_size' => 3,
@@ -251,7 +252,7 @@ function search_content(App $a) {
                $title = L10n::t('Results for: %s', $search);
        }
 
-       $o .= replace_macros(get_markup_template("section_title.tpl"),[
+       $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"),[
                '$title' => $title
        ]);
 
index 2973a7f729ac9a96e3360d78b6b496ea17ca9912..d886288409a0ccef12495b8d7673e8a8d4e4750a 100644 (file)
@@ -13,6 +13,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
@@ -49,8 +50,8 @@ function settings_init(App $a)
 
        // These lines provide the javascript needed by the acl selector
 
-       $tpl = get_markup_template('settings/head.tpl');
-       $a->page['htmlhead'] .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('settings/head.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$ispublic' => L10n::t('everybody')
        ]);
 
@@ -129,8 +130,8 @@ function settings_init(App $a)
        ];
 
 
-       $tabtpl = get_markup_template("generic_links_widget.tpl");
-       $a->page['aside'] = replace_macros($tabtpl, [
+       $tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl");
+       $a->page['aside'] = Renderer::replaceMacros($tabtpl, [
                '$title' => L10n::t('Settings'),
                '$class' => 'settings-widget',
                '$items' => $tabs,
@@ -671,8 +672,8 @@ function settings_content(App $a)
 
        if (($a->argc > 1) && ($a->argv[1] === 'oauth')) {
                if (($a->argc > 2) && ($a->argv[2] === 'add')) {
-                       $tpl = get_markup_template('settings/oauth_edit.tpl');
-                       $o .= replace_macros($tpl, [
+                       $tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl');
+                       $o .= Renderer::replaceMacros($tpl, [
                                '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
                                '$title'        => L10n::t('Add application'),
                                '$submit'       => L10n::t('Save Settings'),
@@ -697,8 +698,8 @@ function settings_content(App $a)
                        }
                        $app = $r[0];
 
-                       $tpl = get_markup_template('settings/oauth_edit.tpl');
-                       $o .= replace_macros($tpl, [
+                       $tpl = Renderer::getMarkupTemplate('settings/oauth_edit.tpl');
+                       $o .= Renderer::replaceMacros($tpl, [
                                '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
                                '$title'        => L10n::t('Add application'),
                                '$submit'       => L10n::t('Update'),
@@ -729,8 +730,8 @@ function settings_content(App $a)
                                local_user());
 
 
-               $tpl = get_markup_template('settings/oauth.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('settings/oauth.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$form_security_token' => BaseModule::getFormSecurityToken("settings_oauth"),
                        '$baseurl'      => $a->getBaseURL(true),
                        '$title'        => L10n::t('Connected Apps'),
@@ -756,8 +757,8 @@ function settings_content(App $a)
                Addon::callHooks('addon_settings', $settings_addons);
 
 
-               $tpl = get_markup_template('settings/addons.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('settings/addons.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$form_security_token' => BaseModule::getFormSecurityToken("settings_addon"),
                        '$title'        => L10n::t('Addon Settings'),
                        '$settings_addons' => $settings_addons
@@ -777,8 +778,8 @@ function settings_content(App $a)
                        }
                }
 
-               $tpl = get_markup_template('settings/features.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('settings/features.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$form_security_token' => BaseModule::getFormSecurityToken("settings_features"),
                        '$title'               => L10n::t('Additional Features'),
                        '$features'            => $arr,
@@ -833,11 +834,11 @@ function settings_content(App $a)
                $mail_chk          = ((DBA::isResult($r)) ? $r[0]['last_check'] : DBA::NULL_DATETIME);
 
 
-               $tpl = get_markup_template('settings/connectors.tpl');
+               $tpl = Renderer::getMarkupTemplate('settings/connectors.tpl');
 
                $mail_disabled_message = (($mail_disabled) ? L10n::t('Email access is disabled on this site.') : '');
 
-               $o .= replace_macros($tpl, [
+               $o .= Renderer::replaceMacros($tpl, [
                        '$form_security_token' => BaseModule::getFormSecurityToken("settings_connectors"),
 
                        '$title'        => L10n::t('Social Networks'),
@@ -955,8 +956,8 @@ function settings_content(App $a)
                        $theme_config = theme_content($a);
                }
 
-               $tpl = get_markup_template('settings/display.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('settings/display.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$ptitle'       => L10n::t('Display Settings'),
                        '$form_security_token' => BaseModule::getFormSecurityToken("settings_display"),
                        '$submit'       => L10n::t('Save Settings'),
@@ -1031,9 +1032,9 @@ function settings_content(App $a)
                ($a->user['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY))
                $a->user['account-type'] = Contact::ACCOUNT_TYPE_COMMUNITY;
 
-       $pageset_tpl = get_markup_template('settings/pagetypes.tpl');
+       $pageset_tpl = Renderer::getMarkupTemplate('settings/pagetypes.tpl');
 
-       $pagetype = replace_macros($pageset_tpl, [
+       $pagetype = Renderer::replaceMacros($pageset_tpl, [
                '$account_types'        => L10n::t("Account Types"),
                '$user'                 => L10n::t("Personal Page Subtypes"),
                '$community'            => L10n::t("Community Forum Subtypes"),
@@ -1090,44 +1091,44 @@ function settings_content(App $a)
                $openid_field = ['openid_url', L10n::t('OpenID:'), $openid, L10n::t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url"];
        }
 
-       $opt_tpl = get_markup_template("field_yesno.tpl");
+       $opt_tpl = Renderer::getMarkupTemplate("field_yesno.tpl");
        if (Config::get('system', 'publish_all')) {
                $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
        } else {
-               $profile_in_dir = replace_macros($opt_tpl, [
+               $profile_in_dir = Renderer::replaceMacros($opt_tpl, [
                        '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('Your profile will be published in this node\'s <a href="%s">local directory</a>. Your profile details may be publicly visible depending on the system settings.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]]
                ]);
        }
 
        if (strlen(Config::get('system', 'directory'))) {
-               $profile_in_net_dir = replace_macros($opt_tpl, [
+               $profile_in_net_dir = Renderer::replaceMacros($opt_tpl, [
                        '$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], L10n::t('Your profile will be published in the global friendica directories (e.g. <a href="%s">%s</a>). Your profile will be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')), [L10n::t('No'), L10n::t('Yes')]]
                ]);
        } else {
                $profile_in_net_dir = '';
        }
 
-       $hide_friends = replace_macros($opt_tpl, [
+       $hide_friends = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], L10n::t('Your contact list won\'t be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $hide_wall = replace_macros($opt_tpl, [
+       $hide_wall = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['hidewall', L10n::t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], L10n::t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $blockwall = replace_macros($opt_tpl, [
+       $blockwall = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), L10n::t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $blocktags = replace_macros($opt_tpl, [
+       $blocktags = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), L10n::t('Your contacts can add additional tags to your posts.'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $suggestme = replace_macros($opt_tpl, [
+       $suggestme = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, L10n::t('If you like, Friendica may suggest new members to add you as a contact.'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
-       $unkmail = replace_macros($opt_tpl, [
+       $unkmail = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, L10n::t('Friendica network users may send you private messages even if they are not in your contact list.'), [L10n::t('No'), L10n::t('Yes')]],
        ]);
 
@@ -1135,14 +1136,14 @@ function settings_content(App $a)
                info(L10n::t('Profile is <strong>not published</strong>.') . EOL);
        }
 
-       $tpl_addr = get_markup_template('settings/nick_set.tpl');
+       $tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl');
 
-       $prof_addr = replace_macros($tpl_addr,[
+       $prof_addr = Renderer::replaceMacros($tpl_addr,[
                '$desc' => L10n::t("Your Identity Address is <strong>'%s'</strong> or '%s'.", $nickname . '@' . $a->getHostName() . $a->getURLPath(), System::baseUrl() . '/profile/' . $nickname),
                '$basepath' => $a->getHostName()
        ]);
 
-       $stpl = get_markup_template('settings/settings.tpl');
+       $stpl = Renderer::getMarkupTemplate('settings/settings.tpl');
 
        $expire_arr = [
                'days' => ['expire',  L10n::t("Automatically expire posts after this many days:"), $expire, L10n::t('If empty, posts will not expire. Expired posts will be deleted')],
@@ -1181,7 +1182,7 @@ function settings_content(App $a)
        $lang_choices = L10n::getAvailableLanguages();
 
        /// @TODO Fix indending (or so)
-       $o .= replace_macros($stpl, [
+       $o .= Renderer::replaceMacros($stpl, [
                '$ptitle'       => L10n::t('Account Settings'),
 
                '$submit'       => L10n::t('Save Settings'),
index 1e33cb66024e9d811a3711bb31ef12d2d7c758d0..ed9f6e0f2191ed8d40ca36ce725b5ce705ca2ec8 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Widget;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -33,7 +34,7 @@ function suggest_init(App $a)
                                }
                        }
 
-                       $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
+                       $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'get',
                                '$message' => L10n::t('Do you really want to delete this suggestion?'),
                                '$extra_inputs' => $inputs,
@@ -111,9 +112,9 @@ function suggest_content(App $a)
                $entries[] = $entry;
        }
 
-       $tpl = get_markup_template('viewcontact_template.tpl');
+       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-       $o .= replace_macros($tpl,[
+       $o .= Renderer::replaceMacros($tpl,[
                '$title' => L10n::t('Friend Suggestions'),
                '$contacts' => $entries,
        ]);
index 993e398025fb5301b13f204dd09b23b83cfbbaeb..f0d91eeab029f94b0e5609760b716b7b19d97c4d 100644 (file)
@@ -5,6 +5,7 @@
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 
@@ -46,8 +47,8 @@ function uexport_content(App $a) {
        ];
        Addon::callHooks('uexport_options', $options);
 
-       $tpl = get_markup_template("uexport.tpl");
-       return replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate("uexport.tpl");
+       return Renderer::replaceMacros($tpl, [
                '$baseurl' => System::baseUrl(),
                '$title' => L10n::t('Export personal data'),
                '$options' => $options
index 3c80b671be45a308f4449a418705211f059e8de0..5df919d7d6d9f880ffd02a0db9a56fbb7913a893 100644 (file)
@@ -9,6 +9,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\UserImport;
+use Friendica\Core\Renderer;
 
 function uimport_post(App $a)
 {
@@ -48,8 +49,8 @@ function uimport_content(App $a)
                unset($_SESSION['mobile-theme']);
        }
 
-       $tpl = get_markup_template("uimport.tpl");
-       return replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate("uimport.tpl");
+       return Renderer::replaceMacros($tpl, [
                '$regbutt' => L10n::t('Import'),
                '$import' => [
                        'title' => L10n::t("Move account"),
index 2a60322f02d9b2d9043822e8cdaf9c26a8024d70..372364810ea859f6a7e5be0279443bfa98bff8c5 100644 (file)
@@ -6,6 +6,7 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -99,7 +100,7 @@ function unfollow_content(App $a)
        }
 
        $request = System::baseUrl() . '/unfollow';
-       $tpl = get_markup_template('auto_request.tpl');
+       $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
 
        $self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 
@@ -114,7 +115,7 @@ function unfollow_content(App $a)
 
        $header = L10n::t('Disconnect/Unfollow');
 
-       $o = replace_macros($tpl, [
+       $o = Renderer::replaceMacros($tpl, [
                '$header'        => htmlentities($header),
                '$desc'          => '',
                '$pls_answer'    => '',
@@ -144,7 +145,7 @@ function unfollow_content(App $a)
        $a->page['aside'] = '';
        Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url']));
 
-       $o .= replace_macros(get_markup_template('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
+       $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
 
        // Show last public posts
        $o .= Contact::getPostsFromUrl($contact['url']);
index 51f15a47ae02f7ebe8aebd1bdb688574a6750e01..9e64321f3ed52d2bc295c9cbcfa0b1af54405f32 100644 (file)
@@ -8,6 +8,7 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -50,9 +51,9 @@ function videos_init(App $a)
 
                $account_type = Contact::getAccountType($profile);
 
-               $tpl = get_markup_template("vcard-widget.tpl");
+               $tpl = Renderer::getMarkupTemplate("vcard-widget.tpl");
 
-               $vcard_widget = replace_macros($tpl, [
+               $vcard_widget = Renderer::replaceMacros($tpl, [
                        '$name' => $profile['name'],
                        '$photo' => $profile['photo'],
                        '$addr' => defaults($profile, 'addr', ''),
@@ -102,8 +103,8 @@ function videos_init(App $a)
 
                $a->page['aside'] .= $vcard_widget;
 
-               $tpl = get_markup_template("videos_head.tpl");
-               $a->page['htmlhead'] .= replace_macros($tpl,[
+               $tpl = Renderer::getMarkupTemplate("videos_head.tpl");
+               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
                        '$baseurl' => System::baseUrl(),
                ]);
        }
@@ -128,7 +129,7 @@ function videos_post(App $a)
 
                        $drop_url = $a->query_string;
 
-                       $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
+                       $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'post',
                                '$message' => L10n::t('Do you really want to delete this video?'),
                                '$extra_inputs' => [
@@ -381,8 +382,8 @@ function videos_content(App $a)
                }
        }
 
-       $tpl = get_markup_template('videos_recent.tpl');
-       $o .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('videos_recent.tpl');
+       $o .= Renderer::replaceMacros($tpl, [
                '$title'      => L10n::t('Recent Videos'),
                '$can_post'   => $can_post,
                '$upload'     => [L10n::t('Upload New Videos'), System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'],
index 9a2513a6c400f667878448a55f7414d4629c7963..f3d457e2959d89a90ba0cb08b3e5c6f66fca49a4 100644 (file)
@@ -10,6 +10,7 @@ use Friendica\Content\Pager;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -124,8 +125,8 @@ function viewcontacts_content(App $a)
        }
 
 
-       $tpl = get_markup_template("viewcontact_template.tpl");
-       $o .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate("viewcontact_template.tpl");
+       $o .= Renderer::replaceMacros($tpl, [
                '$title' => L10n::t('Contacts'),
                '$contacts' => $contacts,
                '$paginate' => $pager->renderFull($total),
index af1de6c064cb33d916f243aa642a911d3b846b76..78cdd5a55a4f8bf86afc4711c82ccf3998a3b286 100644 (file)
@@ -5,6 +5,7 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Mail;
@@ -114,15 +115,15 @@ function wallmessage_content(App $a) {
                return;
        }
 
-       $tpl = get_markup_template('wallmsg-header.tpl');
-       $a->page['htmlhead'] .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('wallmsg-header.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$baseurl' => System::baseUrl(true),
                '$nickname' => $user['nickname'],
                '$linkurl' => L10n::t('Please enter a link URL:')
        ]);
 
-       $tpl = get_markup_template('wallmessage.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('wallmessage.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$header' => L10n::t('Send Private Message'),
                '$subheader' => L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.', $user['username']),
                '$to' => L10n::t('To:'),
index 1d29d7904a9d5705e77deac205f0dbfc0fdb2cde..83f069d14a85bdcd04e6475b2c94d3307b31c2cc 100644 (file)
@@ -5,6 +5,7 @@
 
 use Friendica\App;
 use Friendica\Core\Addon;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Protocol\Salmon;
@@ -105,9 +106,9 @@ function xrd_xml($a, $uri, $alias, $profile_url, $r)
        header('Access-Control-Allow-Origin: *');
        header("Content-type: text/xml");
 
-       $tpl = get_markup_template('xrd_person.tpl');
+       $tpl = Renderer::getMarkupTemplate('xrd_person.tpl');
 
-       $o = replace_macros($tpl, [
+       $o = Renderer::replaceMacros($tpl, [
                '$nick'        => $r['nickname'],
                '$accturi'     => $uri,
                '$alias'       => $alias,
index 598c0e66fc185169f6d2280ddac125777a56f3be..cf8fc7abe4c2ae2547b223a3415a04e05c39a5c3 100644 (file)
@@ -136,40 +136,8 @@ class App
                $this->footerScripts[] = trim($url, '/');
        }
 
-       /**
-        * @brief An array for all theme-controllable parameters
-        *
-        * Mostly unimplemented yet. Only options 'template_engine' and
-        * beyond are used.
-        */
-       public $theme = [
-               'sourcename' => '',
-               'videowidth' => 425,
-               'videoheight' => 350,
-               'force_max_items' => 0,
-               'stylesheet' => '',
-               'template_engine' => 'smarty3',
-       ];
-
-       /**
-        * @brief An array of registered template engines ('name'=>'class name')
-        */
-       public $template_engines = [];
-
-       /**
-        * @brief An array of instanced template engines ('name'=>'instance')
-        */
-       public $template_engine_instance = [];
        public $process_id;
        public $queue;
-       private $ldelim = [
-               'internal' => '',
-               'smarty3' => '{{'
-       ];
-       private $rdelim = [
-               'internal' => '',
-               'smarty3' => '}}'
-       ];
        private $scheme;
        private $hostname;
 
@@ -309,7 +277,7 @@ class App
                $this->isAjax = strtolower(defaults($_SERVER, 'HTTP_X_REQUESTED_WITH', '')) == 'xmlhttprequest';
 
                // Register template engines
-               $this->registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
+               Core\Renderer::registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
        }
 
        /**
@@ -752,8 +720,8 @@ class App
                        $this->page['title'] = $this->config['sitename'];
                }
 
-               if (!empty($this->theme['stylesheet'])) {
-                       $stylesheet = $this->theme['stylesheet'];
+               if (!empty(Core\Renderer::$theme['stylesheet'])) {
+                       $stylesheet = Core\Renderer::$theme['stylesheet'];
                } else {
                        $stylesheet = $this->getCurrentThemeStylesheetPath();
                }
@@ -772,12 +740,12 @@ class App
 
                Core\Addon::callHooks('head', $this->page['htmlhead']);
 
-               $tpl = get_markup_template('head.tpl');
+               $tpl = Core\Renderer::getMarkupTemplate('head.tpl');
                /* put the head template at the beginning of page['htmlhead']
                 * since the code added by the modules frequently depends on it
                 * being first
                 */
-               $this->page['htmlhead'] = replace_macros($tpl, [
+               $this->page['htmlhead'] = Core\Renderer::replaceMacros($tpl, [
                        '$baseurl'         => $this->getBaseURL(),
                        '$local_user'      => local_user(),
                        '$generator'       => 'Friendica' . ' ' . FRIENDICA_VERSION,
@@ -823,7 +791,7 @@ class App
                        } else {
                                $link = 'toggle_mobile?off=1&address=' . curPageURL();
                        }
-                       $this->page['footer'] .= replace_macros(get_markup_template("toggle_mobile_footer.tpl"), [
+                       $this->page['footer'] .= Core\Renderer::replaceMacros(Core\Renderer::getMarkupTemplate("toggle_mobile_footer.tpl"), [
                                '$toggle_link' => $link,
                                '$toggle_text' => Core\L10n::t('toggle mobile')
                        ]);
@@ -831,8 +799,8 @@ class App
 
                Core\Addon::callHooks('footer', $this->page['footer']);
 
-               $tpl = get_markup_template('footer.tpl');
-               $this->page['footer'] = replace_macros($tpl, [
+               $tpl = Core\Renderer::getMarkupTemplate('footer.tpl');
+               $this->page['footer'] = Core\Renderer::replaceMacros($tpl, [
                        '$baseurl' => $this->getBaseURL(),
                        '$footerScripts' => $this->footerScripts,
                ]) . $this->page['footer'];
@@ -860,102 +828,6 @@ class App
                }
        }
 
-       /**
-        * @brief Register template engine class
-        *
-        * @param string $class
-        */
-       private function registerTemplateEngine($class)
-       {
-               $v = get_class_vars($class);
-               if (!empty($v['name'])) {
-                       $name = $v['name'];
-                       $this->template_engines[$name] = $class;
-               } else {
-                       echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
-                       die();
-               }
-       }
-
-       /**
-        * @brief Return template engine instance.
-        *
-        * If $name is not defined, return engine defined by theme,
-        * or default
-        *
-        * @return object Template Engine instance
-        */
-       public function getTemplateEngine()
-       {
-               $template_engine = defaults($this->theme, 'template_engine', 'smarty3');
-
-               if (isset($this->template_engines[$template_engine])) {
-                       if (isset($this->template_engine_instance[$template_engine])) {
-                               return $this->template_engine_instance[$template_engine];
-                       } else {
-                               $class = $this->template_engines[$template_engine];
-                               $obj = new $class;
-                               $this->template_engine_instance[$template_engine] = $obj;
-                               return $obj;
-                       }
-               }
-
-               echo "template engine <tt>$template_engine</tt> is not registered!\n";
-               exit();
-       }
-
-       /**
-        * @brief Returns the active template engine.
-        *
-        * @return string the active template engine
-        */
-       public function getActiveTemplateEngine()
-       {
-               return $this->theme['template_engine'];
-       }
-
-       /**
-        * sets the active template engine
-        *
-        * @param string $engine the template engine (default is Smarty3)
-        */
-       public function setActiveTemplateEngine($engine = 'smarty3')
-       {
-               $this->theme['template_engine'] = $engine;
-       }
-
-       /**
-        * Gets the right delimiter for a template engine
-        *
-        * Currently:
-        * Internal = ''
-        * Smarty3 = '{{'
-        *
-        * @param string $engine The template engine (default is Smarty3)
-        *
-        * @return string the right delimiter
-        */
-       public function getTemplateLeftDelimiter($engine = 'smarty3')
-       {
-               return $this->ldelim[$engine];
-       }
-
-       /**
-        * Gets the left delimiter for a template engine
-        *
-        * Currently:
-        * Internal = ''
-        * Smarty3 = '}}'
-        *
-        * @param string $engine The template engine (default is Smarty3)
-        *
-        * @return string the left delimiter
-        */
-       public function getTemplateRightDelimiter($engine = 'smarty3')
-       {
-               return $this->rdelim[$engine];
-       }
-
        /**
         * Saves a timestamp for a value - f.e. a call
         * Necessary for profiling Friendica
@@ -1792,8 +1664,8 @@ class App
                                Core\Logger::log('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], Core\Logger::DEBUG);
 
                                header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . Core\L10n::t('Not Found'));
-                               $tpl = get_markup_template("404.tpl");
-                               $this->page['content'] = replace_macros($tpl, [
+                               $tpl = Core\Renderer::getMarkupTemplate("404.tpl");
+                               $this->page['content'] = Core\Renderer::replaceMacros($tpl, [
                                        '$message' =>  Core\L10n::t('Page not found.')
                                ]);
                        }
@@ -1881,7 +1753,7 @@ class App
 
                // Add the navigation (menu) template
                if ($this->module != 'install' && $this->module != 'maintenance') {
-                       $this->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), []);
+                       $this->page['htmlhead'] .= Core\Renderer::replaceMacros(Core\Renderer::getMarkupTemplate('nav_head.tpl'), []);
                        $this->page['nav']       = Content\Nav::build($this);
                }
 
index 35df0aee9e6af85064d3bb9f7c36cc2f5c9c519a..a47d70ab38b2a60ebe037d0ec98594b33e268bcc 100644 (file)
@@ -8,6 +8,7 @@ namespace Friendica\Content;
 use Friendica\Core\Protocol;
 use Friendica\Content\Feature;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -122,9 +123,9 @@ class ForumManager
                                $entries[] = $entry;
                        }
 
-                       $tpl = get_markup_template('widget_forumlist.tpl');
+                       $tpl = Renderer::getMarkupTemplate('widget_forumlist.tpl');
 
-                       $o .= replace_macros(
+                       $o .= Renderer::replaceMacros(
                                $tpl,
                                [
                                        '$title'        => L10n::t('Forums'),
index 8289825eade47587a67017f7bcee64be49542134..b8691e93400ee53aeeac2f18f61bb8fd5113bd85 100644 (file)
@@ -9,6 +9,7 @@ use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -61,9 +62,9 @@ class Nav
 
                $nav_info = self::getInfo($a);
 
-               $tpl = get_markup_template('nav.tpl');
+               $tpl = Renderer::getMarkupTemplate('nav.tpl');
 
-               $nav .= replace_macros($tpl, [
+               $nav .= Renderer::replaceMacros($tpl, [
                        '$baseurl'      => System::baseUrl(),
                        '$sitelocation' => $nav_info['sitelocation'],
                        '$nav'          => $nav_info['nav'],
index cfe9468ad57a58a0f893b0fb9d16522aa59e60fc..943b91e1f293264782dae575ddf9b8be7d54fa77 100644 (file)
@@ -14,6 +14,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
@@ -178,8 +179,8 @@ class OEmbed
 
                                        $th = 120;
                                        $tw = $th * $tr;
-                                       $tpl = get_markup_template('oembed_video.tpl');
-                                       $ret .= replace_macros($tpl, [
+                                       $tpl = Renderer::getMarkupTemplate('oembed_video.tpl');
+                                       $ret .= Renderer::replaceMacros($tpl, [
                                                '$baseurl' => System::baseUrl(),
                                                '$embedurl' => $oembed->embed_url,
                                                '$escapedhtml' => base64_encode($oembed->html),
index a95fc7cf656351de1c5a812e8e8b58ec2c516f37..098d8e87960d4c828511cbdff5e897b770558cd6 100644 (file)
@@ -3,6 +3,7 @@
 namespace Friendica\Content;
 
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
 /**
  * The Pager has two very different output, Minimal and Full, see renderMinimal() and renderFull() for more details.
@@ -172,8 +173,8 @@ class Pager
                        ]
                ];
 
-               $tpl = get_markup_template('paginate.tpl');
-               return replace_macros($tpl, ['pager' => $data]);
+               $tpl = Renderer::getMarkupTemplate('paginate.tpl');
+               return Renderer::replaceMacros($tpl, ['pager' => $data]);
        }
 
        /**
@@ -276,7 +277,7 @@ class Pager
                        ];
                }
 
-               $tpl = get_markup_template('paginate.tpl');
-               return replace_macros($tpl, ['pager' => $data]);
+               $tpl = Renderer::getMarkupTemplate('paginate.tpl');
+               return Renderer::replaceMacros($tpl, ['pager' => $data]);
        }
 }
index 22ce4ea3aeb112c14e5b313e609190ca30c16e86..3592059d0ca76770ac7698fb7ac9bc449559b30e 100644 (file)
@@ -17,6 +17,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Model\Event;
@@ -986,8 +987,8 @@ class BBCode extends BaseObject
                                } else {
                                        $text = ($is_quote_share? "\n" : '');
 
-                                       $tpl = get_markup_template('shared_content.tpl');
-                                       $text .= replace_macros($tpl, [
+                                       $tpl = Renderer::getMarkupTemplate('shared_content.tpl');
+                                       $text .= Renderer::replaceMacros($tpl, [
                                                '$profile' => $attributes['profile'],
                                                '$avatar'  => $attributes['avatar'],
                                                '$author'  => $attributes['author'],
index 8dd71b8bfc7fe57398d5cd12c966a2c1a2420937..2f78d0fd3d387dd52f6e4830f2ed2f41c9c8b240 100644 (file)
@@ -11,6 +11,7 @@ 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;
@@ -30,7 +31,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'),
@@ -73,7 +74,7 @@ class Widget
                $aside = [];
                $aside['$nv'] = $nv;
 
-               return replace_macros(get_markup_template('peoplefind.tpl'), $aside);
+               return Renderer::replaceMacros(Renderer::getMarkupTemplate('peoplefind.tpl'), $aside);
        }
 
        /**
@@ -151,7 +152,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' : ''),
@@ -193,7 +194,7 @@ class Widget
                        }
                }
 
-               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' : ''),
@@ -233,7 +234,7 @@ class Widget
                        }
                }
 
-               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' : ''),
@@ -300,7 +301,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,
index 2c21b2f0d0ab7e2d1b2f59194e87e038d27437cb..e8bec0b95a451211e97ed2b5373bb099dc63dc5b 100644 (file)
@@ -8,6 +8,7 @@ namespace Friendica\Content\Widget;
 
 use Friendica\Content\Feature;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
 require_once 'boot.php';
 require_once 'include/text.php';
@@ -60,8 +61,8 @@ class CalendarExport
                // of the profile page it should be the personal /events page. So we can use $a->user.
                $user = defaults($a->data['user'], 'nickname', $a->user['nickname']);
 
-               $tpl = get_markup_template("events_aside.tpl");
-               $return = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("events_aside.tpl");
+               $return = Renderer::replaceMacros($tpl, [
                        '$etitle'      => L10n::t("Export"),
                        '$export_ical' => L10n::t("Export calendar as ical"),
                        '$export_csv'  => L10n::t("Export calendar as csv"),
index 309f9a5bdb4e53ad97fce9dfa6929a7b047aea74..23aac19eb79a2a0c7c9ad6cfaf5a14b77898776e 100644 (file)
@@ -7,6 +7,7 @@
 namespace Friendica\Content\Widget;
 
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
@@ -49,8 +50,8 @@ class TagCloud
                                $tags[] = $tag;
                        }
 
-                       $tpl = get_markup_template('tagblock_widget.tpl');
-                       $o = replace_macros($tpl, [
+                       $tpl = Renderer::getMarkupTemplate('tagblock_widget.tpl');
+                       $o = Renderer::replaceMacros($tpl, [
                                '$title' => L10n::t('Tags'),
                                '$tags' => $tags
                        ]);
index bbe24545c7bcb6dd0dd1f0c1162f5e7a2c41a27c..9abd259acd0550f60c59f924aafed59f24ed5115 100644 (file)
@@ -9,6 +9,7 @@ namespace Friendica\Core;
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
@@ -291,8 +292,8 @@ class ACL extends BaseObject
                        }
                }
 
-               $tpl = get_markup_template('acl_selector.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('acl_selector.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$showall' => L10n::t('Visible to everybody'),
                        '$show' => L10n::t('show'),
                        '$hide' => L10n::t('don\'t show'),
index cb871e2dfba51e8a322a351fe82d8ce931aa1236..d2b5c4f055ea370fa4a14c747cfa394c4878a18e 100644 (file)
@@ -6,6 +6,7 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
@@ -139,8 +140,8 @@ class Installer
         */
        public function createConfig($phppath, $urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $timezone, $language, $adminmail, $basepath)
        {
-               $tpl = get_markup_template('local.ini.tpl');
-               $txt = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('local.ini.tpl');
+               $txt = Renderer::replaceMacros($tpl, [
                        '$phpath' => $phppath,
                        '$dbhost' => $dbhost,
                        '$dbuser' => $dbuser,
@@ -237,8 +238,8 @@ class Installer
                        $help .= L10n::t('Could not find a command line version of PHP in the web server PATH.') . EOL;
                        $help .= L10n::t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
                        $help .= EOL . EOL;
-                       $tpl = get_markup_template('field_input.tpl');
-                       $help .= replace_macros($tpl, [
+                       $tpl = Renderer::getMarkupTemplate('field_input.tpl');
+                       $help .= Renderer::replaceMacros($tpl, [
                                '$field' => ['phpath', L10n::t('PHP executable path'), $phppath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')],
                        ]);
                        $phppath = "";
diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
new file mode 100644 (file)
index 0000000..44b56fc
--- /dev/null
@@ -0,0 +1,204 @@
+<?php
+/**
+ * @file src/Core/Renderer.php
+ */
+
+namespace Friendica\Core;
+
+use Exception;
+use Friendica\BaseObject;
+use Friendica\Core\System;
+use Friendica\Render\FriendicaSmarty;
+
+/**
+ * @brief This class handles Renderer related functions.
+ */
+class Renderer extends BaseObject
+{
+    /**
+        * @brief An array of registered template engines ('name'=>'class name')
+        */
+    public static $template_engines = [];
+
+    /**
+        * @brief An array of instanced template engines ('name'=>'instance')
+        */
+       public static $template_engine_instance = [];
+
+    /**
+        * @brief An array for all theme-controllable parameters
+        *
+        * Mostly unimplemented yet. Only options 'template_engine' and
+        * beyond are used.
+        */
+       public static $theme = [
+               'sourcename' => '',
+               'videowidth' => 425,
+               'videoheight' => 350,
+               'force_max_items' => 0,
+               'stylesheet' => '',
+               'template_engine' => 'smarty3',
+       ];
+    
+    private static $ldelim = [
+               'internal' => '',
+               'smarty3' => '{{'
+       ];
+       private static $rdelim = [
+               'internal' => '',
+               'smarty3' => '}}'
+    ];
+    
+    /**
+     * @brief This is our template processor
+     *
+     * @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty
+     * @param array $r                  key value pairs (search => replace)
+     * 
+     * @return string substituted string
+    */
+    public static function replaceMacros($s, $r)
+    {
+        $stamp1 = microtime(true);
+        $a = self::getApp();
+
+        // pass $baseurl to all templates
+        $r['$baseurl'] = System::baseUrl();
+        $t = self::getTemplateEngine();
+
+        try {
+            $output = $t->replaceMacros($s, $r);
+        } catch (Exception $e) {
+            echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
+            killme();
+        }
+
+        $a->saveTimestamp($stamp1, "rendering");
+
+        return $output;
+    }
+
+    /**
+     * @brief Load a given template $s
+     *
+     * @param string $s     Template to load.
+     * @param string $root  Optional.
+     * 
+     * @return string template.
+     */
+    public static function getMarkupTemplate($s, $root = '')
+    {
+        $stamp1 = microtime(true);
+        $a = self::getApp();
+        $t = self::getTemplateEngine();
+
+        try {
+            $template = $t->getTemplateFile($s, $root);
+        } catch (Exception $e) {
+            echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
+            killme();
+        }
+
+        $a->saveTimestamp($stamp1, "file");
+
+        return $template;
+    }
+
+    /**
+        * @brief Register template engine class
+        *
+        * @param string $class
+        */
+       public static function registerTemplateEngine($class)
+       {
+        $v = get_class_vars($class);
+        
+        if (!empty($v['name']))
+        {
+                       $name = $v['name'];
+                       self::$template_engines[$name] = $class;
+               } else {
+                       echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
+                       die();
+               }
+       }
+
+       /**
+        * @brief Return template engine instance.
+        *
+        * If $name is not defined, return engine defined by theme,
+        * or default
+        *
+        * @return object Template Engine instance
+        */
+       public static function getTemplateEngine()
+       {
+               $template_engine = defaults(self::$theme, 'template_engine', 'smarty3');
+
+               if (isset(self::$template_engines[$template_engine])) {
+                       if (isset(self::$template_engine_instance[$template_engine])) {
+                               return self::$template_engine_instance[$template_engine];
+                       } else {
+                               $class = self::$template_engines[$template_engine];
+                               $obj = new $class;
+                               self::$template_engine_instance[$template_engine] = $obj;
+                               return $obj;
+                       }
+               }
+
+               echo "template engine <tt>$template_engine</tt> is not registered!\n";
+               exit();
+    }
+    
+    /**
+        * @brief Returns the active template engine.
+        *
+        * @return string the active template engine
+        */
+       public static function getActiveTemplateEngine()
+       {
+               return self::$theme['template_engine'];
+       }
+
+       /**
+        * sets the active template engine
+        *
+        * @param string $engine the template engine (default is Smarty3)
+        */
+       public static function setActiveTemplateEngine($engine = 'smarty3')
+       {
+               self::$theme['template_engine'] = $engine;
+       }
+
+    /**
+        * Gets the right delimiter for a template engine
+        *
+        * Currently:
+        * Internal = ''
+        * Smarty3 = '{{'
+        *
+        * @param string $engine The template engine (default is Smarty3)
+        *
+        * @return string the right delimiter
+        */
+       public static function getTemplateLeftDelimiter($engine = 'smarty3')
+       {
+               return self::$ldelim[$engine];
+       }
+
+       /**
+        * Gets the left delimiter for a template engine
+        *
+        * Currently:
+        * Internal = ''
+        * Smarty3 = '}}'
+        *
+        * @param string $engine The template engine (default is Smarty3)
+        *
+        * @return string the left delimiter
+        */
+       public static function getTemplateRightDelimiter($engine = 'smarty3')
+       {
+               return self::$rdelim[$engine];
+       }
+}
index 07f0b6b171c75bd7f6c4c6fa3c9b16d12f61b581..0f9a611ab92b084d2d5d758b0c435a7efcfc56f5 100644 (file)
@@ -6,6 +6,7 @@ namespace Friendica\Core;
 
 use Friendica\BaseObject;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\XML;
 
@@ -139,8 +140,8 @@ class System extends BaseObject
                header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
 
                if (isset($description["title"])) {
-                       $tpl = get_markup_template('http_status.tpl');
-                       echo replace_macros($tpl, ['$title' => $description["title"],
+                       $tpl = Renderer::getMarkupTemplate('http_status.tpl');
+                       echo Renderer::replaceMacros($tpl, ['$title' => $description["title"],
                                '$description' => defaults($description, 'description', '')]);
                }
 
index e6ed20f72cb4e77cff497050078ef16ad242207b..ee61149de5b300d6b365b164d91764406ad76ef3 100644 (file)
@@ -11,6 +11,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -898,8 +899,8 @@ class Event extends BaseObject
                // Construct the profile link (magic-auth).
                $profile_link = Contact::magicLinkById($item['author-id']);
 
-               $tpl = get_markup_template('event_stream_item.tpl');
-               $return = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('event_stream_item.tpl');
+               $return = Renderer::replaceMacros($tpl, [
                        '$id'             => $item['event-id'],
                        '$title'          => prepare_text($item['event-summary']),
                        '$dtstart_label'  => L10n::t('Starts:'),
index 0bc8794f8676a6e4729a83611cd5ce272c0c051b..b32b61e103036659e17956ac04f8cd6a1988ec07 100644 (file)
@@ -8,6 +8,7 @@ use Friendica\BaseModule;
 use Friendica\BaseObject;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Util\Security;
 
@@ -332,7 +333,7 @@ class Group extends BaseObject
                        $label = L10n::t('Default privacy group for new contacts');
                }
 
-               $o = replace_macros(get_markup_template('group_selection.tpl'), [
+               $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('group_selection.tpl'), [
                        '$label' => $label,
                        '$groups' => $display_groups
                ]);
@@ -399,8 +400,8 @@ class Group extends BaseObject
                        ];
                }
 
-               $tpl = get_markup_template('group_side.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('group_side.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$add' => L10n::t('add'),
                        '$title' => L10n::t('Groups'),
                        '$groups' => $display_groups,
index fba6759459ccef267338b01c788492f6971b435c..2cd3f7a86c67b46bbaf17c4583e196dabd1b8e94 100644 (file)
@@ -15,6 +15,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -163,7 +164,7 @@ class Profile
                * load/reload current theme info
                */
 
-               $a->setActiveTemplateEngine(); // reset the template engine to the default in case the user's theme doesn't specify one
+               Renderer::setActiveTemplateEngine(); // reset the template engine to the default in case the user's theme doesn't specify one
 
                $theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php';
                if (file_exists($theme_info_file)) {
@@ -171,8 +172,8 @@ class Profile
                }
 
                if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
-                       $a->page['aside'] .= replace_macros(
-                               get_markup_template('profile_edlink.tpl'),
+                       $a->page['aside'] .= Renderer::replaceMacros(
+                               Renderer::getMarkupTemplate('profile_edlink.tpl'),
                                [
                                        '$editprofile' => L10n::t('Edit profile'),
                                        '$profid' => $a->profile['id']
@@ -516,8 +517,8 @@ class Profile
 
                $p['url'] = Contact::magicLink(defaults($p, 'url', $profile_url));
 
-               $tpl = get_markup_template('profile_vcard.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('profile_vcard.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$profile' => $p,
                        '$xmpp' => $xmpp,
                        '$connect' => $connect,
@@ -621,8 +622,8 @@ class Profile
                                }
                        }
                }
-               $tpl = get_markup_template('birthdays_reminder.tpl');
-               return replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl');
+               return Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(),
                        '$classtoday' => $classtoday,
                        '$count' => $total,
@@ -710,8 +711,8 @@ class Profile
                        DBA::close($s);
                        $classtoday = (($istoday) ? 'event-today' : '');
                }
-               $tpl = get_markup_template('events_reminder.tpl');
-               return replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('events_reminder.tpl');
+               return Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(),
                        '$classtoday' => $classtoday,
                        '$count' => count($r),
@@ -726,13 +727,13 @@ class Profile
                $o = '';
                $uid = $a->profile['uid'];
 
-               $o .= replace_macros(
-                       get_markup_template('section_title.tpl'),
+               $o .= Renderer::replaceMacros(
+                       Renderer::getMarkupTemplate('section_title.tpl'),
                        ['$title' => L10n::t('Profile')]
                );
 
                if ($a->profile['name']) {
-                       $tpl = get_markup_template('profile_advanced.tpl');
+                       $tpl = Renderer::getMarkupTemplate('profile_advanced.tpl');
 
                        $profile = [];
 
@@ -860,7 +861,7 @@ class Profile
                                $profile['edit'] = [System::baseUrl() . '/profiles/' . $a->profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')];
                        }
 
-                       return replace_macros($tpl, [
+                       return Renderer::replaceMacros($tpl, [
                                '$title' => L10n::t('Profile'),
                                '$basic' => L10n::t('Basic'),
                                '$advanced' => L10n::t('Advanced'),
@@ -977,9 +978,9 @@ class Profile
                $arr = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $tab, 'tabs' => $tabs];
                Addon::callHooks('profile_tabs', $arr);
 
-               $tpl = get_markup_template('common_tabs.tpl');
+               $tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
 
-               return replace_macros($tpl, ['$tabs' => $arr['tabs']]);
+               return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]);
        }
 
        /**
index 817c70e852400da3e8e02a3af31c475f0ffeb704..89a98919175030e354b37c52a31a8800268ea8ad 100644 (file)
@@ -13,6 +13,7 @@ use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -82,7 +83,7 @@ class Contact extends BaseModule
                        }
 
                        /// @TODO Add nice spaces
-                       $vcard_widget = replace_macros(get_markup_template('vcard-widget.tpl'), [
+                       $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('vcard-widget.tpl'), [
                                '$name'         => htmlentities($contact['name']),
                                '$photo'        => $contact['photo'],
                                '$url'          => Model\Contact::MagicLink($contact['url']),
@@ -113,7 +114,7 @@ class Contact extends BaseModule
                        $groups_widget = null;
                }
 
-               $a->page['aside'] .= replace_macros(get_markup_template('contacts-widget-sidebar.tpl'), [
+               $a->page['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contacts-widget-sidebar.tpl'), [
                        '$vcard_widget'      => $vcard_widget,
                        '$findpeople_widget' => $findpeople_widget,
                        '$follow_widget'     => $follow_widget,
@@ -122,8 +123,8 @@ class Contact extends BaseModule
                ]);
 
                $base = $a->getBaseURL();
-               $tpl = get_markup_template('contacts-head.tpl');
-               $a->page['htmlhead'] .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
+               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$baseurl' => System::baseUrl(true),
                        '$base' => $base
                ]);
@@ -438,7 +439,7 @@ class Contact extends BaseModule
 
                                        $a->page['aside'] = '';
 
-                                       return replace_macros(get_markup_template('contact_drop_confirm.tpl'), [
+                                       return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
                                                '$header' => L10n::t('Drop contact'),
                                                '$contact' => self::getContactTemplateVars($orig_record),
                                                '$method' => 'get',
@@ -475,7 +476,7 @@ class Contact extends BaseModule
                        $contact_id = $a->data['contact']['id'];
                        $contact = $a->data['contact'];
 
-                       $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), [
+                       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
                                '$baseurl' => $a->getBaseURL(true),
                        ]);
 
@@ -591,8 +592,8 @@ class Contact extends BaseModule
                                $contact_settings_label = null;
                        }
 
-                       $tpl = get_markup_template('contact_edit.tpl');
-                       $o .= replace_macros($tpl, [
+                       $tpl = Renderer::getMarkupTemplate('contact_edit.tpl');
+                       $o .= Renderer::replaceMacros($tpl, [
                                '$header'         => L10n::t('Contact'),
                                '$tab_str'        => $tab_str,
                                '$submit'         => L10n::t('Submit'),
@@ -755,8 +756,8 @@ class Contact extends BaseModule
                        ],
                ];
 
-               $tab_tpl = get_markup_template('common_tabs.tpl');
-               $t = replace_macros($tab_tpl, ['$tabs' => $tabs]);
+               $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+               $t = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
                $total = 0;
                $searching = false;
@@ -800,8 +801,8 @@ class Contact extends BaseModule
                        }
                }
 
-               $tpl = get_markup_template('contacts-template.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('contacts-template.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$baseurl'    => System::baseUrl(),
                        '$header'     => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''),
                        '$tabs'       => $t,
@@ -903,8 +904,8 @@ class Contact extends BaseModule
                        ];
                }
 
-               $tab_tpl = get_markup_template('common_tabs.tpl');
-               $tab_str = replace_macros($tab_tpl, ['$tabs' => $tabs]);
+               $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+               $tab_str = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
                return $tab_str;
        }
index 2ef2c32299d1ba2a4033dcc4b8e7944c1efe3f96..09de23c080acb399b0a43fcd7f5e48e386408f8e 100644 (file)
@@ -8,6 +8,7 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Core;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Util\Temporal;
 
 class Install extends BaseModule
@@ -52,7 +53,7 @@ class Install extends BaseModule
 
                // We overwrite current theme css, because during install we may not have a working mod_rewrite
                // so we may not have a css at all. Here we set a static css file for the install procedure pages
-               $a->theme['stylesheet'] = $a->getBaseURL() . '/view/install/style.css';
+               Renderer::$theme['stylesheet'] = $a->getBaseURL() . '/view/install/style.css';
 
                self::$installer = new Core\Installer();
                self::$currentWizardStep = defaults($_POST, 'pass', self::SYSTEM_CHECK);
@@ -123,8 +124,8 @@ class Install extends BaseModule
 
                                $status = self::$installer->checkEnvironment($a->getBaseURL(), $phppath);
 
-                               $tpl = get_markup_template('install_checks.tpl');
-                               $output .= replace_macros($tpl, [
+                               $tpl = Renderer::getMarkupTemplate('install_checks.tpl');
+                               $output .= Renderer::replaceMacros($tpl, [
                                        '$title'                => $install_title,
                                        '$pass'                 => L10n::t('System check'),
                                        '$checks'               => self::$installer->getChecks(),
@@ -145,8 +146,8 @@ class Install extends BaseModule
                                $phpath    = notags(trim(defaults($_POST, 'phpath'   , ''                          )));
                                $adminmail = notags(trim(defaults($_POST, 'adminmail', ''                          )));
 
-                               $tpl = get_markup_template('install_db.tpl');
-                               $output .= replace_macros($tpl, [
+                               $tpl = Renderer::getMarkupTemplate('install_db.tpl');
+                               $output .= Renderer::replaceMacros($tpl, [
                                        '$title'        => $install_title,
                                        '$pass'         => L10n::t('Database connection'),
                                        '$info_01'      => L10n::t('In order to install Friendica we need to know how to connect to your database.'),
@@ -201,8 +202,8 @@ class Install extends BaseModule
                                /* Installed langs */
                                $lang_choices = L10n::getAvailableLanguages();
 
-                               $tpl = get_markup_template('install_settings.tpl');
-                               $output .= replace_macros($tpl, [
+                               $tpl = Renderer::getMarkupTemplate('install_settings.tpl');
+                               $output .= Renderer::replaceMacros($tpl, [
                                        '$title'                => $install_title,
                                        '$checks'               => self::$installer->getChecks(),
                                        '$pass'                 => L10n::t('Site settings'),
@@ -232,8 +233,8 @@ class Install extends BaseModule
                                        $db_return_text .= $txt;
                                }
 
-                               $tpl = get_markup_template('install_finished.tpl');
-                               $output .= replace_macros($tpl, [
+                               $tpl = Renderer::getMarkupTemplate('install_finished.tpl');
+                               $output .= Renderer::replaceMacros($tpl, [
                                        '$title'  => $install_title,
                                        '$checks' => self::$installer->getChecks(),
                                        '$pass'   => L10n::t('Installation finished'),
index bcbd5571825ef386492e631d8a711ae1afbbc45d..2da679eeefffd725cc3cb680d71bf37badd474e5 100644 (file)
@@ -3,6 +3,7 @@
 namespace Friendica\Module;
 
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Model;
 
 /**
@@ -27,8 +28,8 @@ class Itemsource extends \Friendica\BaseModule
                        $source = htmlspecialchars($conversation['source']);
                }
 
-               $tpl = get_markup_template('debug/itemsource.tpl');
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('debug/itemsource.tpl');
+               $o = Renderer::replaceMacros($tpl, [
                        '$guid'          => ['guid', L10n::t('Item Guid'), htmlentities(defaults($_REQUEST, 'guid', '')), ''],
                        '$source'        => $source,
                        '$item_uri'      => $item_uri
index a91c17b730e71cb69812d3e32bf6acd2294b611c..751d4d4cce5a5dfc037908b54e922e98801424c8 100644 (file)
@@ -11,6 +11,7 @@ use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
@@ -299,20 +300,20 @@ class Login extends BaseModule
                }
 
                if (local_user()) {
-                       $tpl = get_markup_template('logout.tpl');
+                       $tpl = Renderer::getMarkupTemplate('logout.tpl');
                } else {
-                       $a->page['htmlhead'] .= replace_macros(
-                               get_markup_template('login_head.tpl'),
+                       $a->page['htmlhead'] .= Renderer::replaceMacros(
+                               Renderer::getMarkupTemplate('login_head.tpl'),
                                [
                                        '$baseurl' => $a->getBaseURL(true)
                                ]
                        );
 
-                       $tpl = get_markup_template('login.tpl');
+                       $tpl = Renderer::getMarkupTemplate('login.tpl');
                        $_SESSION['return_path'] = $return_path;
                }
 
-               $o .= replace_macros(
+               $o .= Renderer::replaceMacros(
                        $tpl,
                        [
                                '$dest_url'     => self::getApp()->getBaseURL(true) . '/login',
index db8b55885ae2829aedb3754daf947106f275dc43..170371ad46140ef6e5aa0143f49ba6a902e8c89c 100644 (file)
@@ -11,6 +11,7 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Content\Text\BBCode;
 
@@ -64,9 +65,9 @@ class Tos extends BaseModule
         * @return string
         **/
        public static function content() {
-               $tpl = get_markup_template('tos.tpl');
+               $tpl = Renderer::getMarkupTemplate('tos.tpl');
                if (Config::get('system', 'tosdisplay')) {
-                       return replace_macros($tpl, [
+                       return Renderer::replaceMacros($tpl, [
                                '$title' => L10n::t('Terms of Service'),
                                '$tostext' => BBCode::convert(Config::get('system', 'tostext')),
                                '$displayprivstatement' => Config::get('system', 'tosprivstatement'),
index bb1b81c2cc9b4dd8524b05f853df3abf140b6145..086b78960a81d3d2982ba636083a4dbfca274bf5 100644 (file)
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
@@ -785,8 +786,8 @@ class Post extends BaseObject
                                $uid = $parent_uid;
                        }
 
-                       $template = get_markup_template($this->getCommentBoxTemplate());
-                       $comment_box = replace_macros($template, [
+                       $template = Renderer::getMarkupTemplate($this->getCommentBoxTemplate());
+                       $comment_box = Renderer::replaceMacros($template, [
                                '$return_path' => $a->query_string,
                                '$threaded'    => $this->isThreaded(),
                                '$jsreload'    => '',
index 2052aa9e87a6f5627948d99d18b6464dcb3af8a9..e544a76d1bd4fb562fbf8a82f27798bd3bd09b07 100644 (file)
@@ -5,6 +5,7 @@
 namespace Friendica\Render;
 
 use Smarty;
+use Friendica\Core\Renderer;
 
 /**
  * Friendica extension of the Smarty3 template engine
@@ -38,8 +39,8 @@ class FriendicaSmarty extends Smarty
                $this->setConfigDir('view/smarty3/config/');
                $this->setCacheDir('view/smarty3/cache/');
 
-               $this->left_delimiter = $a->getTemplateLeftDelimiter('smarty3');
-               $this->right_delimiter = $a->getTemplateRightDelimiter('smarty3');
+               $this->left_delimiter = Renderer::getTemplateLeftDelimiter('smarty3');
+               $this->right_delimiter = Renderer::getTemplateRightDelimiter('smarty3');
 
                // Don't report errors so verbosely
                $this->error_reporting = E_ALL & ~E_NOTICE;
index bc7639b3b740f102b2f6b32e162413c1e961f7ca..670c273c045cbb6a8f99e5fa79a4d2ca03eb200b 100644 (file)
@@ -11,6 +11,7 @@ use DateTimeZone;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 
 require_once 'boot.php';
@@ -114,8 +115,8 @@ class Temporal
                $options = str_replace('<select id="timezone_select" name="timezone">', '', $options);
                $options = str_replace('</select>', '', $options);
 
-               $tpl = get_markup_template('field_select_raw.tpl');
-               return replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('field_select_raw.tpl');
+               return Renderer::replaceMacros($tpl, [
                        '$field' => [$name, $label, $current, $help, $options],
                ]);
        }
@@ -140,8 +141,8 @@ class Temporal
 
                $age = (intval($value) ? self::getAgeByTimezone($value, $a->user["timezone"], $a->user["timezone"]) : "");
 
-               $tpl = get_markup_template("field_input.tpl");
-               $o = replace_macros($tpl,
+               $tpl = Renderer::getMarkupTemplate("field_input.tpl");
+               $o = Renderer::replaceMacros($tpl,
                        [
                        '$field' => [
                                'dob',
@@ -246,8 +247,8 @@ class Temporal
 
                $readable_format = str_replace(['Y', 'm', 'd', 'H', 'i'], ['yyyy', 'mm', 'dd', 'HH', 'MM'], $dateformat);
 
-               $tpl = get_markup_template('field_datetime.tpl');
-               $o .= replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('field_datetime.tpl');
+               $o .= Renderer::replaceMacros($tpl, [
                        '$field' => [
                                $id,
                                $label,
index d7774bc51977b1b3091adf4c8d86f4e7026688a9..18e8fb882281aaf90f7c475bde1fa84d0d045fd9 100644 (file)
@@ -39,7 +39,7 @@ text which you don't care for.
 
 Note: The view/lang/en directory contains many HTML template files, some of which
 only have a few words of English text amongst the HTML. Over time we will move
-the translation to the replace_macros() function which calls these files and
+the translation to the Renderer::replaceMacros() function which calls these files and
 then relocate the files to the view directory. The files in the top-level view
 directory are template files which do not require translation.
 
index d8323225d5bf1399d2999e36022786d667f5a46a..430fa7f60c59a679b3551be6534cf6a7beff5288 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 
 function theme_content(App $a)
@@ -66,8 +67,8 @@ function clean_form(App $a, &$colorset, $user)
                $color = Config::get('duepuntozero', 'colorset');
        }
 
-       $t = get_markup_template("theme_settings.tpl");
-       $o = replace_macros($t, [
+       $t = Renderer::getMarkupTemplate("theme_settings.tpl");
+       $o = Renderer::replaceMacros($t, [
                '$submit'   => L10n::t('Submit'),
                '$baseurl'  => System::baseUrl(),
                '$title'    => L10n::t("Theme settings"),
index 588a6fa463468281fd4e51777c5f0be722e64335..015e8090fc7c655dc182590c7e0ef0028988f632 100644 (file)
@@ -3,10 +3,11 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 
 function duepuntozero_init(App $a) {
 
-$a->setActiveTemplateEngine('smarty3');
+Renderer::setActiveTemplateEngine('smarty3');
 
     $colorset = PConfig::get( local_user(), 'duepuntozero','colorset');
     if (!$colorset)
index 8bab362ff92812cf5183b1da737a13aa16c58438..f73ef3ab0a195114158e75704596b51791343bfa 100644 (file)
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 
 require_once 'view/theme/frio/php/Image.php';
@@ -113,7 +114,7 @@ function frio_form($arr)
 
        $background_image_help = '<strong>' . L10n::t('Note') . ': </strong>' . L10n::t('Check image permissions if all users are allowed to see the image');
 
-       $t = get_markup_template('theme_settings.tpl');
+       $t = Renderer::getMarkupTemplate('theme_settings.tpl');
        $ctx = [
                '$submit'           => L10n::t('Submit'),
                '$baseurl'          => System::baseUrl(),
@@ -137,7 +138,7 @@ function frio_form($arr)
                $ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults'), false];
        }
 
-       $o = replace_macros($t, $ctx);
+       $o = Renderer::replaceMacros($t, $ctx);
 
        return $o;
 }
index 8cb4c342959293e754167d61563b932414bdfc59..c7d38baeb970edae0b865533fe8cae449d52e2a3 100644 (file)
@@ -15,6 +15,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model;
@@ -30,7 +31,7 @@ function frio_init(App $a)
        $a->theme_events_in_profile = false;
        $a->videowidth = 622;
 
-       $a->setActiveTemplateEngine('smarty3');
+       Renderer::setActiveTemplateEngine('smarty3');
 
        $baseurl = System::baseUrl();
 
index 562a9ff5f1c67f854c4c5f34ddbced0b5cc67f50..cdef0eeaacfe039d7080fb0658ea9a83bc140b18 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 
 function theme_content(App $a) {
@@ -68,8 +69,8 @@ function quattro_form(App $a, $align, $color, $tfs, $pfs) {
                $pfs = "12";
        }
 
-       $t = get_markup_template("theme_settings.tpl" );
-       $o = replace_macros($t, [
+       $t = Renderer::getMarkupTemplate("theme_settings.tpl" );
+       $o = Renderer::replaceMacros($t, [
                '$submit'  => L10n::t('Submit'),
                '$baseurl' => System::baseUrl(),
                '$title'   => L10n::t("Theme settings"),
index e961146f6a941dd0d7aac1760a01706130641a54..6168932e95242fc20548cc39a6862f08e9f11f03 100644 (file)
  */
 
 use Friendica\App;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 
 function smoothly_init(App $a) {
-       $a->setActiveTemplateEngine('smarty3');
+       Renderer::setActiveTemplateEngine('smarty3');
 
        $cssFile = null;
        $ssl_state = null;
@@ -110,8 +111,8 @@ if (! function_exists('_js_in_foot')) {
                $ssl_state = null;
                $baseurl = System::baseUrl($ssl_state);
                $bottom['$baseurl'] = $baseurl;
-               $tpl = get_markup_template('bottom.tpl');
+               $tpl = Renderer::getMarkupTemplate('bottom.tpl');
 
-               return $a->page['bottom'] = replace_macros($tpl, $bottom);
+               return $a->page['bottom'] = Renderer::replaceMacros($tpl, $bottom);
        }
 }
index 80225eb08dd943c33b7256e89f0d308d66cae8b6..f709356535b48804634ee40db12bb26011cfb21c 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 
 function theme_content(App $a)
@@ -70,8 +71,8 @@ function theme_admin(App $a) {
        if ($helperlist == "")
                $helperlist = "https://forum.friendi.ca/profile/helpers";
 
-       $t = get_markup_template("theme_admin_settings.tpl");
-       $o = replace_macros($t, [
+       $t = Renderer::getMarkupTemplate("theme_admin_settings.tpl");
+       $o = Renderer::replaceMacros($t, [
                '$helperlist' => ['vier_helperlist', L10n::t('Comma separated list of helper forums'), $helperlist, '', ''],
                ]);
 
@@ -114,8 +115,8 @@ function vier_form(App $a, $style, $show_pages, $show_profiles, $show_helpers, $
 
        $show_or_not = ['0' => L10n::t("don't show"), '1' => L10n::t("show"),];
 
-       $t = get_markup_template("theme_settings.tpl");
-       $o = replace_macros($t, [
+       $t = Renderer::getMarkupTemplate("theme_settings.tpl");
+       $o = Renderer::replaceMacros($t, [
                '$submit' => L10n::t('Submit'),
                '$baseurl' => System::baseUrl(),
                '$title' => L10n::t("Theme settings"),
index 887ef1c1298a32e2e5840870ef56a8d4f4e5ecbe..fb4f66431b1bbb6470682edb48261ecca2dd70fa 100644 (file)
@@ -15,6 +15,7 @@ use Friendica\Core\Addon;
 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;
@@ -25,7 +26,7 @@ function vier_init(App $a)
 {
        $a->theme_events_in_profile = false;
 
-       $a->setActiveTemplateEngine('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();
@@ -144,13 +145,13 @@ 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' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_MICRO),
@@ -166,7 +167,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`
@@ -181,7 +182,7 @@ 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->removeBaseURL($rr['thumb']),
@@ -243,9 +244,9 @@ function vier_community_info()
                        }
 
 
-                       $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'),
@@ -288,7 +289,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 = [];
@@ -297,7 +298,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'],
                                ]);
@@ -379,7 +380,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 = [];
@@ -387,7 +388,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'],
@@ -399,6 +400,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);
 }