Merge pull request #3949 from annando/further-information

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

index 040ea76873a5b3fa30c54672b257d17314b57542..4aafa22995667e083bb1f92abd4628280ad26865 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -24,6 +24,7 @@ use Friendica\Model\GlobalContact;
  use Friendica\Network\Probe;
  use Friendica\Object\Contact;
  use Friendica\Protocol\Diaspora;
+use Friendica\Util\Emailer;
  
  require_once 'include/crypto.php';
  require_once 'include/enotify.php';
@@ -33,7 +34,6 @@ require_once 'include/files.php';
  require_once 'include/threads.php';
  require_once 'include/text.php';
  require_once 'include/items.php';
-require_once 'include/Contact.php';
  
  function item_post(App $a) {
  
@@ -147,7 +147,7 @@ function item_post(App $a) {
                         $thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
                         if (DBM::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS)
                                 && (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
-                               $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
+                               $parent_contact = Contact::getDetailsByURL($thrparent[0]["author-link"]);
  
                                 if (!isset($parent_contact["nick"])) {
                                         $probed_contact = Probe::uri($thrparent[0]["author-link"]);
@@ -704,11 +704,11 @@ function item_post(App $a) {
         $datarray['owner-name']    = $contact_record['name'];
         $datarray['owner-link']    = $contact_record['url'];
         $datarray['owner-avatar']  = $contact_record['thumb'];
-       $datarray['owner-id']      = get_contact($datarray['owner-link'], 0);
+       $datarray['owner-id']      = Contact::getIdForURL($datarray['owner-link'], 0);
         $datarray['author-name']   = $author['name'];
         $datarray['author-link']   = $author['url'];
         $datarray['author-avatar'] = $author['thumb'];
-       $datarray['author-id']     = get_contact($datarray['author-link'], 0);
+       $datarray['author-id']     = Contact::getIdForURL($datarray['author-link'], 0);
         $datarray['created']       = datetime_convert();
         $datarray['edited']        = datetime_convert();
         $datarray['commented']     = datetime_convert();
@@ -985,7 +985,7 @@ function item_post(App $a) {
  
  
                 // Store the comment signature information in case we need to relay to Diaspora
-               Diaspora::store_comment_signature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
+               Diaspora::storeCommentSignature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
  
         } else {
                 $parent = $post_id;
@@ -1037,13 +1037,13 @@ function item_post(App $a) {
                                 $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
                                 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),
+                                       'fromName' => $a->user['username'],
+                                       'fromEmail' => $a->user['email'],
+                                       'toEmail' => $addr,
+                                       'replyTo' => $a->user['email'],
+                                       'messageSubject' => $subject,
+                                       'htmlVersion' => $message,
+                                       'textVersion' => html2plain($html.$disclaimer)
                                 );
                                 Emailer::send($params);
                         }