]> git.mxchange.org Git - friendica.git/blobdiff - mod/item.php
some work on tests
[friendica.git] / mod / item.php
index ee3bdca992d653757bc6999cce3f7f5b8ec33ecb..6b0a7996cf00f8ee19c1ce3b9951cc602280f506 100644 (file)
@@ -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');
+require_once('include/email.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 +60,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 +87,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 +110,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((x($_REQUEST,'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
+               notice( t('Permission denied.') . EOL) ;
+               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)) {
+
+       if((! can_write_wall($a,$profile_uid)) && (! $allow_moderated)) {
                notice( t('Permission denied.') . EOL) ;
-               if(x($_POST,'return')) 
+               if(x($_REQUEST,'return')) 
                        goaway($a->get_baseurl() . "/" . $return_path );
                killme();
        }
@@ -138,35 +165,57 @@ 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'];
                $app                       = $orig_post['app'];
-
-               $body              = escape_tags(trim($_POST['body']));
+               $categories        = $orig_post['file'];
+               $title             = notags(trim($_REQUEST['title']));
+               $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 +228,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
 
@@ -194,15 +243,40 @@ 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();
                }
        }
 
+        if(strlen($categories)) {
+               // get the "fileas" tags for this post
+                $filedas = file_tag_file_to_list($categories, 'file');
+       }
+        // save old and new categories, so we can determine what needs to be deleted from pconfig
+        $categories_old = $categories;
+        $categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
+        $categories_new = $categories;
+        if(strlen($filedas)) {
+               // append the fileas stuff to the new categories list
+               $categories .= file_tag_list_to_file($filedas, 'file');
+       }
+
+       // Work around doubled linefeeds in Tinymce 3.5b2
+       // First figure out if it's a status post that would've been
+       // created using tinymce. Otherwise leave it alone. 
+
+       $plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0);
+       if((! $parent) && (! $api_source) && (! $plaintext)) {
+               $body = str_replace("\r\n","\n",$body);
+               $body = str_replace("\n\n","\n",$body);
+       }
+
+
        // get contact info for poster
 
        $author = null;
@@ -242,7 +316,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 +341,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 +384,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 +412,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);
@@ -355,6 +422,8 @@ function item_post(&$a) {
 
        $body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body); 
 
+       $body = scale_external_images($body,false);
+
        /**
         * Look for any tags and linkify them
         */
@@ -378,106 +447,7 @@ function item_post(&$a) {
 
        if(count($tags)) {
                foreach($tags as $tag) {
-                       
-                       if(isset($profile))
-                               unset($profile);
-                       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))
-                                       $str_tags .= ',';
-                               $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
-                               continue;
-                       }
-                       if(strpos($tag,'@') === 0) {
-                               if(strpos($tag,'[url='))
-                                       continue;
-                               $stat = false;
-                               $name = substr($tag,1);
-                               if((strpos($name,'@')) || (strpos($name,'http://'))) {
-                                       $newname = $name;
-                                       $links = @lrdd($name);
-                                       if(count($links)) {
-                                               foreach($links as $link) {
-                                                       if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
-                                       $profile = $link['@attributes']['href'];
-                                                       if($link['@attributes']['rel'] === 'salmon') {
-                                                               if(strlen($inform))
-                                                                       $inform .= ',';
-                                       $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
-                                                       }
-                                               }
-                                       }
-                               }
-                               else {
-                                       $newname = $name;
-                                       $alias = '';
-                                       $tagcid = 0;
-                                       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),
-                                                       intval($profile_uid)
-                                               );
-                                       }
-                                       elseif(strstr($name,'_') || strstr($name,' ')) {
-                                               $newname = str_replace('_',' ',$name);
-                                               $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-                                                       dbesc($newname),
-                                                       intval($profile_uid)
-                                               );
-                                       }
-                                       else {
-                                               $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
-                                                       dbesc($name),
-                                                       dbesc($name),
-                                                       intval($profile_uid)
-                                               );
-                                       }
-                                       if(count($r)) {
-                                               $profile = $r[0]['url'];
-                                               if($r[0]['network'] === 'stat') {
-                                                       $newname = $r[0]['nick'];
-                                                       $stat = true;
-                                                       if($r[0]['alias'])
-                                                               $alias = $r[0]['alias'];
-                                               }
-                                               else
-                                                       $newname = $r[0]['name'];
-                                               if(strlen($inform))
-                                                       $inform .= ',';
-                                               $inform .= 'cid:' . $r[0]['id'];
-                                       }
-                               }
-                               if($profile) {
-                                       $body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname      . '[/url]', $body);
-                                       $profile = str_replace(',','%2c',$profile);
-                                       $newtag = '@[url=' . $profile . ']' . $newname  . '[/url]';
-                                       if(! stristr($str_tags,$newtag)) {
-                                               if(strlen($str_tags))
-                                                       $str_tags .= ',';
-                                               $str_tags .= $newtag;
-                                       }
-
-                                       // Status.Net seems to require the numeric ID URL in a mention if the person isn't 
-                                       // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both. 
-
-                                       if(strlen($alias)) {
-                                               $newtag = '@[url=' . $alias . ']' . $newname    . '[/url]';
-                                               if(! stristr($str_tags,$newtag)) {
-                                                       if(strlen($str_tags))
-                                                               $str_tags .= ',';
-                                                       $str_tags .= $newtag;
-                                               }
-                                       }
-                               }
-                       }
+                       handle_tag($a, $body, $inform, $str_tags, $profile_uid, $tag); 
                }
        }
 
@@ -542,6 +512,7 @@ function item_post(&$a) {
        $datarray['location']      = $location;
        $datarray['coord']         = $coord;
        $datarray['tag']           = $str_tags;
+       $datarray['file']          = $categories;
        $datarray['inform']        = $inform;
        $datarray['verb']          = $verb;
        $datarray['allow_cid']     = $str_contact_allow;
@@ -555,6 +526,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...
@@ -571,20 +543,51 @@ 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",
-                       dbesc($body),
+               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       dbesc($datarray['title']),
+                       dbesc($datarray['body']),
+                       dbesc($datarray['tag']),
+                       dbesc($datarray['attach']),
+                       dbesc($datarray['file']),
                        dbesc(datetime_convert()),
                        intval($post_id),
                        intval($profile_uid)
                );
 
+               // update filetags in pconfig
+                file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
+
                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 );
                }
@@ -596,8 +599,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`, `file` )
+               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, '%s' )",
                dbesc($datarray['guid']),
                intval($datarray['uid']),
                dbesc($datarray['type']),
@@ -634,8 +637,10 @@ function item_post(&$a) {
                intval($datarray['pubmail']),
                dbesc($datarray['attach']),
                intval($datarray['bookmark']),
-               intval($datarray['origin'])
-       );
+               intval($datarray['origin']),
+               intval($datarray['moderated']),
+               dbesc($datarray['file'])
+              );
 
        $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
                dbesc($datarray['uri']));
@@ -643,6 +648,9 @@ function item_post(&$a) {
                $post_id = $r[0]['id'];
                logger('mod_item: saved item ' . $post_id);
 
+               // update filetags in pconfig
+                file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
+
                if($parent) {
 
                        // This item is the last leaf and gets the comment box, clear any ancestors
@@ -663,68 +671,24 @@ 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'],
+                                       'uid'          => $user['uid'],
+                                       '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',
+                                       'parent'       => $parent,
                                ));
                        
-                               // 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
@@ -751,66 +715,22 @@ 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'],
+                                       'uid'          => $user['uid'],
+                                       '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();
                        }
                }
 
@@ -865,13 +785,13 @@ 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']);
-                               $headers  = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n";
+                               $subject  = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
+                               $headers  = 'From: ' . email_header_encode($a->user['username'],'UTF-8') . ' <' . $a->user['email'] . '>' . "\n";
                                $headers .= 'MIME-Version: 1.0' . "\n";
                                $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
                                $headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
@@ -906,8 +826,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);
 
@@ -932,3 +852,143 @@ function item_content(&$a) {
                drop_item($a->argv[2]);
        }
 }
+
+/**
+ * This function removes the tag $tag from the text $body and replaces it with 
+ * the appropiate link. 
+ * 
+ * @param unknown_type $body the text to replace the tag in
+ * @param unknown_type $inform a comma-seperated string containing everybody to inform
+ * @param unknown_type $str_tags string to add the tag to
+ * @param unknown_type $profile_uid
+ * @param unknown_type $tag the tag to replace
+ */
+function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
+       //is it a hash tag? 
+       if(strpos($tag,'#') === 0) {
+               //if the tag is replaced...
+               if(strpos($tag,'[url='))
+                       //...do nothing
+                       return;
+               //base tag has the tags name only
+               $basetag = str_replace('_',' ',substr($tag,1));
+               //create text for link
+               $newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+               //replace tag by the link
+               $body = str_replace($tag, $newtag, $body);
+       
+               //is the link already in str_tags?
+               if(! stristr($str_tags,$newtag)) {
+                       //append or set str_tags
+                       if(strlen($str_tags))
+                               $str_tags .= ',';
+                       $str_tags .= $newtag;
+               }
+               return;
+       }
+       //is it a person tag? 
+       if(strpos($tag,'@') === 0) {
+               //is it already replaced? 
+               if(strpos($tag,'[url='))
+                       return;
+               $stat = false;
+               //get the person's name
+               $name = substr($tag,1);
+               //is it a link or a full dfrn address? 
+               if((strpos($name,'@')) || (strpos($name,'http://'))) {
+                       $newname = $name;
+                       //get the profile links
+                       $links = @lrdd($name);
+                       if(count($links)) {
+                               //for all links, collect how is to inform and how's profile is to link
+                               foreach($links as $link) {
+                                       if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+                                               $profile = $link['@attributes']['href'];
+                                       if($link['@attributes']['rel'] === 'salmon') {
+                                               if(strlen($inform))
+                                                       $inform .= ',';
+                                               $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
+                                       }
+                               }
+                       }
+               } else { //if it is a name rather than an address
+                       $newname = $name;
+                       $alias = '';
+                       $tagcid = 0;
+                       //is it some generated name?
+                       if(strrpos($newname,'+')) {
+                               //get the id
+                               $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
+                               //remove the next word from tag's name
+                               if(strpos($name,' ')) {
+                                       $name = substr($name,0,strpos($name,' '));
+                               }
+                       }
+                       if($tagcid) { //if there was an id
+                               //select contact with that id from the logged in user's contact list
+                               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                                               intval($tagcid),
+                                               intval($profile_uid)
+                               );
+                       } elseif(strstr($name,'_') || strstr($name,' ')) { //no id
+                               //get the real name
+                               $newname = str_replace('_',' ',$name);
+                               //select someone from this user's contacts by name
+                               $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+                                               dbesc($newname),
+                                               intval($profile_uid)
+                               );
+                       } else {
+                               //select someone by attag or nick and the name passed in
+                               $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+                                               dbesc($name),
+                                               dbesc($name),
+                                               intval($profile_uid)
+                               );
+                       }
+                       //$r is set, if someone could be selected
+                       if(count($r)) {
+                               $profile = $r[0]['url'];
+                               //set newname to nick, find alias
+                               if($r[0]['network'] === 'stat') {
+                                       $newname = $r[0]['nick'];
+                                       $stat = true;
+                                       if($r[0]['alias'])
+                                               $alias = $r[0]['alias'];
+                               }
+                               else
+                                       $newname = $r[0]['name'];
+                               //add person's id to $inform
+                               $inform_id = 'cid:' . $r[0]['id'];
+                               if(strlen($inform))
+                                       $inform .= ',';
+                               $inform .= 'cid:' . $r[0]['id'];
+                       }
+               }
+               //if there is an url for this persons profile
+               if(isset($profile)) {
+                       //create profile link
+                       $profile = str_replace(',','%2c',$profile);
+                       $newtag = '@[url=' . $profile . ']' . $newname  . '[/url]';
+                       $body = str_replace('@' . $name, $newtag, $body);
+                       //append tag to str_tags
+                       if(! stristr($str_tags,$newtag)) {
+                               if(strlen($str_tags))
+                                       $str_tags .= ',';
+                               $str_tags .= $newtag;
+                       }
+       
+                       // Status.Net seems to require the numeric ID URL in a mention if the person isn't
+                       // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+       
+                       if(strlen($alias)) {
+                               $newtag = '@[url=' . $alias . ']' . $newname    . '[/url]';
+                               if(! stristr($str_tags,$newtag)) {
+                                       if(strlen($str_tags))
+                                               $str_tags .= ',';
+                                       $str_tags .= $newtag;
+                               }
+                       }
+               }
+       }
+}