Remove duplicated '$baseurl' template variable declarations

- This variable is declared for all templates in Renderer
This commit is contained in:
Hypolite Petovan 2024-03-24 09:11:46 -04:00
parent d824bb536f
commit b4d71f1855
8 changed files with 0 additions and 12 deletions

View file

@ -332,7 +332,6 @@ class Conversation
$tpl = Renderer::getMarkupTemplate('jot-header.tpl'); $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
$this->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ $this->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$newpost' => 'true', '$newpost' => 'true',
'$baseurl' => $this->baseURL,
'$geotag' => $geotag, '$geotag' => $geotag,
'$nickname' => $x['nickname'], '$nickname' => $x['nickname'],
'$ispublic' => $this->l10n->t('Visible to <strong>everybody</strong>'), '$ispublic' => $this->l10n->t('Visible to <strong>everybody</strong>'),
@ -405,7 +404,6 @@ class Conversation
'$posttype' => $notes_cid ? ItemModel::PT_PERSONAL_NOTE : ItemModel::PT_ARTICLE, '$posttype' => $notes_cid ? ItemModel::PT_PERSONAL_NOTE : ItemModel::PT_ARTICLE,
'$content' => $x['content'] ?? '', '$content' => $x['content'] ?? '',
'$post_id' => $x['post_id'] ?? '', '$post_id' => $x['post_id'] ?? '',
'$baseurl' => $this->baseURL,
'$defloc' => $x['default_location'], '$defloc' => $x['default_location'],
'$visitor' => $x['visitor'], '$visitor' => $x['visitor'],
'$pvisit' => $notes_cid ? 'none' : $x['visitor'], '$pvisit' => $notes_cid ? 'none' : $x['visitor'],
@ -591,7 +589,6 @@ class Conversation
} }
$o = Renderer::replaceMacros($page_template, [ $o = Renderer::replaceMacros($page_template, [
'$baseurl' => $this->baseURL,
'$return_path' => $this->args->getQueryString(), '$return_path' => $this->args->getQueryString(),
'$live_update' => $live_update_div, '$live_update' => $live_update_div,
'$remove' => $this->l10n->t('remove'), '$remove' => $this->l10n->t('remove'),

View file

@ -124,8 +124,6 @@ class Contact extends BaseModeration
'$form_security_token' => self::getFormSecurityToken('moderation_contactblock'), '$form_security_token' => self::getFormSecurityToken('moderation_contactblock'),
// values // // values //
'$baseurl' => $this->baseUrl,
'$contacts' => $contacts, '$contacts' => $contacts,
'$total_contacts' => $this->tt('%s total blocked contact', '%s total blocked contacts', $total), '$total_contacts' => $this->tt('%s total blocked contact', '%s total blocked contacts', $total),
'$paginate' => $pager->renderFull($total), '$paginate' => $pager->renderFull($total),

View file

@ -138,7 +138,6 @@ class Add extends BaseModeration
'$newreason' => ['reason', $this->t('Block reason'), $request['reason'] ?? '', $this->t('The reason why you blocked this server domain pattern. This reason will be shown publicly in the server information page.'), $this->t('Required'), '', ''], '$newreason' => ['reason', $this->t('Block reason'), $request['reason'] ?? '', $this->t('The reason why you blocked this server domain pattern. This reason will be shown publicly in the server information page.'), $this->t('Required'), '', ''],
'$pattern' => $pattern, '$pattern' => $pattern,
'$gservers' => $gservers, '$gservers' => $gservers,
'$baseurl' => $this->baseUrl,
'$form_security_token' => self::getFormSecurityToken('moderation_blocklist_add') '$form_security_token' => self::getFormSecurityToken('moderation_blocklist_add')
]); ]);
} }

View file

@ -130,7 +130,6 @@ class Import extends \Friendica\Module\BaseModeration
'$mode_append' => ['mode', $this->t('Append'), 'append', $this->t('Imports patterns from the file that weren\'t already existing in the current blocklist.'), 'checked="checked"'], '$mode_append' => ['mode', $this->t('Append'), 'append', $this->t('Imports patterns from the file that weren\'t already existing in the current blocklist.'), 'checked="checked"'],
'$mode_replace' => ['mode', $this->t('Replace'), 'replace', $this->t('Replaces the current blocklist by the imported patterns.')], '$mode_replace' => ['mode', $this->t('Replace'), 'replace', $this->t('Replaces the current blocklist by the imported patterns.')],
'$blocklist' => $this->blocklist, '$blocklist' => $this->blocklist,
'$baseurl' => $this->baseUrl,
'$form_security_token' => self::getFormSecurityToken('moderation_blocklist_import') '$form_security_token' => self::getFormSecurityToken('moderation_blocklist_import')
]); ]);
} }

View file

@ -115,7 +115,6 @@ class Index extends BaseModeration
'$listfile' => ['listfile', $this->t('Server domain pattern blocklist CSV file'), '', '', $this->t('Required'), '', 'file'], '$listfile' => ['listfile', $this->t('Server domain pattern blocklist CSV file'), '', '', $this->t('Required'), '', 'file'],
'$newdomain' => ['pattern', $this->t('Server Domain Pattern'), '', $this->t('The domain pattern of the new server to add to the blocklist. Do not include the protocol.'), $this->t('Required'), '', ''], '$newdomain' => ['pattern', $this->t('Server Domain Pattern'), '', $this->t('The domain pattern of the new server to add to the blocklist. Do not include the protocol.'), $this->t('Required'), '', ''],
'$entries' => $blocklistform, '$entries' => $blocklistform,
'$baseurl' => $this->baseUrl,
'$form_security_token' => self::getFormSecurityToken('moderation_blocklist'), '$form_security_token' => self::getFormSecurityToken('moderation_blocklist'),
'$form_security_token_import' => self::getFormSecurityToken('moderation_blocklist_import'), '$form_security_token_import' => self::getFormSecurityToken('moderation_blocklist_import'),

View file

@ -95,8 +95,6 @@ class Reports extends BaseModeration
'$th_reports' => [$this->t('Created'), $this->t('Photo'), $this->t('Name'), $this->t('Comment'), $this->t('Category')], '$th_reports' => [$this->t('Created'), $this->t('Photo'), $this->t('Name'), $this->t('Comment'), $this->t('Category')],
// values // // values //
'$baseurl' => $this->baseUrl,
'$reports' => $reports, '$reports' => $reports,
'$total_reports' => $this->tt('%s total report', '%s total reports', $total), '$total_reports' => $this->tt('%s total report', '%s total reports', $total),
'$paginate' => $pager->renderFull($total), '$paginate' => $pager->renderFull($total),

View file

@ -150,7 +150,6 @@ class Active extends BaseUsers
'$form_security_token' => self::getFormSecurityToken('moderation_users_active'), '$form_security_token' => self::getFormSecurityToken('moderation_users_active'),
// values // // values //
'$baseurl' => $this->baseUrl,
'$query_string' => $this->args->getQueryString(), '$query_string' => $this->args->getQueryString(),
'$users' => $users, '$users' => $users,

View file

@ -228,7 +228,6 @@ class Channels extends BaseSettings
'confirm_delete' => $this->t('Delete entry from the channel list?'), 'confirm_delete' => $this->t('Delete entry from the channel list?'),
], ],
'$entries' => $channels, '$entries' => $channels,
'$baseurl' => $this->baseUrl,
'$form_security_token' => self::getFormSecurityToken('settings_channels'), '$form_security_token' => self::getFormSecurityToken('settings_channels'),
]); ]);