From 9f7878057f356ba785de26877a660bb025cae31d Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Fri, 11 Mar 2011 00:22:21 +0100 Subject: update source strings --- mod/item.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 5989d0967..9e03e76cd 100644 --- a/mod/item.php +++ b/mod/item.php @@ -419,8 +419,8 @@ function item_post(&$a) { '$body' => strip_tags(bbcode($datarray['body'])) )); - $res = mail($user['email'], $from . t(" commented on your item at ") . $a->config['sitename'], - $email_tpl,t("From: Administrator@") . $a->get_hostname() ); + $res = mail($user['email'], sprintf(t("%s commented on your item at %s"),$from,$a->config['sitename']), + $email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() ); } } else { @@ -442,8 +442,8 @@ function item_post(&$a) { '$body' => strip_tags(bbcode($datarray['body'])) )); - $res = mail($user['email'], $from . t(" posted on your profile wall at ") . $a->config['sitename'], - $email_tpl,t("From: Administrator@") . $a->get_hostname() ); + $res = mail($user['email'], sprintf(t("%s posted on your profile wall at %s"),$from, $a->config['sitename']), + $email_tpl,"From: " . t("Administrator@") . "@" . $a->get_hostname() ); } } @@ -486,13 +486,13 @@ function item_post(&$a) { $addr = trim($recip); if(! strlen($addr)) continue; - $disclaimer = '
' . t('This message was sent to you by ') . $a->user['username'] - . t(', a member of the Friendika social network.') . '
'; + $disclaimer = '
' . sprintf(t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) + . '
'; $disclaimer .= t('You may visit them online at') . ' ' . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '
'; $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . '
'; - $subject = '[Friendika]' . ' ' . $a->user['username'] . ' ' . t('posted an update.'); + $subject = '[Friendika]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']); $headers = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n"; $headers .= 'MIME-Version: 1.0' . "\n"; $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n"; -- cgit v1.2.3 From a7af6df962bad0901611d28450a990831fb25680 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 13 Mar 2011 13:50:44 +0100 Subject: Fix spaces around t() and tt() --- mod/item.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 9e03e76cd..2cdfb0d66 100644 --- a/mod/item.php +++ b/mod/item.php @@ -419,7 +419,7 @@ function item_post(&$a) { '$body' => strip_tags(bbcode($datarray['body'])) )); - $res = mail($user['email'], sprintf(t("%s commented on your item at %s"),$from,$a->config['sitename']), + $res = mail($user['email'], sprintf( t("%s commented on your item at %s") ,$from,$a->config['sitename']), $email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() ); } } @@ -442,7 +442,7 @@ function item_post(&$a) { '$body' => strip_tags(bbcode($datarray['body'])) )); - $res = mail($user['email'], sprintf(t("%s posted on your profile wall at %s"),$from, $a->config['sitename']), + $res = mail($user['email'], sprintf( t("%s posted on your profile wall at %s") ,$from, $a->config['sitename']), $email_tpl,"From: " . t("Administrator@") . "@" . $a->get_hostname() ); } } -- cgit v1.2.3 From f01538a54f68c172e09aabed90e2651ca2305675 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 15 Mar 2011 17:31:49 -0700 Subject: content expiration --- mod/item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 5989d0967..90fb546bc 100644 --- a/mod/item.php +++ b/mod/item.php @@ -532,7 +532,7 @@ function item_content(&$a) { require_once('include/security.php'); - $uid = $_SESSION['uid']; + $uid = local_user(); if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) { -- cgit v1.2.3 From 8fd989c568f6452ce1a91914cef4a33c5d3b4d76 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 16 Mar 2011 19:57:13 -0700 Subject: protect tags from double expansion during RT --- mod/item.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 90fb546bc..6e6e822d0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -212,6 +212,8 @@ function item_post(&$a) { if(count($tags)) { foreach($tags as $tag) { if(strpos($tag,'#') === 0) { + if(strpos($tag,'[url=')) + continue; $basetag = str_replace('_',' ',substr($tag,1)); $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); if(strlen($str_tags)) @@ -220,6 +222,8 @@ function item_post(&$a) { continue; } if(strpos($tag,'@') === 0) { + if(strpos($tag,'[url=')) + continue; $stat = false; $name = substr($tag,1); if((strpos($name,'@')) || (strpos($name,'http://'))) { -- cgit v1.2.3 From 9f5201dcaa4737427da7ec37969556c574e4711f Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 18 Mar 2011 00:30:34 -0700 Subject: edit posting after submission --- mod/item.php | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 6e6e822d0..511e26809 100644 --- a/mod/item.php +++ b/mod/item.php @@ -51,7 +51,7 @@ function item_post(&$a) { } $profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0); - + $post_id = ((x($_POST['post_id'])) ? intval($_POST['post_id']) : 0); if(! can_write_wall($a,$profile_uid)) { notice( t('Permission denied.') . EOL) ; @@ -151,6 +151,35 @@ function item_post(&$a) { } } + // is this an edited post? + + $orig_post = null; + + if($post_id) { + $i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1", + intval($profile_uid), + intval($post_id) + ); + if(! count($i)) + killme(); + $orig_post = $i[0]; + } + + if($orig_post) { + $str_group_allow = $orig_post['allow_gid']; + $str_contact_allow = $orig_post['allow_cid']; + $str_group_deny = $orig_post['deny_gid']; + $str_contact_deny = $orig_post['deny_cid']; + $private = $orig_post['private']; + $title = $orig_post['title']; + $location = $orig_post['location']; + $coord = $orig_post['coord']; + $verb = $orig_post['verb']; + $emailcc = $orig_post['emailcc']; + + $body = escape_tags(trim($_POST['body'])); + } + /** * @@ -294,8 +323,25 @@ function item_post(&$a) { } + if($orig_post) { + $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", + dbesc($body), + dbesc(datetime_convert()), + intval($post_id), + intval($profile_uid) + ); + proc_run('php', "include/notifier.php", 'edit_post', "$post_id"); + if((x($_POST,'return')) && strlen($_POST['return'])) { + logger('return: ' . $_POST['return']); + goaway($a->get_baseurl() . "/" . $_POST['return'] ); + } + killme(); + } + + $post_id = 0; $wall = 0; + if($post_type === 'wall' || $post_type === 'wall-comment') $wall = 1; -- cgit v1.2.3 From 7df8e18dd1917de9df359094e0ff486f47e4a08d Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 18 Mar 2011 11:02:42 +0100 Subject: Update more strings --- mod/item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 2cdfb0d66..da317a8c0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -443,7 +443,7 @@ function item_post(&$a) { )); $res = mail($user['email'], sprintf( t("%s posted on your profile wall at %s") ,$from, $a->config['sitename']), - $email_tpl,"From: " . t("Administrator@") . "@" . $a->get_hostname() ); + $email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() ); } } -- cgit v1.2.3 From 43234a667878327a825914070884161c6d57271e Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 18 Mar 2011 05:06:16 -0700 Subject: rework post editing a bit --- mod/item.php | 156 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 79 insertions(+), 77 deletions(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 511e26809..6a6116336 100644 --- a/mod/item.php +++ b/mod/item.php @@ -51,7 +51,7 @@ function item_post(&$a) { } $profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0); - $post_id = ((x($_POST['post_id'])) ? intval($_POST['post_id']) : 0); + $post_id = ((x($_POST['post_id'])) ? intval($_POST['post_id']) : 0); if(! can_write_wall($a,$profile_uid)) { notice( t('Permission denied.') . EOL) ; @@ -60,6 +60,21 @@ function item_post(&$a) { killme(); } + + // is this an edited post? + + $orig_post = null; + + if($post_id) { + $i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1", + intval($profile_uid), + intval($post_id) + ); + if(! count($i)) + killme(); + $orig_post = $i[0]; + } + $user = null; $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", @@ -68,37 +83,51 @@ function item_post(&$a) { if(count($r)) $user = $r[0]; + if($orig_post) { + $str_group_allow = $orig_post['allow_gid']; + $str_contact_allow = $orig_post['allow_cid']; + $str_group_deny = $orig_post['deny_gid']; + $str_contact_deny = $orig_post['deny_cid']; + $title = $orig_post['title']; + $location = $orig_post['location']; + $coord = $orig_post['coord']; + $verb = $orig_post['verb']; + $emailcc = $orig_post['emailcc']; - $str_group_allow = perms2str($_POST['group_allow']); - $str_contact_allow = perms2str($_POST['contact_allow']); - $str_group_deny = perms2str($_POST['group_deny']); - $str_contact_deny = perms2str($_POST['contact_deny']); - - $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); - - if(($parent_item) && - (($parent_item['private']) - || strlen($parent_item['allow_cid']) - || strlen($parent_item['allow_gid']) - || strlen($parent_item['deny_cid']) - || strlen($parent_item['deny_gid']) - ) - ) { - $private = 1; + $body = escape_tags(trim($_POST['body'])); + $private = $orig_post['private']; } + else { + $str_group_allow = perms2str($_POST['group_allow']); + $str_contact_allow = perms2str($_POST['contact_allow']); + $str_group_deny = perms2str($_POST['group_deny']); + $str_contact_deny = perms2str($_POST['contact_deny']); + $title = notags(trim($_POST['title'])); + $location = notags(trim($_POST['location'])); + $coord = notags(trim($_POST['coord'])); + $verb = notags(trim($_POST['verb'])); + $emailcc = notags(trim($_POST['emailcc'])); - $title = notags(trim($_POST['title'])); - $body = escape_tags(trim($_POST['body'])); - $location = notags(trim($_POST['location'])); - $coord = notags(trim($_POST['coord'])); - $verb = notags(trim($_POST['verb'])); - $emailcc = notags(trim($_POST['emailcc'])); + $body = escape_tags(trim($_POST['body'])); + $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); + + if(($parent_item) && + (($parent_item['private']) + || strlen($parent_item['allow_cid']) + || strlen($parent_item['allow_gid']) + || strlen($parent_item['deny_cid']) + || strlen($parent_item['deny_gid']) + )) { + $private = 1; + } + - if(! strlen($body)) { - notice( t('Empty post discarded.') . EOL ); - if(x($_POST,'return')) - goaway($a->get_baseurl() . "/" . $_POST['return'] ); - killme(); + if(! strlen($body)) { + notice( t('Empty post discarded.') . EOL ); + if(x($_POST,'return')) + goaway($a->get_baseurl() . "/" . $_POST['return'] ); + killme(); + } } // get contact info for poster @@ -151,36 +180,6 @@ function item_post(&$a) { } } - // is this an edited post? - - $orig_post = null; - - if($post_id) { - $i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1", - intval($profile_uid), - intval($post_id) - ); - if(! count($i)) - killme(); - $orig_post = $i[0]; - } - - if($orig_post) { - $str_group_allow = $orig_post['allow_gid']; - $str_contact_allow = $orig_post['allow_cid']; - $str_group_deny = $orig_post['deny_gid']; - $str_contact_deny = $orig_post['deny_cid']; - $private = $orig_post['private']; - $title = $orig_post['title']; - $location = $orig_post['location']; - $coord = $orig_post['coord']; - $verb = $orig_post['verb']; - $emailcc = $orig_post['emailcc']; - - $body = escape_tags(trim($_POST['body'])); - } - - /** * * When a photo was uploaded into the message using the (profile wall) ajax @@ -316,30 +315,11 @@ function item_post(&$a) { $str_tags .= ','; $str_tags .= '@[url=' . $alias . ']' . $newname . '[/url]'; } - } } } } - - if($orig_post) { - $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", - dbesc($body), - dbesc(datetime_convert()), - intval($post_id), - intval($profile_uid) - ); - - proc_run('php', "include/notifier.php", 'edit_post', "$post_id"); - if((x($_POST,'return')) && strlen($_POST['return'])) { - logger('return: ' . $_POST['return']); - goaway($a->get_baseurl() . "/" . $_POST['return'] ); - } - killme(); - } - - $post_id = 0; $wall = 0; if($post_type === 'wall' || $post_type === 'wall-comment') @@ -392,9 +372,31 @@ function item_post(&$a) { $datarray['parent'] = $parent; $datarray['self'] = $self; + if($orig_post) + $datarray['edit'] = true; call_hooks('post_local',$datarray); + + if($orig_post) { + $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", + dbesc($body), + dbesc(datetime_convert()), + intval($post_id), + intval($profile_uid) + ); + + proc_run('php', "include/notifier.php", 'edit_post', "$post_id"); + if((x($_POST,'return')) && strlen($_POST['return'])) { + logger('return: ' . $_POST['return']); + goaway($a->get_baseurl() . "/" . $_POST['return'] ); + } + killme(); + } + else + $post_id = 0; + + $r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private` ) -- cgit v1.2.3 From de131c9e58ac2b14380d145d643bf2bd902ae9dc Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 14 Apr 2011 17:13:13 -0700 Subject: set utf-8 on all emails --- mod/item.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 5cefb3be3..26afec2f4 100644 --- a/mod/item.php +++ b/mod/item.php @@ -472,7 +472,10 @@ function item_post(&$a) { )); $res = mail($user['email'], sprintf( t("%s commented on your item at %s") ,$from,$a->config['sitename']), - $email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() ); + $email_tpl, + 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + . 'Content-type: text/plain; charset=UTF-8' . "\n" + . 'Content-transfer-encoding: 8bit' ); } } else { @@ -495,7 +498,11 @@ function item_post(&$a) { )); $res = mail($user['email'], sprintf( t("%s posted on your profile wall at %s") ,$from, $a->config['sitename']), - $email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() ); + $email_tpl, + 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + . 'Content-type: text/plain; charset=UTF-8' . "\n" + . 'Content-transfer-encoding: 8bit' ); + } } -- cgit v1.2.3 From ab099e91028122dfb6b10cf9510b1b061f6f547f Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 17 Apr 2011 23:27:11 -0700 Subject: email integration, cont. --- mod/item.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 26afec2f4..e53cfb033 100644 --- a/mod/item.php +++ b/mod/item.php @@ -96,6 +96,7 @@ function item_post(&$a) { $body = escape_tags(trim($_POST['body'])); $private = $orig_post['private']; + $pubmail_enable = $orig_post['pubmail']; } else { $str_group_allow = perms2str($_POST['group_allow']); @@ -121,6 +122,7 @@ function item_post(&$a) { $private = 1; } + $pubmail_enable = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0); if(! strlen($body)) { notice( t('Empty post discarded.') . EOL ); @@ -362,6 +364,7 @@ function item_post(&$a) { $datarray['deny_cid'] = $str_contact_deny; $datarray['deny_gid'] = $str_group_deny; $datarray['private'] = $private; + $datarray['pubmail'] = $pubmail_enable; /** * These fields are for the convenience of plugins... @@ -399,8 +402,8 @@ function item_post(&$a) { $r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, - `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private` ) - VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )", + `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail` ) + VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )", intval($datarray['uid']), dbesc($datarray['type']), intval($datarray['wall']), @@ -427,7 +430,8 @@ function item_post(&$a) { dbesc($datarray['allow_gid']), dbesc($datarray['deny_cid']), dbesc($datarray['deny_gid']), - intval($datarray['private']) + intval($datarray['private']), + intval($datarray['pubmail']) ); $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", @@ -545,11 +549,10 @@ function item_post(&$a) { $addr = trim($recip); if(! strlen($addr)) continue; - $disclaimer = '
' . sprintf(t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) + $disclaimer = '
' . sprintf( t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) . '
'; - $disclaimer .= t('You may visit them online at') . ' ' - . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '
'; - $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . '
'; + $disclaimer .= sprintf( t('You may visit them online at %s'), $a->get_baseurl() . '/profile/' . $a->user['nickname']) . EOL; + $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; $subject = '[Friendika]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']); $headers = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n"; -- cgit v1.2.3 From 245a56f0c1c7db884d0bbd4265f6f74a20442748 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 26 Apr 2011 04:39:27 -0700 Subject: lots of facebook fixes --- mod/item.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index e53cfb033..7b561fcca 100644 --- a/mod/item.php +++ b/mod/item.php @@ -538,7 +538,8 @@ function item_post(&$a) { proc_run('php', "include/notifier.php", $notify_type, "$post_id"); - $datarray['id'] = $post_id; + $datarray['id'] = $post_id; + $datarray['plink'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id; call_hooks('post_local_end', $datarray); -- cgit v1.2.3 From 0f261ef8fa41dc3c438b4eba36b314915e34aaf6 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 2 May 2011 20:14:37 -0700 Subject: configurable FB poll interval, default 1hr. --- mod/item.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index 7b561fcca..c4f368fd0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -671,7 +671,8 @@ function item_content(&$a) { // send the notification upstream/downstream as the case may be proc_run('php',"include/notifier.php","drop","$drop_id"); - +// We seem to lose the return url occasionally. Have not been able to reliably duplicate +// logger('drop_return_url: ' . $_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED } -- cgit v1.2.3 From b2e92e0af32f86212d15748c6d432d658905d4b6 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 11 May 2011 04:37:13 -0700 Subject: deprecate load_view_file --- mod/item.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/item.php') diff --git a/mod/item.php b/mod/item.php index c4f368fd0..62899868e 100644 --- a/mod/item.php +++ b/mod/item.php @@ -464,7 +464,7 @@ function item_post(&$a) { if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) { require_once('bbcode.php'); $from = $author['name']; - $tpl = load_view_file('view/cmnt_received_eml.tpl'); + $tpl = get_intltext_template('cmnt_received_eml.tpl'); $email_tpl = replace_macros($tpl, array( '$sitename' => $a->config['sitename'], '$siteurl' => $a->get_baseurl(), @@ -490,7 +490,7 @@ function item_post(&$a) { if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) { require_once('bbcode.php'); $from = $author['name']; - $tpl = load_view_file('view/wall_received_eml.tpl'); + $tpl = get_intltext_template('wall_received_eml.tpl'); $email_tpl = replace_macros($tpl, array( '$sitename' => $a->config['sitename'], '$siteurl' => $a->get_baseurl(), -- cgit v1.2.3