update IT strings

[friendica.git] / mod / item.php
diff --git a/mod/item.php b/mod/item.php

index 452ec8a36de917d90b8f18b194895793239782b6..cca40e3a0216de1fcc955349a0175cb4ae3fbe44 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -263,6 +263,10 @@ function item_post(&$a) {
  
                 $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
  
+
+               if($user['hidewall'])
+                       $private = 2;
+
                 // If this is a comment, set the permissions from the parent.
  
                 if($parent_item) {
@@ -762,7 +766,9 @@ function item_post(&$a) {
  
                 if (($cachefile != '') AND !file_exists($cachefile)) {
                         $s = prepare_text($datarray['body']);
+                       $stamp1 = microtime(true);
                         file_put_contents($cachefile, $s);
+                       $a->save_timestamp($stamp1, "file");
                         logger('mod_item: put item '.$r[0]['id'].' into cachefile '.$cachefile);
                 }
  
@@ -889,16 +895,25 @@ function item_post(&$a) {
                                         . '<br />';
                                 $disclaimer .= sprintf( t('You may visit them online at %s'), $a->get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
                                 $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; 
-
-                               $subject  = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
-                               $headers  = 'From: ' . email_header_encode($a->user['username'],'UTF-8') . ' <' . $a->user['email'] . '>' . "\n";
-                               $headers .= 'MIME-Version: 1.0' . "\n";
-                               $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
-                               $headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
+                                if (!$datarray['title']=='') {
+                                    $subject = email_header_encode($datarray['title'],'UTF-8');
+                                } else {
+                                   $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
+                                }
                                 $link = '<a href="' . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
                                 $html    = prepare_body($datarray);
                                 $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
-                               @mail($addr, $subject, $message, $headers);
+                                include_once('include/html2plain.php');
+                                $params = array (
+                                    'fromName' => $a->user['username'],
+                                    'fromEmail' => $a->user['email'],
+                                    'toEmail' => $addr,
+                                    'replyTo' => $a->user['email'],
+                                    'messageSubject' => $subject,
+                                    'htmlVersion' => $message,
+                                    'textVersion' => html2plain($html.$disclaimer),
+                                );
+                                enotify::send($params);
                         }
                 }
         }
@@ -949,10 +964,17 @@ function item_content(&$a) {
  
         require_once('include/security.php');
  
+       $o = '';
         if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
-               require_once('include/items.php');
-               drop_item($a->argv[2]);
+               require_once('include/items.php'); 
+               $o = drop_item($a->argv[2], !is_ajax());
+               if (is_ajax()){
+                       // ajax return: [<item id>, 0 (no perm) | <owner id>] 
+                       echo json_encode(array(intval($a->argv[2]), intval($o)));
+                       kllme();
+               }
         }
+       return $o;
  }
  
  /**