$verb = $orig_post['verb'];
$emailcc = $orig_post['emailcc'];
$app = $orig_post['app'];
-
+ $categories = $orig_post['file'];
$body = escape_tags(trim($_REQUEST['body']));
$private = $orig_post['private'];
$pubmail_enable = $orig_post['pubmail'];
+
}
else {
$coord = notags(trim($_REQUEST['coord']));
$verb = notags(trim($_REQUEST['verb']));
$emailcc = notags(trim($_REQUEST['emailcc']));
-
$body = escape_tags(trim($_REQUEST['body']));
+
+ // $categories = TODO
+
$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
if(($parent_item) &&
}
}
-
if(! strlen($body)) {
if($preview)
killme();
}
}
+ // 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
$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;
if($orig_post) {
- $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
- dbesc($title),
- 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)
dbesc($datarray['attach']),
intval($datarray['bookmark']),
intval($datarray['origin']),
- intval($datarry['moderated'])
+ intval($datarray['moderated'])
);
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
*/
function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
//is it a hash tag?
- if(strpos($tag,'#') === 0) {\r
+ if(strpos($tag,'#') === 0) {
//if the tag is replaced...
if(strpos($tag,'[url='))
- //...do nothing\r
- continue;
- //base tag has the tags name only\r
- $basetag = str_replace('_',' ',substr($tag,1));\r
+ //...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\r
- $body = str_replace($tag, $newtag, $body);\r
+ //replace tag by the link
+ $body = str_replace($tag, $newtag, $body);
- //is the link already in str_tags?\r
- if(! stristr($str_tags,$newtag)) {\r
+ //is the link already in str_tags?
+ if(! stristr($str_tags,$newtag)) {
//append or set str_tags
- if(strlen($str_tags))\r
- $str_tags .= ',';\r
- $str_tags .= $newtag;\r
- }\r
- return;\r
+ if(strlen($str_tags))
+ $str_tags .= ',';
+ $str_tags .= $newtag;
+ }
+ return;
}
- //is it a person tag? \r
- if(strpos($tag,'@') === 0) {\r
+ //is it a person tag?
+ if(strpos($tag,'@') === 0) {
//is it already replaced?
- if(strpos($tag,'[url='))\r
- continue;\r
- $stat = false;\r
+ 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? \r
- if((strpos($name,'@')) || (strpos($name,'http://'))) {\r
- $newname = $name;\r
+ //is it a link or a full dfrn address?
+ if((strpos($name,'@')) || (strpos($name,'http://'))) {
+ $newname = $name;
//get the profile links
- $links = @lrdd($name);\r
- if(count($links)) {\r
+ $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) {\r
- if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')\r
- $profile = $link['@attributes']['href'];\r
- if($link['@attributes']['rel'] === 'salmon') {\r
- if(strlen($inform))\r
- $inform .= ',';\r
- $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);\r
- }\r
- }\r
- }\r
- } else { //if it is a name rather than an address\r
- $newname = $name;\r
- $alias = '';\r
+ 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?\r
- if(strrpos($newname,'+')) {\r
+ //is it some generated name?
+ if(strrpos($newname,'+')) {
//get the id
- $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));\r
+ $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
//remove the next word from tag's name
- if(strpos($name,' ')) {\r
+ if(strpos($name,' ')) {
$name = substr($name,0,strpos($name,' '));
- }\r
+ }
}
if($tagcid) { //if there was an id
- //select contact with that id from the logged in user's contact list\r
- $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",\r
- intval($tagcid),\r
+ //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)
- );\r
+ );
} elseif(strstr($name,'_') || strstr($name,' ')) { //no id
- //get the real name\r
- $newname = str_replace('_',' ',$name);\r
+ //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",\r
- dbesc($newname),\r
- intval($profile_uid)\r
- );\r
+ $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
- $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",\r
- dbesc($name),\r
- dbesc($name),\r
- intval($profile_uid)\r
- );\r
+ //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\r
- if(count($r)) {\r
+ //$r is set, if someone could be selected
+ if(count($r)) {
$profile = $r[0]['url'];
- //set newname to nick, find alias\r
- if($r[0]['network'] === 'stat') {\r
- $newname = $r[0]['nick'];\r
- $stat = true;\r
- if($r[0]['alias'])\r
- $alias = $r[0]['alias'];\r
- }\r
- else\r
- $newname = $r[0]['name'];\r
+ //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
- if(strlen($inform))\r
- $inform .= ',';\r
- $inform .= 'cid:' . $r[0]['id'];\r
- }\r
+ if(strlen($inform))
+ $inform .= ',';
+ $inform .= 'cid:' . $r[0]['id'];
+ }
}
- //if there is an url for this persons profile\r
- if(isset($profile)) {\r
+ //if there is an url for this persons profile
+ if(isset($profile)) {
//create profile link
- $profile = str_replace(',','%2c',$profile);\r
- $newtag = '@[url=' . $profile . ']' . $newname . '[/url]';\r
- $body = str_replace('@' . $name, $newtag, $body);\r
+ $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)) {\r
- if(strlen($str_tags))\r
- $str_tags .= ',';\r
- $str_tags .= $newtag;\r
- }\r
- \r
- // Status.Net seems to require the numeric ID URL in a mention if the person isn't\r
- // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.\r
- \r
- if(strlen($alias)) {\r
- $newtag = '@[url=' . $alias . ']' . $newname . '[/url]';\r
- if(! stristr($str_tags,$newtag)) {\r
- if(strlen($str_tags))\r
- $str_tags .= ',';\r
- $str_tags .= $newtag;\r
- }\r
- }\r
- }\r
+ 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;
+ }
+ }
+ }
}
}
projects / friendica.git / blobdiff