keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3971 from annando/no_template_escape

Browse source 
The function "template_escape" doesn't exist anymore.
This commit is contained in:
Tobias Diekershoff 2017-11-27 07:49:55 +01:00 committed by GitHub
commit a2f1414a80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
include/conversation.php
View file

@ -780,25 +780,14 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
list($categories, $folders) = get_cats_and_terms($item);
if ($a->theme['template_engine'] === 'internal') {
$profile_name_e = template_escape($profile_name);
$item['title_e'] = template_escape($item['title']);
$body_e = template_escape($body);
$tags_e = template_escape($tags);
$hashtags_e = template_escape($hashtags);
$mentions_e = template_escape($mentions);
$location_e = template_escape($location);
$owner_name_e = template_escape($owner_name);
} else {
$profile_name_e = $profile_name;
$item['title_e'] = $item['title'];
$body_e = $body;
$tags_e = $tags;
$hashtags_e = $hashtags;
$mentions_e = $mentions;
$location_e = $location;
$owner_name_e = $owner_name;
}
$profile_name_e = $profile_name;
$item['title_e'] = $item['title'];
$body_e = $body;
$tags_e = $tags;
$hashtags_e = $hashtags;
$mentions_e = $mentions;
$location_e = $location;
$owner_name_e = $owner_name;
if ($item['item_network'] == "") {
$item['item_network'] = $item['network'];

4
include/identity.php
View file

@ -443,10 +443,6 @@ function profile_sidebar($profile, $block = 0)
$p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL);
}
if ($a->theme['template_engine'] === 'internal') {
$location = template_escape($location);
}
$tpl = get_markup_template('profile_vcard.tpl');
$o .= replace_macros(
$tpl,

7
mod/directory.php
View file

@ -143,12 +143,7 @@ function directory_content(App $a) {
$about = ((x($profile,'about') == 1) ? t('About:') : False);
if($a->theme['template_engine'] === 'internal') {
$location_e = template_escape($location);
}
else {
$location_e = $location;
}
$location_e = $location;
$photo_menu = array(
'profile' => array(t("View Profile"), zrl($profile_link))

17
mod/fbrowser.php
View file

@ -69,13 +69,7 @@ function fbrowser_content(App $a) {
$a = get_app();
$types = Photo::supportedTypes();
$ext = $types[$rr['type']];
if($a->theme['template_engine'] === 'internal') {
$filename_e = template_escape($rr['filename']);
}
else {
$filename_e = $rr['filename'];
}
$filename_e = $rr['filename'];
// Take the largest picture that is smaller or equal 640 pixels
$p = q("SELECT `scale` FROM `photo` WHERE `resource-id` = '%s' AND `height` <= 640 AND `width` <= 640 ORDER BY `resource-id`, `scale` LIMIT 1",
@ -117,14 +111,9 @@ function fbrowser_content(App $a) {
$a = get_app();
list($m1,$m2) = explode("/",$rr['filetype']);
$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
$filename_e = $rr['filename'];
if ($a->theme['template_engine'] === 'internal') {
$filename_e = template_escape($rr['filename']);
} else {
$filename_e = $rr['filename'];
}
return array( System::baseUrl() . '/attach/' . $rr['id'], $filename_e, System::baseUrl() . '/images/icons/16/' . $filetype . '.png');
return array(System::baseUrl() . '/attach/' . $rr['id'], $filename_e, System::baseUrl() . '/images/icons/16/' . $filetype . '.png');
}
$files = array_map("_map_files2", $files);

33
mod/message.php
View file

@ -450,17 +450,10 @@ function message_content(App $a) {
if ($extracted['images'])
$message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
if ($a->theme['template_engine'] === 'internal') {
$from_name_e = template_escape($message['from-name']);
$subject_e = template_escape($message['title']);
$body_e = template_escape(Smilies::replace(bbcode($message['body'])));
$to_name_e = template_escape($message['name']);
} else {
$from_name_e = $message['from-name'];
$subject_e = $message['title'];
$body_e = Smilies::replace(bbcode($message['body']));
$to_name_e = $message['name'];
}
$from_name_e = $message['from-name'];
$subject_e = $message['title'];
$body_e = Smilies::replace(bbcode($message['body']));
$to_name_e = $message['name'];
$contact = Contact::getDetailsByURL($message['from-url']);
if (isset($contact["thumb"]))
@ -492,11 +485,7 @@ function message_content(App $a) {
$tpl = get_markup_template('mail_display.tpl');
if ($a->theme['template_engine'] === 'internal') {
$subjtxt_e = template_escape($message['title']);
} else {
$subjtxt_e = $message['title'];
}
$subjtxt_e = $message['title'];
$o = replace_macros($tpl, array(
'$thread_id' => $a->argv[1],
@ -566,15 +555,9 @@ function render_messages(array $msg, $t) {
else
$participants = sprintf(t("%s and You"), $rr['from-name']);
if ($a->theme['template_engine'] === 'internal') {
$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'));
$body_e = template_escape($rr['body']);
$to_name_e = template_escape($rr['name']);
} else {
$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
$body_e = $rr['body'];
$to_name_e = $rr['name'];
}
$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
$body_e = $rr['body'];
$to_name_e = $rr['name'];
$contact = Contact::getDetailsByURL($rr['url']);
if (isset($contact["thumb"]))

72
mod/photos.php
View file

@ -1155,13 +1155,8 @@ function photos_content(App $a) {
$tpl = get_markup_template('photos_upload.tpl');
if ($a->theme['template_engine'] === 'internal') {
$albumselect_e = template_escape($albumselect);
$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user)));
} else {
$albumselect_e = $albumselect;
$aclselect_e = (($visitor) ? '' : populate_acl($a->user));
}
$albumselect_e = $albumselect;
$aclselect_e = (($visitor) ? '' : populate_acl($a->user));
$o .= replace_macros($tpl,array(
'$pagename' => t('Upload Photos'),
@ -1236,11 +1231,7 @@ function photos_content(App $a) {
if ($can_post) {
$edit_tpl = get_markup_template('album_edit.tpl');
if ($a->theme['template_engine'] === 'internal') {
$album_e = template_escape($album);
} else {
$album_e = $album;
}
$album_e = $album;
$o .= replace_macros($edit_tpl,array(
'$nametext' => t('New album name: '),
@ -1277,13 +1268,8 @@ function photos_content(App $a) {
$ext = $phototypes[$rr['type']];
if ($a->theme['template_engine'] === 'internal') {
$imgalt_e = template_escape($rr['filename']);
$desc_e = template_escape($rr['desc']);
} else {
$imgalt_e = $rr['filename'];
$desc_e = $rr['desc'];
}
$imgalt_e = $rr['filename'];
$desc_e = $rr['desc'];
$photos[] = array(
'id' => $rr['id'],
@ -1548,15 +1534,9 @@ function photos_content(App $a) {
$public_post_link = '&public=1';
}
if ($a->theme['template_engine'] === 'internal') {
$album_e = template_escape($ph[0]['album']);
$caption_e = template_escape($ph[0]['desc']);
$aclselect_e = template_escape(populate_acl($ph[0]));
} else {
$album_e = $ph[0]['album'];
$caption_e = $ph[0]['desc'];
$aclselect_e = populate_acl($ph[0]);
}
$album_e = $ph[0]['album'];
$caption_e = $ph[0]['desc'];
$aclselect_e = populate_acl($ph[0]);
$edit = replace_macros($edit_tpl, array(
'$id' => $ph[0]['id'],
@ -1708,15 +1688,9 @@ function photos_content(App $a) {
'delete' => t('Delete'),
);
if ($a->theme['template_engine'] === 'internal') {
$name_e = template_escape($profile_name);
$title_e = template_escape($item['title']);
$body_e = template_escape(bbcode($item['body']));
} else {
$name_e = $profile_name;
$title_e = $item['title'];
$body_e = bbcode($item['body']);
}
$name_e = $profile_name;
$title_e = $item['title'];
$body_e = bbcode($item['body']);
$comments .= replace_macros($template,array(
'$id' => $item['item_id'],
@ -1766,17 +1740,10 @@ function photos_content(App $a) {
$photo_tpl = get_markup_template('photo_view.tpl');
if ($a->theme['template_engine'] === 'internal') {
$album_e = array($album_link,template_escape($ph[0]['album']));
$tags_e = template_escape($tags);
$like_e = template_escape($like);
$dislike_e = template_escape($dislike);
} else {
$album_e = array($album_link, $ph[0]['album']);
$tags_e = $tags;
$like_e = $like;
$dislike_e = $dislike;
}
$album_e = array($album_link, $ph[0]['album']);
$tags_e = $tags;
$like_e = $like;
$dislike_e = $dislike;
$o .= replace_macros($photo_tpl, array(
'$id' => $ph[0]['id'],
@ -1849,13 +1816,8 @@ function photos_content(App $a) {
$ext = $phototypes[$rr['type']];
if ($a->theme['template_engine'] === 'internal') {
$alt_e = template_escape($rr['filename']);
$name_e = template_escape($rr['album']);
} else {
$alt_e = $rr['filename'];
$name_e = $rr['album'];
}
$alt_e = $rr['filename'];
$name_e = $rr['album'];
$photos[] = array(
'id' => $rr['id'],

10
mod/videos.php
View file

@ -378,14 +378,8 @@ function videos_content(App $a) {
$videos = array();
if (DBM::is_result($r)) {
foreach ($r as $rr) {
if ($a->theme['template_engine'] === 'internal') {
$alt_e = template_escape($rr['filename']);
$name_e = template_escape($rr['album']);
}
else {
$alt_e = $rr['filename'];
$name_e = $rr['album'];
}
$alt_e = $rr['filename'];
$name_e = $rr['album'];
$videos[] = array(
'id' => $rr['id'],

21
src/Object/Item.php
View file

@ -311,21 +311,12 @@ class Item extends BaseObject
list($categories, $folders) = get_cats_and_terms($item);
if ($a->theme['template_engine'] === 'internal') {
$body_e = template_escape($body);
$text_e = strip_tags(template_escape($body));
$name_e = template_escape($profile_name);
$title_e = template_escape($item['title']);
$location_e = template_escape($location);
$owner_name_e = template_escape($this->getOwnerName());
} else {
$body_e = $body;
$text_e = strip_tags($body);
$name_e = $profile_name;
$title_e = $item['title'];
$location_e = $location;
$owner_name_e = $this->getOwnerName();
}
$body_e = $body;
$text_e = strip_tags($body);
$name_e = $profile_name;
$title_e = $item['title'];
$location_e = $location;
$owner_name_e = $this->getOwnerName();
// Disable features that aren't available in several networks