]> git.mxchange.org Git - friendica.git/blobdiff - mod/message.php
Merge pull request #161 from tobiasd/master
[friendica.git] / mod / message.php
index c004b3d63b4ec29f34b85a6a0899769ce75963dc..165d638141ce98ac1dcb7bc2b4f6b3af2dc7c7e4 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 
 require_once('include/acl_selectors.php');
+require_once('include/message.php');
 
 function message_post(&$a) {
 
@@ -14,103 +15,22 @@ function message_post(&$a) {
        $body      = ((x($_POST,'body'))      ? escape_tags(trim($_POST['body'])) : '');
        $recipient = ((x($_POST,'messageto')) ? intval($_POST['messageto'])       : 0 );
 
-       if(! $recipient) {
-               notice( t('No recipient selected.') . EOL );
-               return;
-       }
-
-       if(! strlen($subject))
-               $subject = t('[no subject]');
-
-       $me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-               intval(local_user())
-       );
-       $contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($recipient),
-                       intval(local_user())
-       );
-
-       if(! (count($me) && (count($contact)))) {
-               notice( t('Unable to locate contact information.') . EOL );
-               return;
-       }
-
-       $hash = random_string();
-       $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
-
-       if(! strlen($replyto))
-               $replyto = $uri;
-
-       $r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`, 
-               `contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
-               VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )",
-               intval(local_user()),
-               dbesc($me[0]['name']),
-               dbesc($me[0]['thumb']),
-               dbesc($me[0]['url']),
-               intval($recipient),
-               dbesc($subject),
-               dbesc($body),
-               1,
-               0,
-               dbesc($uri),
-               dbesc($replyto),
-               datetime_convert()
-       );
-       $r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
-               dbesc($uri),
-               intval(local_user())
-       );
-       if(count($r))
-               $post_id = $r[0]['id'];
-
-       /**
-        *
-        * When a photo was uploaded into the message using the (profile wall) ajax 
-        * uploader, The permissions are initially set to disallow anybody but the
-        * owner from seeing it. This is because the permissions may not yet have been
-        * set for the post. If it's private, the photo permissions should be set
-        * appropriately. But we didn't know the final permissions on the post until
-        * now. So now we'll look for links of uploaded messages that are in the
-        * post and set them to the same permissions as the post itself.
-        *
-        */
-
-       $match = null;
-
-       if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) {
-               $images = $match[1];
-               if(count($images)) {
-                       foreach($images as $image) {
-                               if(! stristr($image,$a->get_baseurl() . '/photo/'))
-                                       continue;
-                               $image_uri = substr($image,strrpos($image,'/') + 1);
-                               $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
-                               $r = q("UPDATE `photo` SET `allow_cid` = '%s'
-                                       WHERE `resource-id` = '%s' AND `album` = '%s' ",
-                                       dbesc('<' . $recipient . '>'),
-                                       dbesc($image_uri),
-                                       dbesc( t('Wall Photos'))
-                               ); 
-                       }
-               }
-       }
-
-
-
-
-
-       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
        
-       if($post_id) {
-               //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &", array(),$foo));
-               proc_run($php_path,"include/notifier.php","mail","$post_id");
-               notice( t('Message sent.') . EOL );
+       $ret = send_message($recipient, $body, $subject, $replyto);
+
+       switch($ret){
+               case -1:
+                       notice( t('No recipient selected.') . EOL );
+                       break;
+               case -2:
+                       notice( t('Unable to locate contact information.') . EOL );
+                       break;
+               case -3:
+                       notice( t('Message could not be sent.') . EOL );
+               default:
+                       info( t('Message sent.') . EOL );
        }
-       else {
-               notice( t('Message could not be sent.') . EOL );
-       }
-       return;
+
 }
 
 function message_content(&$a) {
@@ -126,7 +46,7 @@ function message_content(&$a) {
        $myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
 
-       $tpl = load_view_file('view/mail_head.tpl');
+       $tpl = get_markup_template('mail_head.tpl');
        $header = replace_macros($tpl, array(
                '$messages' => t('Messages'),
                '$inbox' => t('Inbox'),
@@ -145,7 +65,7 @@ function message_content(&$a) {
                                intval(local_user())
                        );
                        if($r) {
-                               notice( t('Message deleted.') . EOL );
+                               info( t('Message deleted.') . EOL );
                        }
                        goaway($a->get_baseurl() . '/message' );
                }
@@ -161,7 +81,7 @@ function message_content(&$a) {
                                        intval(local_user())
                                );
                                if($r)
-                                       notice( t('Conversation removed.') . EOL );
+                                       info( t('Conversation removed.') . EOL );
                        } 
                        goaway($a->get_baseurl() . '/message' );
                }       
@@ -170,12 +90,18 @@ function message_content(&$a) {
 
        if(($a->argc > 1) && ($a->argv[1] === 'new')) {
                
-               $tpl = load_view_file('view/msg-header.tpl');
-       
-               $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+               $tpl = get_markup_template('msg-header.tpl');
 
-               $select = contact_select('messageto','message-to-select', false, 4, true);
-               $tpl = load_view_file('view/prv_message.tpl');
+               $a->page['htmlhead'] .= replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(),
+                       '$nickname' => $a->user['nickname'],
+                       '$linkurl' => t('Please enter a link URL:')
+               ));
+       
+               $preselect = (isset($a->argv[2])?array($a->argv[2]):false);
+       
+               $select = contact_select('messageto','message-to-select', $preselect, 4, true);
+               $tpl = get_markup_template('prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Private Message'),
                        '$to' => t('To:'),
@@ -221,11 +147,11 @@ function message_content(&$a) {
                        intval($a->pager['itemspage'])
                );
                if(! count($r)) {
-                       notice( t('No messages.') . EOL);
+                       info( t('No messages.') . EOL);
                        return $o;
                }
 
-               $tpl = load_view_file('view/mail_list.tpl');
+               $tpl = get_markup_template('mail_list.tpl');
                foreach($r as $rr) {
                        $o .= replace_macros($tpl, array(
                                '$id' => $rr['id'],
@@ -237,7 +163,7 @@ function message_content(&$a) {
                                '$delete' => t('Delete conversation'),
                                '$body' => $rr['body'],
                                '$to_name' => $rr['name'],
-                               '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'],'D, d M Y - g:i A')
+                               '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A'))
                        ));
                }
                $o .= paginate($a);     
@@ -275,7 +201,7 @@ function message_content(&$a) {
 
                require_once("include/bbcode.php");
 
-               $tpl = load_view_file('view/msg-header.tpl');
+               $tpl = get_markup_template('msg-header.tpl');
        
                $a->page['htmlhead'] .= replace_macros($tpl, array(
                        '$nickname' => $a->user['nickname'],
@@ -283,7 +209,7 @@ function message_content(&$a) {
                ));
 
 
-               $tpl = load_view_file('view/mail_conv.tpl');
+               $tpl = get_markup_template('mail_conv.tpl');
                foreach($messages as $message) {
                        if($message['from-url'] == $myprofile) {
                                $from_url = $myprofile;
@@ -309,7 +235,7 @@ function message_content(&$a) {
                }
                $select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
                $parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
-               $tpl = load_view_file('view/prv_message.tpl');
+               $tpl = get_markup_template('prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Reply'),
                        '$to' => t('To:'),
@@ -328,4 +254,4 @@ function message_content(&$a) {
                return $o;
        }
 
-}
\ No newline at end of file
+}