friendica
/
friendica
mirror of https://github.com/friendica/friendica.git
4
7
Fork 3
Code Issues Releases 15 Wiki Activity
Browse Source

replace macros 

implement new replaceMacros function
pull/6053/head
Adam Magness 4 years ago
parent
f6c86649c2
commit
91facd2d0a
91 changed files with 335 additions and 249 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/Addons.md
  2. 4
      doc/smarty3-templates.md
  3. 13
      include/conversation.php
  4. 7
      include/enotify.php
  5. 5
      include/items.php
  6. 14
      include/text.php
  7. 43
      mod/admin.php
  8. 3
      mod/allfriends.php
  9. 5
      mod/api.php
  10. 3
      mod/apps.php
  11. 3
      mod/babel.php
  12. 7
      mod/cal.php
  13. 5
      mod/common.php
  14. 5
      mod/community.php
  15. 3
      mod/credits.php
  16. 3
      mod/crepair.php
  17. 3
      mod/delegate.php
  18. 5
      mod/dfrn_request.php
  19. 3
      mod/directory.php
  20. 3
      mod/dirfind.php
  21. 3
      mod/display.php
  22. 7
      mod/editpost.php
  23. 7
      mod/events.php
  24. 5
      mod/fbrowser.php
  25. 3
      mod/feedtest.php
  26. 3
      mod/filer.php
  27. 5
      mod/follow.php
  28. 9
      mod/group.php
  29. 3
      mod/help.php
  30. 3
      mod/home.php
  31. 3
      mod/hostxrd.php
  32. 3
      mod/hovercard.php
  33. 3
      mod/invite.php
  34. 5
      mod/lostpass.php
  35. 3
      mod/maintenance.php
  36. 3
      mod/manage.php
  37. 3
      mod/manifest.php
  38. 3
      mod/match.php
  39. 19
      mod/message.php
  40. 11
      mod/network.php
  41. 11
      mod/notifications.php
  42. 5
      mod/notify.php
  43. 3
      mod/oexchange.php
  44. 3
      mod/opensearch.php
  45. 39
      mod/photos.php
  46. 3
      mod/poco.php
  47. 5
      mod/poke.php
  48. 7
      mod/profile_photo.php
  49. 11
      mod/profiles.php
  50. 5
      mod/register.php
  51. 3
      mod/removeme.php
  52. 7
      mod/search.php
  53. 41
      mod/settings.php
  54. 5
      mod/suggest.php
  55. 3
      mod/uexport.php
  56. 3
      mod/uimport.php
  57. 5
      mod/unfollow.php
  58. 9
      mod/videos.php
  59. 3
      mod/viewcontacts.php
  60. 5
      mod/wallmessage.php
  61. 3
      mod/xrd.php
  62. 10
      src/App.php
  63. 3
      src/Content/ForumManager.php
  64. 3
      src/Content/Nav.php
  65. 3
      src/Content/OEmbed.php
  66. 5
      src/Content/Pager.php
  67. 3
      src/Content/Text/BBCode.php
  68. 13
      src/Content/Widget.php
  69. 3
      src/Content/Widget/CalendarExport.php
  70. 3
      src/Content/Widget/TagCloud.php
  71. 3
      src/Core/ACL.php
  72. 5
      src/Core/Installer.php
  73. 1
      src/Core/Renderer.php
  74. 3
      src/Core/System.php
  75. 3
      src/Model/Event.php
  76. 5
      src/Model/Group.php
  77. 15
      src/Model/Profile.php
  78. 19
      src/Module/Contact.php
  79. 9
      src/Module/Install.php
  80. 3
      src/Module/Itemsource.php
  81. 5
      src/Module/Login.php
  82. 3
      src/Module/Tos.php
  83. 3
      src/Object/Post.php
  84. 7
      src/Util/Temporal.php
  85. 2
      util/README
  86. 3
      view/theme/duepuntozero/config.php
  87. 3
      view/theme/frio/config.php
  88. 3
      view/theme/quattro/config.php
  89. 3
      view/theme/smoothly/theme.php
  90. 5
      view/theme/vier/config.php
  91. 13
      view/theme/vier/theme.php

