keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

store moderated flag if set

Browse source
This commit is contained in:
friendica 2012-01-29 02:09:39 -08:00
parent 955d2b6d83
commit e43a3a412c
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mod/item.php
View file

@ -4,7 +4,7 @@
* *
* This is the POST destination for most all locally posted * This is the POST destination for most all locally posted
* text stuff. This function handles status, wall-to-wall status, * 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). * (as opposed to being delivered in a feed).
* Also processed here are posts and comments coming through the * Also processed here are posts and comments coming through the
* statusnet/twitter API. * statusnet/twitter API.
@ -42,6 +42,7 @@ function item_post(&$a) {
$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false); $api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
/** /**
* Is this a reply to something? * Is this a reply to something?
@ -56,8 +57,6 @@ function item_post(&$a) {
$parid = 0; $parid = 0;
$r = false; $r = false;
$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
if($parent || $parent_uri) { if($parent || $parent_uri) {
if(! x($_REQUEST,'type')) if(! x($_REQUEST,'type'))
@ -110,8 +109,6 @@ function item_post(&$a) {
if($parent) logger('mod_post: parent=' . $parent); if($parent) logger('mod_post: parent=' . $parent);
$profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
$post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0); $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0);
$app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''); $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : '');
@ -606,6 +603,7 @@ function item_post(&$a) {
$datarray['thr-parent'] = $thr_parent; $datarray['thr-parent'] = $thr_parent;
$datarray['postopts'] = ''; $datarray['postopts'] = '';
$datarray['origin'] = $origin; $datarray['origin'] = $origin;
$datarray['moderated'] = $allow_moderated;
/** /**
* These fields are for the convenience of plugins... * These fields are for the convenience of plugins...
@ -657,8 +655,8 @@ function item_post(&$a) {
$r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, $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`, `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` ) `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 )", 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']), dbesc($datarray['guid']),
intval($datarray['uid']), intval($datarray['uid']),
dbesc($datarray['type']), dbesc($datarray['type']),
@ -695,7 +693,8 @@ function item_post(&$a) {
intval($datarray['pubmail']), intval($datarray['pubmail']),
dbesc($datarray['attach']), dbesc($datarray['attach']),
intval($datarray['bookmark']), intval($datarray['bookmark']),
intval($datarray['origin']) intval($datarray['origin']),
intval($datarry['moderated'])
); );
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",