don't allow blocked/unverified users to reset their password.

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 3edbae696e7f686be694e1fb714ce8e2e8c25b3b..f87b6074a8e736d2616f3890cf0a1e71a7a58d8d 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -26,6 +26,8 @@ function item_post(&$a) {
                require_once('include/items.php');
                $arr_drop = explode(',',$_POST['dropitems']);
                drop_items($arr_drop);
+               $json = array('success' => 1);
+               echo json_encode($json);
                killme();
        }
 
@@ -59,6 +61,7 @@ function item_post(&$a) {
 
        $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'])  : '');
 
        if(! can_write_wall($a,$profile_uid)) {
                notice( t('Permission denied.') . EOL) ;
@@ -100,6 +103,7 @@ function item_post(&$a) {
                $coord             = $orig_post['coord'];
                $verb              = $orig_post['verb'];
                $emailcc           = $orig_post['emailcc'];
+               $app                       = $orig_post['app'];
 
                $body              = escape_tags(trim($_POST['body']));
                $private           = $orig_post['private'];
@@ -415,10 +419,12 @@ function item_post(&$a) {
        $datarray['author-avatar'] = $author['thumb'];
        $datarray['created']       = datetime_convert();
        $datarray['edited']        = datetime_convert();
+       $datarray['received']      = datetime_convert();
        $datarray['changed']       = datetime_convert();
        $datarray['uri']           = $uri;
        $datarray['title']         = $title;
        $datarray['body']          = $body;
+       $datarray['app']           = $app;
        $datarray['location']      = $location;
        $datarray['coord']         = $coord;
        $datarray['tag']           = $str_tags;
@@ -440,6 +446,7 @@ function item_post(&$a) {
 
        $datarray['parent']        = $parent;
        $datarray['self']          = $self;
+       $datarray['prvnets']       = $user['prvnets'];
 
        if($orig_post)
                $datarray['edit']      = true;
@@ -467,9 +474,9 @@ function item_post(&$a) {
 
 
        $r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
-               `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, 
+               `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `received`, `changed`, `uri`, `title`, `body`, `app`, `location`, `coord`, 
                `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach` )
-               VALUES( %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', %d, %d, '%s' )",
+               VALUES( %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', %d, %d, '%s' )",
                intval($datarray['uid']),
                dbesc($datarray['type']),
                intval($datarray['wall']),
@@ -483,10 +490,12 @@ function item_post(&$a) {
                dbesc($datarray['author-avatar']),
                dbesc($datarray['created']),
                dbesc($datarray['edited']),
+               dbesc($datarray['received']),
                dbesc($datarray['changed']),
                dbesc($datarray['uri']),
                dbesc($datarray['title']),
                dbesc($datarray['body']),
+               dbesc($datarray['app']),
                dbesc($datarray['location']),
                dbesc($datarray['coord']),
                dbesc($datarray['tag']),
@@ -720,6 +729,8 @@ function item_post(&$a) {
                logger('return: ' . $_POST['return']);
                goaway($a->get_baseurl() . "/" . $_POST['return'] );
        }
+       if($_POST['api_source'])
+               return;
        $json = array('success' => 1);
        if(x($_POST,'jsreload') && strlen($_POST['jsreload']))
                $json['reload'] = $a->get_baseurl() . '/' . $_POST['jsreload'];