Merge remote-tracking branch 'friendika-master/master' into iconpopup

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 7615f22bec727ff4ec22b63ba3e8d83296f56221..7f17a362b3cb518770fd5a2ac3994bc11d8825a0 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -2,11 +2,6 @@
 
 require_once('include/acl_selectors.php');
 
-function message_init(&$a) {
-
-
-}
-
 function message_post(&$a) {
 
        if(! local_user()) {
@@ -69,18 +64,47 @@ function message_post(&$a) {
        if(count($r))
                $post_id = $r[0]['id'];
 
-       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+       /**
+        *
+        * 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' AND `uid` = %d ",
+                                       dbesc('<' . $recipient . '>'),
+                                       dbesc($image_uri),
+                                       dbesc( t('Wall Photos')),
+                                       intval(local_user())
+                               ); 
+                       }
+               }
+       }
        
        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");
+               proc_run('php',"include/notifier.php","mail","$post_id");
                notice( t('Message sent.') . EOL );
        }
        else {
                notice( t('Message could not be sent.') . EOL );
        }
        return;
-
 }
 
 function message_content(&$a) {
@@ -141,10 +165,16 @@ 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()));
 
-               $select = contact_select('messageto','message-to-select', false, 4, true);
+               $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 = load_view_file('view/prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Private Message'),
@@ -207,7 +237,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);