Remove unused App->page['end']

- Remove unused empty templates

diff --git a/include/conversation.php b/include/conversation.php
index ca01997f6aa17df4db0d4966d56f037f20bef1f2..d791fa41419fec39bd8b1659379ce06577fe0ef5 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1091,21 +1091,6 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
                '$delitems'  => L10n::t("Delete item\x28s\x29?")
        ]);
 
-       $tpl = get_markup_template('jot-end.tpl');
-       $a->page['end'] .= replace_macros($tpl, [
-               '$newpost'   => 'true',
-               '$baseurl'   => System::baseUrl(true),
-               '$geotag'    => $geotag,
-               '$nickname'  => $x['nickname'],
-               '$ispublic'  => L10n::t('Visible to <strong>everybody</strong>'),
-               '$linkurl'   => L10n::t('Please enter a link URL:'),
-               '$vidurl'    => L10n::t("Please enter a video link/URL:"),
-               '$audurl'    => L10n::t("Please enter an audio link/URL:"),
-               '$term'      => L10n::t('Tag term:'),
-               '$fileas'    => L10n::t('Save to Folder:'),
-               '$whereareu' => L10n::t('Where are you right now?')
-       ]);
-
        $jotplugins = '';
        Addon::callHooks('jot_tool', $jotplugins);
 

diff --git a/include/text.php b/include/text.php
index d251824e2ba6197c61e29dd20dde382a3fd275b5..53b806122148b686670a5888f41fb01a434d709b 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1191,9 +1191,6 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
                                $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), [
                                        '$baseurl' => System::baseUrl(),
                                ]);
-                               $a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), [
-                                       '$baseurl' => System::baseUrl(),
-                               ]);
                        }
 
                        $url_parts = explode('/', $the_url);

diff --git a/mod/cal.php b/mod/cal.php
index bdedaaacfa8afb99d1d3b3d1952728eafa3cec18..ae1060c47ad5d36a1a76e774857ffd6c4f25e939 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -94,11 +94,6 @@ function cal_content(App $a)
                '$i18n' => $i18n,
        ]);
 
-       $etpl = get_markup_template('event_end.tpl');
-       $a->page['end'] .= replace_macros($etpl, [
-               '$baseurl' => System::baseUrl(),
-       ]);
-
        $mode = 'view';
        $y = 0;
        $m = 0;

diff --git a/mod/contacts.php b/mod/contacts.php
index 4e8769717212eaa81dc03b2151803ac09f7ce017..86d7e2ac659e01d639cb8d9feb3ac644ad832381 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -112,12 +112,6 @@ function contacts_init(App $a)
                '$baseurl' => System::baseUrl(true),
                '$base' => $base
        ]);
-
-       $tpl = get_markup_template("contacts-end.tpl");
-       $a->page['end'] .= replace_macros($tpl, [
-               '$baseurl' => System::baseUrl(true),
-               '$base' => $base
-       ]);
 }
 
 function contacts_batch_actions(App $a)
@@ -503,9 +497,6 @@ function contacts_content(App $a, $update = 0)
                $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), [
                        '$baseurl' => System::baseUrl(true),
                ]);
-               $a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), [
-                       '$baseurl' => System::baseUrl(true),
-               ]);
 
                $contact['blocked'] = Contact::isBlockedByUser($contact['id'], local_user());
                $contact['readonly'] = Contact::isIgnoredByUser($contact['id'], local_user());

diff --git a/mod/editpost.php b/mod/editpost.php
index 258585ef1c3b95cba2e9e1914bcde84014e19100..b8ccff470e5fd2fd7dc1873899bcaca4e1d25acb 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -51,15 +51,6 @@ function editpost_content(App $a)
                '$nickname' => $a->user['nickname']
        ]);
 
-       $tpl = get_markup_template('jot-end.tpl');
-       $a->page['end'] .= replace_macros($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");
 
        if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {

diff --git a/mod/events.php b/mod/events.php
index 91474022fcdc6277d9afa99e7f0438e9abd6333f..fd658a9cef1c08c8bdf75895b5a07d456a9ed3c3 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -229,11 +229,6 @@ function events_content(App $a) {
                '$i18n' => $i18n,
        ]);
 
-       $etpl = get_markup_template('event_end.tpl');
-       $a->page['end'] .= replace_macros($etpl, [
-               '$baseurl' => System::baseUrl(),
-       ]);
-
        $o = '';
        $tabs = '';
        // tabs

diff --git a/mod/message.php b/mod/message.php
index 8c9aa657dfb4a54385c341a9c8034288e35e383d..23d528a8aa32d984d032e2840b5ba0dd6144d399 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -46,12 +46,6 @@ function message_init(App $a)
                '$baseurl' => System::baseUrl(true),
                '$base' => $base
        ]);
-
-       $end_tpl = get_markup_template('message-end.tpl');
-       $a->page['end'] .= replace_macros($end_tpl, [
-               '$baseurl' => System::baseUrl(true),
-               '$base' => $base
-       ]);
 }
 
 function message_post(App $a)
@@ -199,13 +193,6 @@ function message_content(App $a)
                        '$linkurl' => L10n::t('Please enter a link URL:')
                ]);
 
