]> git.mxchange.org Git - friendica.git/blobdiff - mod/item.php
Merge branch 'master' of git://github.com/friendika/friendika
[friendica.git] / mod / item.php
index 6120b140bfed38d978cdebf24cd160c0e2845009..98f4ff90c29ce4d40e9b1e3148661f7c0eeb7a0a 100644 (file)
@@ -22,6 +22,15 @@ function item_post(&$a) {
 
        $uid = local_user();
 
+       if(x($_POST,'dropitems')) {
+               require_once('include/items.php');
+               $arr_drop = explode(',',$_POST['dropitems']);
+               drop_items($arr_drop);
+               $json = array('success' => 1);
+               echo json_encode($json);
+               killme();
+       }
+
        call_hooks('post_local_start', $_POST);
 
        $parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
@@ -196,7 +205,7 @@ function item_post(&$a) {
 
        $match = null;
 
-       if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) {
+       if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
                $images = $match[1];
                if(count($images)) {
                        foreach($images as $image) {
@@ -204,13 +213,27 @@ function item_post(&$a) {
                                        continue;
                                $image_uri = substr($image,strrpos($image,'/') + 1);
                                $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
+                               if(! strlen($image_uri))
+                                       continue;
+                               $srch = '<' . intval($profile_uid) . '>';
+                               $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),
+                                       dbesc($image_uri),
+                                       intval($profile_uid)
+                               );
+                               if(! count($r))
+                                       continue;
+
                                $r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
-                                       WHERE `resource-id` = '%s' AND `album` = '%s' ",
+                                       WHERE `resource-id` = '%s' AND `uid` = %d AND `album` = '%s' ",
                                        dbesc($str_contact_allow),
                                        dbesc($str_group_allow),
                                        dbesc($str_contact_deny),
                                        dbesc($str_group_deny),
                                        dbesc($image_uri),
+                                       intval($profile_uid),
                                        dbesc( t('Wall Photos'))
                                );
  
@@ -219,21 +242,21 @@ function item_post(&$a) {
        }
 
 
-       $match = null;
+       $match = false;
 
-       if(preg_match_all("/\[attachment\](.+?)\[\/attachment\]/",$body,$match)) {
+       if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) {
                $attaches = $match[1];
                if(count($attaches)) {
                        foreach($attaches as $attach) {
                                $r = q("SELECT * FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
                                        intval($profile_uid),
-                                       intval($attaches)
+                                       intval($attach)
                                );                              
                                if(count($r)) {
                                        $r = q("UPDATE `attach` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
                                                WHERE `uid` = %d AND `id` = %d LIMIT 1",
                                                intval($profile_uid),
-                                               intval($attaches)
+                                               intval($attach)
                                        );
                                }
                        }
@@ -349,6 +372,7 @@ function item_post(&$a) {
        }
 
        $attachments = '';
+       $match = false;
 
        if(preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) {
                foreach($match[2] as $mtch) {
@@ -359,7 +383,7 @@ function item_post(&$a) {
                        if(count($r)) {
                                if(strlen($attachments))
                                        $attachments .= ',';
-                               $attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" size="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . $r[0]['filename'] . '"[/attach]'; 
+                               $attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" size="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : ' ') . '"[/attach]'; 
                        }
                        $body = str_replace($match[1],'',$body);
                }
@@ -443,7 +467,7 @@ function item_post(&$a) {
        else
                $post_id = 0;
 
-dbg(1);
+
        $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`, 
                `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach` )
@@ -529,27 +553,29 @@ dbg(1);
                                // load the template for private message notifications
                                $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
                                $email_html_body_tpl = replace_macros($tpl,array(
+                                       '$username'     => $user['username'],
                                        '$sitename'             => $a->config['sitename'],                              // name of this site
                                        '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
                                        '$thumb'                => $author['thumb'],                                    // thumbnail url for sender icon
                                        '$email'                => $importer['email'],                                  // email address to send to
-                                       '$url'                  => $author['url'],                                      // full url for the site
-                                       '$from'                 => $from,                                               // name of the person sending the message
+                                       '$url'                  => $author['url'],                                              // full url for the site
+                                       '$from'                 => $from,                                                               // name of the person sending the message
                                        '$body'                 => $msg['htmlversion'],                                 // html version of the message
-                                       '$display'              => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+                                       '$display'              => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
                                ));
                        
                                // load the template for private message notifications
                                $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
                                $email_text_body_tpl = replace_macros($tpl,array(
+                                       '$username'     => $user['username'],
                                        '$sitename'             => $a->config['sitename'],                              // name of this site
                                        '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
                                        '$thumb'                => $author['thumb'],                                    // thumbnail url for sender icon
                                        '$email'                => $importer['email'],                                  // email address to send to
-                                       '$url'                  => $author['url'],                                      // full url for the site
-                                       '$from'                 => $from,                                               // name of the person sending the message
+                                       '$url'                  => $author['url'],                                              // profile url for the author
+                                       '$from'                 => $from,                                                               // name of the person sending the message
                                        '$body'                 => $msg['textversion'],                                 // text version of the message
-                                       '$display'              => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+                                       '$display'              => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
                                ));
 
                                // use the EmailNotification library to send the message
@@ -559,7 +585,7 @@ dbg(1);
                                        t("Administrator@") . $a->get_hostname(),
                                        t("noreply") . '@' . $a->get_hostname(),
                                        $user['email'],
-                                       $from . t(" commented on an item at ") . $a->config['sitename'],
+                                       sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
                                        $email_html_body_tpl,
                                        $email_text_body_tpl
                                );
@@ -595,25 +621,27 @@ dbg(1);
                                // load the template for private message notifications
                                $tpl = load_view_file('view/wall_received_html_body_eml.tpl');
                                $email_html_body_tpl = replace_macros($tpl,array(
+                                       '$username'     => $user['username'],
                                        '$sitename'             => $a->config['sitename'],                              // name of this site
                                        '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
                                        '$thumb'                => $author['thumb'],                                    // thumbnail url for sender icon
-                                       '$url'                  => $author['url'],                                      // full url for the site
-                                       '$from'                 => $from,                                               // name of the person sending the message
+                                       '$url'                  => $author['url'],                                              // full url for the site
+                                       '$from'                 => $from,                                                               // name of the person sending the message
                                        '$body'                 => $msg['htmlversion'],                                 // html version of the message
-                                       '$display'              => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+                                       '$display'              => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
                                ));
                        
                                // load the template for private message notifications
                                $tpl = load_view_file('view/wall_received_text_body_eml.tpl');
                                $email_text_body_tpl = replace_macros($tpl,array(
+                                       '$username'     => $user['username'],
                                        '$sitename'             => $a->config['sitename'],                              // name of this site
                                        '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
                                        '$thumb'                => $author['thumb'],                                    // thumbnail url for sender icon
-                                       '$url'                  => $author['url'],                                      // full url for the site
-                                       '$from'                 => $from,                                               // name of the person sending the message
+                                       '$url'                  => $author['url'],                                              // full url for the site
+                                       '$from'                 => $from,                                                               // name of the person sending the message
                                        '$body'                 => $msg['textversion'],                                 // text version of the message
-                                       '$display'              => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+                                       '$display'              => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
                                ));
 
                                // use the EmailNotification library to send the message
@@ -623,7 +651,7 @@ dbg(1);
                                        t("Administrator@") . $a->get_hostname(),
                                        t("noreply") . '@' . $a->get_hostname(),
                                        $user['email'],
-                                       $from . t(" commented on an item at ") . $a->config['sitename'],
+                                       sprintf( t('%s posted to your profile wall at %s') , $from , $a->config['sitename']),
                                        $email_html_body_tpl,
                                        $email_text_body_tpl
                                );
@@ -716,91 +744,8 @@ function item_content(&$a) {
 
        require_once('include/security.php');
 
-       $uid = local_user();
-
        if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
-
-               // locate item to be deleted
-
-               $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
-                       intval($a->argv[2])
-               );
-
-               if(! count($r)) {
-                       notice( t('Item not found.') . EOL);
-                       goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
-               }
-               $item = $r[0];
-
-               // check if logged in user is either the author or owner of this item
-
-               if(($_SESSION['visitor_id'] == $item['contact-id']) || ($_SESSION['uid'] == $item['uid'])) {
-
-                       // delete the item
-
-                       $r = q("UPDATE `item` SET `deleted` = 1, `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
-                               intval($item['id'])
-                       );
-
-                       // If item is a link to a photo resource, nuke all the associated photos 
-                       // (visitors will not have photo resources)
-                       // This only applies to photos uploaded from the photos page. Photos inserted into a post do not
-                       // generate a resource-id and therefore aren't intimately linked to the item. 
-
-                       if(strlen($item['resource-id'])) {
-                               q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
-                                       dbesc($item['resource-id']),
-                                       intval($item['uid'])
-                               );
-                               // ignore the result
-                       }
-
-                       // If it's the parent of a comment thread, kill all the kids
-
-                       if($item['uri'] == $item['parent-uri']) {
-                               $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' 
-                                       WHERE `parent-uri` = '%s' AND `uid` = %d ",
-                                       dbesc(datetime_convert()),
-                                       dbesc(datetime_convert()),
-                                       dbesc($item['parent-uri']),
-                                       intval($item['uid'])
-                               );
-                               // ignore the result
-                       }
-                       else {
-                               // ensure that last-child is set in case the comment that had it just got wiped.
-                               q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
-                                       dbesc(datetime_convert()),
-                                       dbesc($item['parent-uri']),
-                                       intval($item['uid'])
-                               );
-                               // who is the last child now? 
-                               $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1",
-                                       dbesc($item['parent-uri']),
-                                       intval($item['uid'])
-                               );
-                               if(count($r)) {
-                                       q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
-                                               intval($r[0]['id'])
-                                       );
-                               }       
-                       }
-                       $drop_id = intval($item['id']);
-                       
-                       // send the notification upstream/downstream as the case may be
-
-                       proc_run('php',"include/notifier.php","drop","$drop_id");
-// We seem to lose the return url occasionally. Have not been able to reliably duplicate
-//                     logger('drop_return_url: ' . $_SESSION['return_url']);
-                       goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
-                       //NOTREACHED
-               }
-               else {
-                       notice( t('Permission denied.') . EOL);
-                       goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
-                       //NOTREACHED
-               }
+               require_once('include/items.php');
+               drop_item($a->argv[2]);
        }
 }