2
doc/Addons.md
Unescape View File

@ -164,7 +164,7 @@ $tpl = get_markup_template('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',
));
```

4
doc/smarty3-templates.md
Unescape View 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( ... ));
$o .= Renderer::replaceMacros($tpl, array( ... ));
the array consists of an association of an identifier and the value for that identifier, i.e.

13
include/conversation.php
Unescape View 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;
@ -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(get_markup_template('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(get_markup_template('jot_geotag.tpl'), []) : '';
$tpl = get_markup_template('jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($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 = Renderer::replaceMacros($tpl,array('$jotplugins' => $jotplugins));
$tpl = get_markup_template("jot.tpl");
$o .= replace_macros($tpl,[
$o .= Renderer::replaceMacros($tpl,[
'$new_post' => L10n::t('New Post'),
'$return_path' => $query_str,
'$action' => 'item',

7
include/enotify.php
Unescape View 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];
@ -590,7 +591,7 @@ function notification($params)
// load the template for private message notifications
$tpl = get_markup_template('email_notify_html.tpl');
$email_html_body = replace_macros($tpl, [
$email_html_body = Renderer::replaceMacros($tpl, [
'$banner' => $datarray['banner'],
'$product' => $datarray['product'],
'$preamble' => str_replace("\n", "<br>\n", $datarray['preamble']),
@ -611,7 +612,7 @@ function notification($params)
// load the template for private message notifications
$tpl = get_markup_template('email_notify_text.tpl');
$email_text_body = replace_macros($tpl, [
$email_text_body = Renderer::replaceMacros($tpl, [
'$banner' => $datarray['banner'],
'$product' => $datarray['product'],
'$preamble' => $datarray['preamble'],

5
include/items.php
Unescape View 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(get_markup_template('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(get_markup_template('posted_date_widget.tpl'),[
'$title' => L10n::t('Archives'),
'$size' => $visible_years,
'$cutoff_year' => $cutoff_year,

14
include/text.php
Unescape View File

@ -267,7 +267,7 @@ function unxmlify($s) {
*/
function scroll_loader() {
$tpl = get_markup_template("scroll_loader.tpl");
return replace_macros($tpl, [
return Renderer::replaceMacros($tpl, [
'wait' => L10n::t('Loading more entries...'),
'end' => L10n::t('The end')
]);
@ -514,7 +514,7 @@ function contact_block() {
}
$tpl = get_markup_template('contact_block.tpl');
$o = replace_macros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$contacts' => $contacts,
'$nickname' => $a->profile['nickname'],
'$viewcontacts' => L10n::t('View Contacts'),
@ -571,7 +571,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(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),[
'$click' => defaults($contact, 'click', ''),
'$class' => $class,
'$url' => $url,
@ -626,7 +626,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
}
}
return replace_macros(get_markup_template('searchbox.tpl'), $values);
return Renderer::replaceMacros(get_markup_template('searchbox.tpl'), $values);
}
/**
@ -904,14 +904,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(get_markup_template('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(get_markup_template('video_top.tpl'), [
'$video' => [
'id' => $id,
'title' => L10n::t('View Video'),
@ -1007,7 +1007,7 @@ function apply_content_filter($html, array $reasons)
{
if (count($reasons)) {
$tpl = get_markup_template('wall/content_filter.tpl');
$html = replace_macros($tpl, [
$html = Renderer::replaceMacros($tpl, [
'$reasons' => $reasons,
'$rnd' => random_string(8),
'$openclose' => L10n::t('Click to open/close'),

43
mod/admin.php
Unescape View 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\Worker;
@ -174,7 +175,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(get_markup_template('admin/settings_head.tpl'), []);
/*
* Side bar links
@ -226,7 +227,7 @@ function admin_content(App $a)
}
$t = get_markup_template('admin/aside.tpl');
$a->page['aside'] .= replace_macros($t, [
$a->page['aside'] .= Renderer::replaceMacros($t, [
'$admin' => $aside_tools,
'$subpages' => $aside_sub,
'$admtxt' => L10n::t('Admin'),
@ -314,7 +315,7 @@ function admin_page_tos(App $a)
{
$tos = new Tos();
$t = get_markup_template('admin/tos.tpl');
return replace_macros($t, [
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,7 +377,7 @@ function admin_page_blocklist(App $a)
}
}
$t = get_markup_template('admin/blocklist.tpl');
return replace_macros($t, [
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,7 +492,7 @@ function admin_page_contactblock(App $a)
$contacts = DBA::toArray($statement);
$t = get_markup_template('admin/contactblock.tpl');
$o = replace_macros($t, [
$o = Renderer::replaceMacros($t, [
// strings //
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Remote Contact Blocklist'),
@ -534,7 +535,7 @@ function admin_page_deleteitem(App $a)
{
$t = get_markup_template('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,7 +727,7 @@ function admin_page_federation(App $a)
// load the template, replace the macros and return the page content
$t = get_markup_template('admin/federation.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Federation Statistics'),
'$intro' => $intro,
@ -769,7 +770,7 @@ function admin_page_queue(App $a)
DBA::close($entries);
$t = get_markup_template('admin/queue.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Inspect Queue'),
'$count' => count($r),
@ -820,7 +821,7 @@ function admin_page_workerqueue(App $a, $deferred)
DBA::close($entries);
$t = get_markup_template('admin/workerqueue.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => $sub_title,
'$count' => count($r),
@ -938,7 +939,7 @@ function admin_page_summary(App $a)
'mysql' => ['max_allowed_packet' => $max_allowed_packet]];
$t = get_markup_template('admin/summary.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Summary'),
'$queues' => $queues,
@ -1449,7 +1450,7 @@ function admin_page_site(App $a)
}
$t = get_markup_template('admin/site.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Site'),
'$submit' => L10n::t('Save Settings'),
@ -1642,13 +1643,13 @@ function admin_page_dbsync(App $a)
}
if (!count($failed)) {
$o = replace_macros(get_markup_template('structure_check.tpl'), [
$o = Renderer::replaceMacros(get_markup_template('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(get_markup_template('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.'),
@ -1910,7 +1911,7 @@ 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, [
$o = Renderer::replaceMacros($t, [
// strings //
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Users'),
@ -2027,7 +2028,7 @@ function admin_page_addons(App $a, array $addons_admin)
$t = get_markup_template('admin/addon_details.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Addons'),
'$toggle' => L10n::t('Toggle'),
@ -2087,7 +2088,7 @@ function admin_page_addons(App $a, array $addons_admin)
}
$t = get_markup_template('admin/addons.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Addons'),
'$submit' => L10n::t('Save Settings'),
@ -2297,7 +2298,7 @@ function admin_page_themes(App $a)
}
$t = get_markup_template('admin/addon_details.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Themes'),
'$toggle' => L10n::t('Toggle'),
@ -2341,7 +2342,7 @@ function admin_page_themes(App $a)
}
$t = get_markup_template('admin/addons.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Themes'),
'$submit' => L10n::t('Save Settings'),
@ -2416,7 +2417,7 @@ function admin_page_logs(App $a)
$t = get_markup_template('admin/logs.tpl');
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Logs'),
'$submit' => L10n::t('Save Settings'),
@ -2483,7 +2484,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,
@ -2562,7 +2563,7 @@ function admin_page_features(App $a)
}
$tpl = get_markup_template('admin/settings_features.tpl');
$o = replace_macros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$form_security_token' => BaseModule::getFormSecurityToken("admin_manage_features"),
'$title' => L10n::t('Manage Additional Features'),
'$features' => $arr,

3
mod/allfriends.php
Unescape View 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;
@ -100,7 +101,7 @@ function allfriends_content(App $a)
$tpl = get_markup_template('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,

5
mod/api.php
Unescape View 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;
@ -82,7 +83,7 @@ function api_content(App $a)
}
$tpl = get_markup_template("oauth_authorize_done.tpl");
$o = replace_macros($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,
@ -104,7 +105,7 @@ function api_content(App $a)
}
$tpl = get_markup_template('oauth_authorize.tpl');
$o = replace_macros($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?'),

3
mod/apps.php
Unescape View File

@ -5,6 +5,7 @@
use Friendica\Content\Nav;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
function apps_content()
{
@ -25,7 +26,7 @@ function apps_content()
}
$tpl = get_markup_template('apps.tpl');
return replace_macros($tpl, [
return Renderer::replaceMacros($tpl, [
'$title' => $title,
'$apps' => $apps,
]);

3
mod/babel.php
Unescape View File

@ -5,6 +5,7 @@
use Friendica\Content\Text;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
function visible_whitespace($s)
{
@ -140,7 +141,7 @@ function babel_content()
}
$tpl = get_markup_template('babel.tpl');
$o = replace_macros($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'],

7
mod/cal.php
Unescape View 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;
@ -61,7 +62,7 @@ function cal_init(App $a)
$tpl = get_markup_template("vcard-widget.tpl");
$vcard_widget = replace_macros($tpl, [
$vcard_widget = Renderer::replaceMacros($tpl, [
'$name' => $profile['name'],
'$photo' => $profile['photo'],
'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
@ -89,7 +90,7 @@ function cal_content(App $a)
$i18n = Event::getStrings();
$htpl = get_markup_template('event_head.tpl');
$a->page['htmlhead'] .= replace_macros($htpl, [
$a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
'$baseurl' => System::baseUrl(),
'$module_url' => '/cal/' . $a->data['user']['nickname'],
'$modparams' => 2,
@ -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'),

5
mod/common.php
Unescape View 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(get_markup_template("vcard-widget.tpl"), [
'$name' => htmlentities($contact['name']),
'$photo' => $contact['photo'],
'url' => 'contact/' . $cid
@ -144,7 +145,7 @@ function common_content(App $a)
$tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros($tpl, [
$o .= Renderer::replaceMacros($tpl, [
'$title' => $title,
'$tab_str' => $tab_str,
'$contacts' => $entries,

5
mod/community.php
Unescape View 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;
@ -120,7 +121,7 @@ function community_content(App $a, $update = 0)
}
$tab_tpl = get_markup_template('common_tabs.tpl');
$o .= replace_macros($tab_tpl, ['$tabs' => $tabs]);
$o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
Nav::setSelected('community');
@ -199,7 +200,7 @@ function community_content(App $a, $update = 0)
}
$t = get_markup_template("community.tpl");
return replace_macros($t, [
return Renderer::replaceMacros($t, [
'$content' => $o,
'$header' => '',
'$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'),

3
mod/credits.php
Unescape View File

@ -7,6 +7,7 @@
*/
use Friendica\App;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
function credits_content()
{
@ -14,7 +15,7 @@ function credits_content()
$credits_string = file_get_contents('util/credits.txt');
$names = explode("\n", htmlspecialchars($credits_string));
$tpl = get_markup_template('credits.tpl');
return replace_macros($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,

3
mod/crepair.php
Unescape View 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;
@ -137,7 +138,7 @@ function crepair_content(App $a)
$tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
$tpl = get_markup_template('crepair.tpl');
$o = replace_macros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$tab_str' => $tab_str,
'$warning' => $warning,
'$info' => $info,

3
mod/delegate.php
Unescape View 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(get_markup_template('delegate.tpl'), [
'$form_security_token' => BaseModule::getFormSecurityToken('delegate'),
'$parent_header' => L10n::t('Parent User'),
'$parent_user' => $parent_user,

5
mod/dfrn_request.php
Unescape View 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;
@ -515,7 +516,7 @@ function dfrn_request_content(App $a)
}
$tpl = get_markup_template("dfrn_req_confirm.tpl");
$o = replace_macros($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'),
@ -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:'),

3
mod/directory.php
Unescape View 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;
@ -203,7 +204,7 @@ function directory_content(App $a)
$tpl = get_markup_template('directory_header.tpl');
$o .= replace_macros($tpl, [
$o .= Renderer::replaceMacros($tpl, [
'$search' => $search,
'$globaldir' => L10n::t('Global Directory'),
'$gdirpath' => $gdirpath,

3
mod/dirfind.php
Unescape View 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;
@ -250,7 +251,7 @@ function dirfind_content(App $a, $prefix = "") {
}
$tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros($tpl,[
$o .= Renderer::replaceMacros($tpl,[
'title' => $header,
'$contacts' => $entries,
'$paginate' => $pager->renderFull($j->total),

3
mod/display.php
Unescape View 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(get_markup_template('display-head.tpl'),
['$alternate' => $alternate,
'$conversation' => $conversation]);

7
mod/editpost.php
Unescape View 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,12 +41,12 @@ function editpost_content(App $a)
$geotag = '';
$o .= replace_macros(get_markup_template("section_title.tpl"), [
$o .= Renderer::replaceMacros(get_markup_template("section_title.tpl"), [
'$title' => L10n::t('Edit post')
]);
$tpl = get_markup_template('jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, [
$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(),
'$ispublic' => '&nbsp;', // L10n::t('Visible to <strong>everybody</strong>'),
'$geotag' => $geotag,
@ -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',

7
mod/events.php
Unescape View 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;
@ -226,7 +227,7 @@ function events_content(App $a)
$i18n = Event::getStrings();
$htpl = get_markup_template('event_head.tpl');
$a->page['htmlhead'] .= replace_macros($htpl, [
$a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
'$baseurl' => System::baseUrl(),
'$module_url' => '/events',
'$modparams' => 1,
@ -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'),
@ -499,7 +500,7 @@ function events_content(App $a)
$tpl = get_markup_template('event_form.tpl');
$o .= replace_macros($tpl, [
$o .= Renderer::replaceMacros($tpl, [
'$post' => System::baseUrl() . '/events',
'$eid' => $eid,
'$cid' => $cid,

5
mod/fbrowser.php
Unescape View 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;
@ -95,7 +96,7 @@ function fbrowser_content(App $a)
$tpl = get_markup_template($template_file);
$o = replace_macros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$type' => 'image',
'$baseurl' => System::baseUrl(),
'$path' => $path,
@ -126,7 +127,7 @@ function fbrowser_content(App $a)
$tpl = get_markup_template($template_file);
$o = replace_macros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$type' => 'file',
'$baseurl' => System::baseUrl(),
'$path' => [ [ "", L10n::t("Files")] ],

3
mod/feedtest.php
Unescape View 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;
@ -44,7 +45,7 @@ function feedtest_content(App $a)
}
$tpl = get_markup_template('feedtest.tpl');
$o = replace_macros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$url' => ['url', L10n::t('Source URL'), defaults($_REQUEST, 'url', ''), ''],
'$result' => $result
]);

3
mod/filer.php
Unescape View 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';
@ -31,7 +32,7 @@ function filer_content(App $a)
$filetags = explode(",", $filetags);
$tpl = get_markup_template("filer_dialog.tpl");
$o = replace_macros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$field' => ['term', L10n::t("Save to Folder:"), '', '', $filetags, L10n::t('- select -')],
'$submit' => L10n::t('Save'),
]);

5
mod/follow.php
Unescape View 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;
@ -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(get_markup_template('section_title.tpl'),
['$title' => L10n::t('Status Messages and Posts')]
);

9
mod/group.php
Unescape View 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;
@ -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',
@ -215,7 +216,7 @@ function group_content(App $a) {
}
$drop_tpl = get_markup_template('group_drop.tpl');
$drop_txt = replace_macros($drop_tpl, [
$drop_txt = Renderer::replaceMacros($drop_tpl, [
'$id' => $group['id'],
'$delete' => L10n::t('Delete Group'),
'$form_security_token' => BaseModule::getFormSecurityToken("group_drop"),
@ -307,10 +308,10 @@ function group_content(App $a) {
if ($change) {
$tpl = get_markup_template('groupeditor.tpl');
echo replace_macros($tpl, $context);
echo Renderer::replaceMacros($tpl, $context);
killme();
}
return replace_macros($tpl, $context);
return Renderer::replaceMacros($tpl, $context);
}

3
mod/help.php
Unescape View 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)
@ -61,7 +62,7 @@ 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, [
return Renderer::replaceMacros($tpl, [
'$message' => L10n::t('Page not found.')
]);
}

3
mod/home.php
Unescape View 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;
@ -54,7 +55,7 @@ function home_content(App $a) {
$tpl = get_markup_template('home.tpl');
return replace_macros($tpl, [
return Renderer::replaceMacros($tpl, [
'$defaultheader' => $defaultheader,
'$customhome' => $customhome,
'$login' => $login,

3
mod/hostxrd.php
Unescape View 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;
@ -22,7 +23,7 @@ function hostxrd_init(App $a)
}
$tpl = get_markup_template('xrd_host.tpl');
echo replace_macros($tpl, [
echo Renderer::replaceMacros($tpl, [
'$zhost' => $a->getHostName(),
'$zroot' => System::baseUrl(),
'$domain' => System::baseUrl(),

3
mod/hovercard.php
Unescape View 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;
@ -111,7 +112,7 @@ function hovercard_content()
];
if ($datatype == 'html') {
$tpl = get_markup_template('hovercard.tpl');
$o = replace_macros($tpl, [
$o = Renderer::replaceMacros($tpl, [
'$profile' => $profile,
]);

3
mod/invite.php
Unescape View 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;
@ -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:')],

5
mod/lostpass.php
Unescape View 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;
@ -116,7 +117,7 @@ function lostpass_content(App $a)
function lostpass_form()
{
$tpl = get_markup_template('lostpass.tpl');
$o = replace_macros($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: '),
@ -135,7 +136,7 @@ function lostpass_generate_password($user)
$result = User::updatePassword($user['uid'], $new_password);
if (DBA::isResult($result)) {
$tpl = get_markup_template('pwdreset.tpl');
$o .= replace_macros($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'),

3
mod/maintenance.php
Unescape View 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(get_markup_template('maintenance.tpl'), [
'$sysdown' => L10n::t('System down for maintenance'),
'$reason' => $reason
]);

3
mod/manage.php
Unescape View 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(get_markup_template('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: '),

3
mod/manifest.php
Unescape View File

@ -3,6 +3,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\Renderer;
function manifest_content(App $a) {
@ -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'),

3
mod/match.php
Unescape View 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;
@ -114,7 +115,7 @@ function match_content(App $a)
$tpl = get_markup_template('viewcontact_template.tpl');
$o .= replace_macros($tpl, [
$o .= Renderer::replaceMacros($tpl, [
'$title' => L10n::t('Profile Match'),
'$contacts' => $entries,
'$paginate' => $pager->renderFull($j->total)

19
mod/message.php
Unescape View 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;
@ -37,14 +38,14 @@ function message_init(App $a)
];
$tpl = get_markup_template('message_side.tpl');
$a->page['aside'] = replace_macros($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, [
$a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
'$baseurl' => System::baseUrl(true),
'$base' => $base
]);
@ -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'] =