-               $tpl = get_markup_template('msg-end.tpl');
-               $a->page['end'] .= replace_macros($tpl, [
-                       '$baseurl' => System::baseUrl(true),
-                       '$nickname' => $a->user['nickname'],
-                       '$linkurl' => L10n::t('Please enter a link URL:')
-               ]);
-
                $preselect = isset($a->argv[2]) ? [$a->argv[2]] : [];
 
                $prename = $preurl = $preid = '';
@@ -344,13 +331,6 @@ function message_content(App $a)
                        '$linkurl' => L10n::t('Please enter a link URL:')
                ]);
 
-               $tpl = get_markup_template('msg-end.tpl');
-               $a->page['end'] .= replace_macros($tpl, [
-                       '$baseurl' => System::baseUrl(true),
-                       '$nickname' => $a->user['nickname'],
-                       '$linkurl' => L10n::t('Please enter a link URL:')
-               ]);
-
                $mails = [];
                $seen = 0;
                $unknown = false;

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 567a7f3a2512b3e05c79edb68a57546637a47f76..984ebfed6f39fc27bfa6bc157d903e5be905953a 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -317,7 +317,6 @@ function profile_photo_crop_ui_head(App $a, Image $image)
        }
 
        $a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
-       $a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), []);
 
        $imagecrop = [
                'hash'       => $hash,

diff --git a/mod/profiles.php b/mod/profiles.php
index d951a470d7605db79ea8f97af1eeba3278b39c0e..76491c553edf8cb3c7e3f0b481488aaad4907b2a 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -527,9 +527,6 @@ function profiles_content(App $a) {
                $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), [
                        '$baseurl' => System::baseUrl(true),
                ]);
-               $a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), [
-                       '$baseurl' => System::baseUrl(true),
-               ]);
 
                $opt_tpl = get_markup_template("profile-hide-friends.tpl");
                $hide_friends = replace_macros($opt_tpl,[

diff --git a/mod/settings.php b/mod/settings.php
index 84bc230e30ec23c0c943d4d3af8e27ff1d727845..78fa446ce0372dd0fa65a419db4286e79fd1848b 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -982,11 +982,6 @@ function settings_content(App $a)
                        '$theme_config' => $theme_config,
                ]);
 
-               $tpl = get_markup_template('settings/display_end.tpl');
-               $a->page['end'] .= replace_macros($tpl, [
-                       '$theme'        => ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes]
-               ]);
-
                return $o;
        }
 

diff --git a/mod/videos.php b/mod/videos.php
index e622e17f0f33cac9258352808e2cd520f8794590..4bd0ab4f3262431f6f7b0fee5f347a1247ba226e 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -105,12 +105,6 @@ function videos_init(App $a)
                $a->page['htmlhead'] .= replace_macros($tpl,[
                        '$baseurl' => System::baseUrl(),
                ]);
-
-               $tpl = get_markup_template("videos_end.tpl");
-               $a->page['end'] .= replace_macros($tpl,[
-                       '$baseurl' => System::baseUrl(),
-               ]);
-
        }
 
        return;

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 5606b6feede6a6ed35c26f5512ae5cf7cb403303..5e08420ecb109f6cd16767574f51815982038c9e 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -120,13 +120,6 @@ function wallmessage_content(App $a) {
                '$linkurl' => L10n::t('Please enter a link URL:')
        ]);
 
-       $tpl = get_markup_template('wallmsg-end.tpl');
-       $a->page['end'] .= replace_macros($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, [
                '$header' => L10n::t('Send Private Message'),

diff --git a/src/App.php b/src/App.php
index 1a26dd6507793ec86a3ffde15e4f1b6c69533078..26bc7362f1ba9bf8551990c074577165ff021f7f 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -318,7 +318,6 @@ class App
                        'aside' => '',
                        'bottom' => '',
                        'content' => '',
-                       'end' => '',
                        'footer' => '',
                        'htmlhead' => '',
                        'nav' => '',

diff --git a/view/templates/contact_end.tpl b/view/templates/contact_end.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/contact_end.tpl
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/view/templates/contacts-end.tpl b/view/templates/contacts-end.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/contacts-end.tpl
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/view/templates/cropend.tpl b/view/templates/cropend.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/cropend.tpl
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/view/templates/end.tpl b/view/templates/end.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/end.tpl
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/view/templates/event_end.tpl b/view/templates/event_end.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/event_end.tpl
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/view/templates/jot-end.tpl b/view/templates/jot-end.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/jot-end.tpl
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/view/templates/message-end.tpl b/view/templates/message-end.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/message-end.tpl
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/view/templates/msg-end.tpl b/view/templates/msg-end.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/msg-end.tpl
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/view/templates/profed_end.tpl b/view/templates/profed_end.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/profed_end.tpl
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/view/templates/videos_end.tpl b/view/templates/videos_end.tpl
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/view/templates/wallmsg-end.tpl b/view/templates/wallmsg-end.tpl
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/view/templates/wallmsg-end.tpl
+++ /dev/null
@@ -1 +0,0 @@
-