harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepare for multiple content types

Browse Source
This commit is contained in:
friendica 2013-03-14 22:21:38 -07:00
parent 580acc5445
commit 6a4170ab01
2 changed files with 33 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
mod/item.php
View File

@ -242,10 +242,10 @@ function item_post(&$a) {
$str_contact_deny = perms2str($_REQUEST['contact_deny']);
}
$title = escape_tags(trim($_REQUEST['title']));
$location = notags(trim($_REQUEST['location']));
$coord = notags(trim($_REQUEST['coord']));
$verb = notags(trim($_REQUEST['verb']));
$title = escape_tags(trim($_REQUEST['title']));
$body = escape_tags(trim($_REQUEST['body']));
$private = (
@ -291,13 +291,25 @@ function item_post(&$a) {
// expire_quantity, e.g. '3'
// expire_units, e.g. days, weeks, months
if(x($_REQUEST,'expire_quantity') && (x($_REQUEST,'expire_units'))) {
$expire = datetime_convert(date_default_timezone_get(),'UTC', 'now + ' . $_REQUEST['expire_quantity'] . ' ' . $_REQUEST['expire_units']);
$expire = datetime_convert('UTC','UTC', 'now + ' . $_REQUEST['expire_quantity'] . ' ' . $_REQUEST['expire_units']);
if($expires <= datetime_convert())
$expires = '0000-00-00 00:00:00';
}
}
$post_type = notags(trim($_REQUEST['type']));
$content_type = notags(trim($_REQUEST['content_type']));
if(! $content_type)
$content_type = 'text/bbcode';
// BBCODE alert: the following functions assume bbcode input
// and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
// we may need virtual or template classes to implement the possible alternatives
// 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.
@ -308,60 +320,6 @@ function item_post(&$a) {
}
// get contact info for poster
/*
$author = null;
$self = false;
$contact_id = 0;
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'])
);
}
elseif(remote_user()) {
if(is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) {
if($v['uid'] == $profile_uid) {
$contact_id = $v['cid'];
break;
}
}
}
if($contact_id) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($contact_id)
);
}
}
if(count($r)) {
// FIXME
$author = $r[0];
$contact_id = $author['id'];
}
// get contact info for owner
if($profile_uid == local_user()) {
$contact_record = $author;
}
else {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval($profile_uid)
);
if(count($r))
$contact_record = $r[0];
}
*/
$post_type = notags(trim($_REQUEST['type']));
/**
*
* When a photo was uploaded into the message using the (profile wall) ajax
@ -445,18 +403,6 @@ function item_post(&$a) {
}
}
if(strlen($categories)) {
$cats = explode(',',$categories);
foreach($cats as $cat) {
$post_tags[] = array(
'uid' => $profile_uid,
'type' => TERM_CATEGORY,
'otype' => TERM_OBJ_POST,
'term' => trim($cat),
'url' => ''
);
}
}
// logger('post_tags: ' . print_r($post_tags,true));
@ -489,6 +435,23 @@ function item_post(&$a) {
}
}
// BBCODE end alert
if(strlen($categories)) {
$cats = explode(',',$categories);
foreach($cats as $cat) {
$post_tags[] = array(
'uid' => $profile_uid,
'type' => TERM_CATEGORY,
'otype' => TERM_OBJ_POST,
'term' => trim($cat),
'url' => ''
);
}
}
$item_flags = ITEM_UNSEEN;
$item_restrict = ITEM_VISIBLE;
@ -504,7 +467,6 @@ function item_post(&$a) {
if($webpage)
$item_restrict = $item_restrict | ITEM_WEBPAGE;
if(! strlen($verb))
@ -542,6 +504,7 @@ function item_post(&$a) {
$datarray['changed'] = datetime_convert();
$datarray['uri'] = $uri;
$datarray['parent_uri'] = $parent_uri;
$datarray['mimetype'] = $content_type;
$datarray['title'] = $title;
$datarray['body'] = $body;
$datarray['app'] = $app;

2
version.inc
View File

@ -1 +1 @@
2013-03-13.251
2013-03-14.252