]> git.mxchange.org Git - friendica.git/blobdiff - mod/item.php
quattro: add "view in context" link in search results
[friendica.git] / mod / item.php
old mode 100644 (file)
new mode 100755 (executable)
index 48bfb77..217f13c
@@ -4,7 +4,7 @@
  *
  * This is the POST destination for most all locally posted
  * text stuff. This function handles status, wall-to-wall status, 
- * local comments, and remote coments that are posted on this site 
+ * local comments, and remote coments that are posted on this site 
  * (as opposed to being delivered in a feed).
  * Also processed here are posts and comments coming through the 
  * statusnet/twitter API. 
  */  
 
 require_once('include/crypto.php');
+require_once('include/enotify.php');
 
 function item_post(&$a) {
 
-       if((! local_user()) && (! remote_user()))
+       if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
                return;
 
        require_once('include/security.php');
 
        $uid = local_user();
 
-       if(x($_POST,'dropitems')) {
+       if(x($_REQUEST,'dropitems')) {
                require_once('include/items.php');
-               $arr_drop = explode(',',$_POST['dropitems']);
+               $arr_drop = explode(',',$_REQUEST['dropitems']);
                drop_items($arr_drop);
                $json = array('success' => 1);
                echo json_encode($json);
                killme();
        }
 
-       call_hooks('post_local_start', $_POST);
+       call_hooks('post_local_start', $_REQUEST);
+//     logger('postinput ' . file_get_contents('php://input'));
+       logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 
-       $api_source = ((x($_POST,'api_source') && $_POST['api_source']) ? true : false);
-       $return_path = ((x($_POST,'return')) ? $_POST['return'] : '');
+       $api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
+       $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+       $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
 
        /**
         * Is this a reply to something?
         */
 
-       $parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
-       $parent_uri = ((x($_POST,'parent_uri')) ? trim($_POST['parent_uri']) : '');
+       $parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
+       $parent_uri = ((x($_REQUEST,'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
 
        $parent_item = null;
        $parent_contact = null;
@@ -55,8 +59,8 @@ function item_post(&$a) {
 
        if($parent || $parent_uri) {
 
-               if(! x($_POST,'type'))
-                       $_POST['type'] = 'net-comment';
+               if(! x($_REQUEST,'type'))
+                       $_REQUEST['type'] = 'net-comment';
 
                if($parent) {
                        $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
@@ -82,7 +86,7 @@ function item_post(&$a) {
 
                if(($r === false) || (! count($r))) {
                        notice( t('Unable to locate original post.') . EOL);
-                       if(x($_POST,'return')) 
+                       if(x($_REQUEST,'return')) 
                                goaway($a->get_baseurl() . "/" . $return_path );
                        killme();
                }
@@ -105,13 +109,35 @@ function item_post(&$a) {
 
        if($parent) logger('mod_post: parent=' . $parent);
 
-       $profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0);
-       $post_id     = ((x($_POST['post_id']))    ? intval($_POST['post_id'])     : 0);
-       $app         = ((x($_POST['source']))     ? strip_tags($_POST['source'])  : '');
+       $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
+       $post_id     = ((x($_REQUEST,'post_id'))     ? intval($_REQUEST['post_id'])     : 0);
+       $app         = ((x($_REQUEST,'source'))      ? strip_tags($_REQUEST['source'])  : '');
+
+       $allow_moderated = false;
+
+       // here is where we are going to check for permission to post a moderated comment.
+
+       // First check that the parent exists and it is a wall item.
 
-       if(! can_write_wall($a,$profile_uid)) {
+       if((x($_REQUEST,'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
                notice( t('Permission denied.') . EOL) ;
-               if(x($_POST,'return')) 
+               if(x($_REQUEST,'return')) 
+                       goaway($a->get_baseurl() . "/" . $return_path );
+               killme();
+       }
+
+       // Now check that it is a page_type of PAGE_BLOG, and that valid personal details
+       // have been provided, and run any anti-spam plugins
+
+
+       // TODO
+
+
+
+
+       if((! can_write_wall($a,$profile_uid)) && (! $allow_moderated)) {
+               notice( t('Permission denied.') . EOL) ;
+               if(x($_REQUEST,'return')) 
                        goaway($a->get_baseurl() . "/" . $return_path );
                killme();
        }
@@ -138,7 +164,7 @@ 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'];
@@ -151,22 +177,43 @@ function item_post(&$a) {
                $emailcc           = $orig_post['emailcc'];
                $app                       = $orig_post['app'];
 
-               $body              = escape_tags(trim($_POST['body']));
+               $body              = escape_tags(trim($_REQUEST['body']));
                $private           = $orig_post['private'];
                $pubmail_enable    = $orig_post['pubmail'];
        }
        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']));
-
-               $body              = escape_tags(trim($_POST['body']));
+
+               // if coming from the API and no privacy settings are set, 
+               // use the user default permissions - as they won't have
+               // been supplied via a form.
+
+               if(($api_source) 
+                       && (! array_key_exists('contact_allow',$_REQUEST))
+                       && (! array_key_exists('group_allow',$_REQUEST))
+                       && (! array_key_exists('contact_deny',$_REQUEST))
+                       && (! array_key_exists('group_deny',$_REQUEST))) {
+                       $str_group_allow   = $user['allow_gid'];
+                       $str_contact_allow = $user['allow_cid'];
+                       $str_group_deny    = $user['deny_gid'];
+                       $str_contact_deny  = $user['deny_cid'];
+               }
+               else {
+
+                       // use the posted permissions
+
+                       $str_group_allow   = perms2str($_REQUEST['group_allow']);
+                       $str_contact_allow = perms2str($_REQUEST['contact_allow']);
+                       $str_group_deny    = perms2str($_REQUEST['group_deny']);
+                       $str_contact_deny  = perms2str($_REQUEST['contact_deny']);
+               }
+
+               $title             = notags(trim($_REQUEST['title']));
+               $location          = notags(trim($_REQUEST['location']));
+               $coord             = notags(trim($_REQUEST['coord']));
+               $verb              = notags(trim($_REQUEST['verb']));
+               $emailcc           = notags(trim($_REQUEST['emailcc']));
+
+               $body              = escape_tags(trim($_REQUEST['body']));
                $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
                if(($parent_item) && 
@@ -179,7 +226,7 @@ function item_post(&$a) {
                        $private = 1;
                }
        
-               $pubmail_enable    = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0);
+               $pubmail_enable    = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0);
 
                // if using the API, we won't see pubmail_enable - figure out if it should be set
 
@@ -196,13 +243,17 @@ function item_post(&$a) {
 
 
                if(! strlen($body)) {
+                       if($preview)
+                               killme();
                        info( t('Empty post discarded.') . EOL );
-                       if(x($_POST,'return')) 
+                       if(x($_REQUEST,'return')) 
                                goaway($a->get_baseurl() . "/" . $return_path );
                        killme();
                }
        }
 
+
+
        // get contact info for poster
 
        $author = null;
@@ -242,7 +293,7 @@ function item_post(&$a) {
 
 
 
-       $post_type = notags(trim($_POST['type']));
+       $post_type = notags(trim($_REQUEST['type']));
 
        if($post_type === 'net-comment') {
                if($parent_item !== null) {
@@ -267,7 +318,7 @@ function item_post(&$a) {
 
        $match = null;
 
-       if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
+       if((! $preview) && preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
                $images = $match[1];
                if(count($images)) {
                        foreach($images as $image) {
@@ -310,7 +361,7 @@ function item_post(&$a) {
 
        $match = false;
 
-       if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) {
+       if((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) {
                $attaches = $match[1];
                if(count($attaches)) {
                        foreach($attaches as $attach) {
@@ -338,13 +389,6 @@ function item_post(&$a) {
        $bookmark = 0;
        if(preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$body,$match,PREG_SET_ORDER)) {
                $bookmark = 1;
-//             foreach($match as $mtch) {
-//                     $body = str_replace(
-//                             '[bookmark=' . $mtch[1] . ']' . $mtch[2] . '[/bookmark]',
-//                             '[url=' . $mtch[1] . ']' . $mtch[2] . '[/url]',
-//                             $body
-//                     );
-//             }
        }
 
        $body = bb_translate_video($body);
@@ -378,6 +422,7 @@ function item_post(&$a) {
 
        if(count($tags)) {
                foreach($tags as $tag) {
+                       
                        if(isset($profile))
                                unset($profile);
                        if(strpos($tag,'#') === 0) {
@@ -385,9 +430,13 @@ function item_post(&$a) {
                                        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))
-                                       $str_tags .= ',';
-                               $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+
+                               $newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+                               if(! stristr($str_tags,$newtag)) {
+                                       if(strlen($str_tags))
+                                               $str_tags .= ',';
+                                       $str_tags .= $newtag;
+                               } 
                                continue;
                        }
                        if(strpos($tag,'@') === 0) {
@@ -414,9 +463,11 @@ function item_post(&$a) {
                                        $newname = $name;
                                        $alias = '';
                                        $tagcid = 0;
-                                       if(strrpos($newname,'+'))
+                                       if(strrpos($newname,'+')) {
                                                $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
-
+                                               if(strpos($name,' '))
+                                                       $name = substr($name,0,strpos($name,' '));
+                                       }       
                                        if($tagcid) {
                                                $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                                        intval($tagcid),
@@ -552,6 +603,7 @@ function item_post(&$a) {
        $datarray['thr-parent']    = $thr_parent;
        $datarray['postopts']      = '';
        $datarray['origin']        = $origin;
+       $datarray['moderated']     = $allow_moderated;
 
        /**
         * These fields are for the convenience of plugins...
@@ -568,9 +620,33 @@ function item_post(&$a) {
        else
                $datarray['guid']      = get_guid();
 
+       // preview mode - prepare the body for display and send it via json
+
+       if($preview) {
+               require_once('include/conversation.php');
+               $o = conversation(&$a,array(array_merge($contact_record,$datarray)),'search',false,true);
+               logger('preview: ' . $o);
+               echo json_encode(array('preview' => $o));
+               killme();
+       }
+
 
        call_hooks('post_local',$datarray);
 
+       if(x($datarray,'cancel')) {
+               logger('mod_item: post cancelled by plugin.');
+               if($return_path) {
+                       goaway($a->get_baseurl() . "/" . $return_path);
+               }
+
+               $json = array('cancel' => 1);
+               if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
+                       $json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
+
+               echo json_encode($json);
+               killme();
+       }
+
 
        if($orig_post) {
                $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -581,7 +657,7 @@ function item_post(&$a) {
                );
 
                proc_run('php', "include/notifier.php", 'edit_post', "$post_id");
-               if((x($_POST,'return')) && strlen($return_path)) {
+               if((x($_REQUEST,'return')) && strlen($return_path)) {
                        logger('return: ' . $return_path);
                        goaway($a->get_baseurl() . "/" . $return_path );
                }
@@ -593,8 +669,8 @@ function item_post(&$a) {
 
        $r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
                `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, 
-               `tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin` )
-               VALUES( '%s', %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', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d )",
+               `tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated` )
+               VALUES( '%s', %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', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d )",
                dbesc($datarray['guid']),
                intval($datarray['uid']),
                dbesc($datarray['type']),
@@ -631,7 +707,8 @@ function item_post(&$a) {
                intval($datarray['pubmail']),
                dbesc($datarray['attach']),
                intval($datarray['bookmark']),
-               intval($datarray['origin'])
+               intval($datarray['origin']),
+               intval($datarry['moderated'])
        );
 
        $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
@@ -660,68 +737,22 @@ function item_post(&$a) {
                                intval($post_id)
                        );
 
-                       // Send a notification email to the conversation owner, unless the owner is me and I wrote this item
-                       if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) {
-                               push_lang($user['language']);
-                               require_once('bbcode.php');
-                               $from = $author['name'];
-
-                               // name of the automated email sender
-                               $msg['notificationfromname']    = stripslashes($datarray['author-name']);;
-                               // noreply address to send from
-                               $msg['notificationfromemail']   = t('noreply') . '@' . $a->get_hostname();                              
-
-                               // text version
-                               // process the message body to display properly in text mode
-                               $msg['textversion']
-                                       = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
-                               
-                               // html version
-                               // process the message body to display properly in text mode
-                               $msg['htmlversion']     
-                                       = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
-
-                               // load the template for private message notifications
-                               $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
-                               $email_html_body_tpl = replace_macros($tpl,array(
-                                       '$username'     => $user['username'],
-                                       '$sitename'             => $a->config['sitename'],                              // name of this site
-                                       '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
-                                       '$thumb'                => $author['thumb'],                                    // thumbnail url for sender icon
-                                       '$email'                => $importer['email'],                                  // email address to send to
-                                       '$url'                  => $author['url'],                                              // full url for the site
-                                       '$from'                 => $from,                                                               // name of the person sending the message
-                                       '$body'                 => $msg['htmlversion'],                                 // html version of the message
-                                       '$display'              => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+                       if($contact_record != $author) {
+                               notification(array(
+                                       'type'         => NOTIFY_COMMENT,
+                                       'notify_flags' => $user['notify-flags'],
+                                       'language'     => $user['language'],
+                                       'to_name'      => $user['username'],
+                                       'to_email'     => $user['email'],
+                                       'item'         => $datarray,
+                                       'link'             => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+                                       'source_name'  => $datarray['author-name'],
+                                       'source_link'  => $datarray['author-link'],
+                                       'source_photo' => $datarray['author-avatar'],
+                                       'verb'         => ACTIVITY_POST,
+                                       'otype'        => 'item'
                                ));
                        
-                               // load the template for private message notifications
-                               $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
-                               $email_text_body_tpl = replace_macros($tpl,array(
-                                       '$username'     => $user['username'],
-                                       '$sitename'             => $a->config['sitename'],                              // name of this site
-                                       '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
-                                       '$thumb'                => $author['thumb'],                                    // thumbnail url for sender icon
-                                       '$email'                => $importer['email'],                                  // email address to send to
-                                       '$url'                  => $author['url'],                                              // profile url for the author
-                                       '$from'                 => $from,                                                               // name of the person sending the message
-                                       '$body'                 => $msg['textversion'],                                 // text version of the message
-                                       '$display'              => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
-                               ));
-
-                               // use the EmailNotification library to send the message
-                               require_once("include/EmailNotification.php");
-                               EmailNotification::sendTextHtmlEmail(
-                                       $msg['notificationfromname'],
-                                       t("Administrator@") . $a->get_hostname(),
-                                       t("noreply") . '@' . $a->get_hostname(),
-                                       $user['email'],
-                                       sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
-                                       $email_html_body_tpl,
-                                       $email_text_body_tpl
-                               );
-
-                               pop_lang();
                        }
 
                        // We won't be able to sign Diaspora comments for authenticated visitors - we don't have their private key
@@ -748,66 +779,21 @@ function item_post(&$a) {
                else {
                        $parent = $post_id;
 
-                       // let me know if somebody did a wall-to-wall post on my profile
-
-                       if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) {
-                               push_lang($user['language']);
-                               require_once('bbcode.php');
-                               $from = $author['name'];
-                                                       
-                               // name of the automated email sender
-                               $msg['notificationfromname']    = $from;
-                               // noreply address to send from
-                               $msg['notificationfromemail']   = t('noreply') . '@' . $a->get_hostname();                              
-
-                               // text version
-                               // process the message body to display properly in text mode
-                               $msg['textversion']
-                                       = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
-                               
-                               // html version
-                               // process the message body to display properly in text mode
-                               $msg['htmlversion']     
-                                       = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
-
-                               // load the template for private message notifications
-                               $tpl = load_view_file('view/wall_received_html_body_eml.tpl');
-                               $email_html_body_tpl = replace_macros($tpl,array(
-                                       '$username'     => $user['username'],
-                                       '$sitename'             => $a->config['sitename'],                              // name of this site
-                                       '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
-                                       '$thumb'                => $author['thumb'],                                    // thumbnail url for sender icon
-                                       '$url'                  => $author['url'],                                              // full url for the site
-                                       '$from'                 => $from,                                                               // name of the person sending the message
-                                       '$body'                 => $msg['htmlversion'],                                 // html version of the message
-                                       '$display'              => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
-                               ));
-                       
-                               // load the template for private message notifications
-                               $tpl = load_view_file('view/wall_received_text_body_eml.tpl');
-                               $email_text_body_tpl = replace_macros($tpl,array(
-                                       '$username'     => $user['username'],
-                                       '$sitename'             => $a->config['sitename'],                              // name of this site
-                                       '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
-                                       '$thumb'                => $author['thumb'],                                    // thumbnail url for sender icon
-                                       '$url'                  => $author['url'],                                              // full url for the site
-                                       '$from'                 => $from,                                                               // name of the person sending the message
-                                       '$body'                 => $msg['textversion'],                                 // text version of the message
-                                       '$display'              => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+                       if($contact_record != $author) {
+                               notification(array(
+                                       'type'         => NOTIFY_WALL,
+                                       'notify_flags' => $user['notify-flags'],
+                                       'language'     => $user['language'],
+                                       'to_name'      => $user['username'],
+                                       'to_email'     => $user['email'],
+                                       'item'         => $datarray,
+                                       'link'             => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+                                       'source_name'  => $datarray['author-name'],
+                                       'source_link'  => $datarray['author-link'],
+                                       'source_photo' => $datarray['author-avatar'],
+                                       'verb'         => ACTIVITY_POST,
+                                       'otype'        => 'item'
                                ));
-
-                               // use the EmailNotification library to send the message
-                               require_once("include/EmailNotification.php");
-                               EmailNotification::sendTextHtmlEmail(
-                                       $msg['notificationfromname'],
-                                       t("Administrator@") . $a->get_hostname(),
-                                       t("noreply") . '@' . $a->get_hostname(),
-                                       $user['email'],
-                                       sprintf( t('%s posted to your profile wall at %s') , $from , $a->config['sitename']),
-                                       $email_html_body_tpl,
-                                       $email_text_body_tpl
-                               );
-                               pop_lang();
                        }
                }
 
@@ -862,12 +848,12 @@ function item_post(&$a) {
                                $addr = trim($recip);
                                if(! strlen($addr))
                                        continue;
-                               $disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) 
+                               $disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username']) 
                                        . '<br />';
                                $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']);
+                               $subject  = '[Friendica]' . ' ' . 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";
@@ -903,8 +889,8 @@ function item_post(&$a) {
        }
 
        $json = array('success' => 1);
-       if(x($_POST,'jsreload') && strlen($_POST['jsreload']))
-               $json['reload'] = $a->get_baseurl() . '/' . $_POST['jsreload'];
+       if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
+               $json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
 
        logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);