X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fmessage.php;h=0c1ffff7cfaeec71ca374195f2d47af37e3b6216;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=ea2fcef3bcb213e24ed280b844f05c90507d3f91;hpb=e54ee2e5091eafe7fa22baa213a798f9e6f58b01;p=friendica.git

diff --git a/include/message.php b/include/message.php
index ea2fcef3bc..0c1ffff7cf 100644
--- a/include/message.php
+++ b/include/message.php
@@ -1,17 +1,16 @@
 <?php
 
-	// send a private message
-
-
+// send a private message
 
+use Friendica\App;
 
 function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
 	$a = get_app();
 
-	if(! $recipient) return -1;
+	if (! $recipient) return -1;
 
-	if(! strlen($subject))
+	if (! strlen($subject))
 		$subject = t('[no subject]');
 
 	$me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
@@ -22,19 +21,19 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 			intval(local_user())
 	);
 
-	if(! (count($me) && (count($contact)))) {
+	if (! (count($me) && (count($contact)))) {
 		return -2;
 	}
 
 	$guid = get_guid(32);
- 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
+ 	$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
 
 	$convid = 0;
 	$reply = false;
 
 	// look for any existing conversation structure
 
-	if(strlen($replyto)) {
+	if (strlen($replyto)) {
 		$reply = true;
 		$r = q("select convid from mail where uid = %d and ( uri = '%s' or `parent-uri` = '%s' ) limit 1",
 			intval(local_user()),
@@ -45,7 +44,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 			$convid = $r[0]['convid'];
 	}
 
-	if(! $convid) {
+	if (! $convid) {
 
 		// create a new conversation
 
@@ -53,7 +52,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		$recip_host = substr($recip_host,0,strpos($recip_host,'/'));
 
 		$recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
-		$sender_handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+		$sender_handle = $a->user['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
 
 		$conv_guid = get_guid(32);
 		$convuri = $recip_handle.':'.$conv_guid;
@@ -78,12 +77,12 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 			$convid = $r[0]['id'];
 	}
 
-	if(! $convid) {
+	if (! $convid) {
 		logger('send message: conversation not found.');
 		return -4;
 	}
 
-	if(! strlen($replyto)) {
+	if (! strlen($replyto)) {
 		$replyto = $convuri;
 	}
 
@@ -109,7 +108,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 	);
 
 
-	$r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
+	$r = q("SELECT * FROM `mail` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 		dbesc($uri),
 		intval(local_user())
 	);
@@ -130,12 +129,13 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
 	$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) {
-				if(! stristr($image,$a->get_baseurl() . '/photo/'))
+		if (count($images)) {
+			foreach ($images as $image) {
+				if (! stristr($image,App::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'
@@ -149,7 +149,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		}
 	}
 
-	if($post_id) {
+	if ($post_id) {
 		proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id);
 		return intval($post_id);
 	} else {
@@ -158,36 +158,33 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
 }
 
-
-
-
-
 function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
-	$a = get_app();
-
-
-	if(! $recipient) return -1;
+	if (! $recipient) {
+		return -1;
+	}
 
-	if(! strlen($subject))
+	if (! strlen($subject)) {
 		$subject = t('[no subject]');
+	}
 
 	$guid = get_guid(32);
- 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
+ 	$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
 
 	$convid = 0;
 	$reply = false;
 
-	require_once('include/Scrape.php');
+	require_once 'include/probe.php';
 
 	$me = probe_url($replyto);
 
-	if(! $me['name'])
+	if (! $me['name']) {
 		return -2;
+	}
 
 	$conv_guid = get_guid(32);
 
-	$recip_handle = $recipient['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+	$recip_handle = $recipient['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
 
 	$sender_nick = basename($replyto);
 	$sender_host = substr($replyto,strpos($replyto,'://')+3);
@@ -196,7 +193,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
 	$handles = $recip_handle . ';' . $sender_handle;
 
-	$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
+	$r = q("INSERT INTO `conv` (`uid`,`guid`,`creator`,`created`,`updated`,`subject`,`recips`) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
 		intval($recipient['uid']),
 		dbesc($conv_guid),
 		dbesc($sender_handle),
@@ -206,18 +203,19 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 		dbesc($handles)
 	);
 
-	$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
+	$r = q("SELECT * FROM `conv` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
 		dbesc($conv_guid),
 		intval($recipient['uid'])
 	);
-	if (dbm::is_result($r))
-		$convid = $r[0]['id'];
 
-	if(! $convid) {
+
+	if (! dbm::is_result($r)) {
 		logger('send message: conversation not found.');
 		return -4;
 	}
 
+	$convid = $r[0]['id'];
+
 	$r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
 		`contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`)
 		VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )",