DE update to strings and templates

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 72e63865bd53da577fed451fe10efff853bcbd9a..81dd553cdb795895dfd9a204d28ca49871a61de0 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -218,14 +218,23 @@ function item_post(&$a) {
 
                $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']) 
+               // If this is a comment, set the permissions from the parent.
+
+               if($parent_item) {
+                       $private = 0;
+
+                       if(($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;
+                               || strlen($parent_item['deny_gid'])) {
+                               $private = 1;
+                       }
+
+                       $str_contact_allow = $parent_item['allow_cid'];
+                       $str_group_allow   = $parent_item['allow_gid'];
+                       $str_contact_deny  = $parent_item['deny_cid'];
+                       $str_group_deny    = $parent_item['deny_gid'];
                }
        
                $pubmail_enable    = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0);
@@ -272,8 +281,7 @@ function item_post(&$a) {
 
        $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);
+               $body = fix_mce_lf($body);
        }
 
 
@@ -282,18 +290,16 @@ function item_post(&$a) {
        $author = null;
        $self   = false;
 
-       if(($_SESSION['uid']) && ($_SESSION['uid'] == $profile_uid)) {
+       if((local_user()) && (local_user() == $profile_uid)) {
                $self = true;
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
                        intval($_SESSION['uid'])
                );
        }
-       else {
-               if((x($_SESSION,'visitor_id')) && (intval($_SESSION['visitor_id']))) {
-                       $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-                               intval($_SESSION['visitor_id'])
-                       );
-               }
+       elseif(remote_user()) {
+               $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                       intval(remote_user())
+               );
        }
 
        if(count($r)) {
@@ -303,7 +309,7 @@ function item_post(&$a) {
 
        // get contact info for owner
        
-       if($profile_uid == $_SESSION['uid']) {
+       if($profile_uid == local_user()) {
                $contact_record = $author;
        }
        else {
@@ -314,8 +320,6 @@ function item_post(&$a) {
                        $contact_record = $r[0];
        }
 
-
-
        $post_type = notags(trim($_REQUEST['type']));
 
        if($post_type === 'net-comment') {
@@ -351,7 +355,7 @@ function item_post(&$a) {
                                $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
                                if(! strlen($image_uri))
                                        continue;
-                               $srch = '<' . intval($profile_uid) . '>';
+                               $srch = '<' . intval($contact_record['id']) . '>';
                                $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
                                        AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
                                        dbesc($srch),
@@ -445,9 +449,28 @@ function item_post(&$a) {
                $tags[] = '@' . $parent_contact['nick'];
        }               
 
+       $tagged = array();
+
+
        if(count($tags)) {
                foreach($tags as $tag) {
-                       handle_tag($a, $body, $inform, $str_tags, $profile_uid, $tag); 
+
+                       // If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
+                       // Robert Johnson should be first in the $tags array
+
+                       $fullnametagged = false;
+                       for($x = 0; $x < count($tagged); $x ++) {
+                               if(stristr($tagged[$x],$tag . ' ')) {
+                                       $fullnametagged = true;
+                                       break;
+                               }
+                       }
+                       if($fullnametagged)
+                               continue;
+
+                       $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); 
+                       if($success)
+                               $tagged[] = $tag;
                }
        }
 
@@ -760,7 +783,7 @@ function item_post(&$a) {
        }
        else {
                logger('mod_item: unable to retrieve post that was just stored.');
-               notify( t('System error. Post not saved.'));
+               notice( t('System error. Post not saved.') . EOL);
                goaway($a->get_baseurl() . "/" . $return_path );
                // NOTREACHED
        }
@@ -862,21 +885,27 @@ function item_content(&$a) {
  * @param unknown_type $str_tags string to add the tag to
  * @param unknown_type $profile_uid
  * @param unknown_type $tag the tag to replace
+ *
+ * @return boolean true if replaced, false if not replaced
  */
 function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
+
+       $replaced = false;
+
        //is it a hash tag? 
        if(strpos($tag,'#') === 0) {
                //if the tag is replaced...
                if(strpos($tag,'[url='))
                        //...do nothing
-                       return;
+                       return $replaced;
                //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]';
+               $newtag = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
                //replace tag by the link
                $body = str_replace($tag, $newtag, $body);
-       
+               $replaced = true;
+
                //is the link already in str_tags?
                if(! stristr($str_tags,$newtag)) {
                        //append or set str_tags
@@ -884,13 +913,13 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
                                $str_tags .= ',';
                        $str_tags .= $newtag;
                }
-               return;
+               return $replaced;
        }
        //is it a person tag? 
        if(strpos($tag,'@') === 0) {
                //is it already replaced? 
                if(strpos($tag,'[url='))
-                       return;
+                       return $replaced;
                $stat = false;
                //get the person's name
                $name = substr($tag,1);
@@ -966,6 +995,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
                }
                //if there is an url for this persons profile
                if(isset($profile)) {
+                       $replaced = true;
                        //create profile link
                        $profile = str_replace(',','%2c',$profile);
                        $newtag = '@[url=' . $profile . ']' . $newname  . '[/url]';
@@ -990,4 +1020,6 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
                        }
                }
        }
+
+       return $replaced;       
 }