aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Contact.php3
-rw-r--r--include/api.php19
2 files changed, 12 insertions, 10 deletions
diff --git a/include/Contact.php b/include/Contact.php
index 4b45a2392..233798181 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -594,7 +594,8 @@ function random_profile() {
if(!$r) return ''; // Couldn't get a random channel
if($checkrandom) {
- if(z_fetch_url($r[0]['xchan_url'])['success'])
+ $x = z_fetch_url($r[0]['xchan_url']);
+ if($x['success'])
return $r[0]['xchan_url'];
else
logger('Random channel turned out to be bad.');
diff --git a/include/api.php b/include/api.php
index aeee95d3b..9954bb67e 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1868,11 +1868,11 @@ require_once('include/items.php');
require_once("include/message.php");
- $r = q("SELECT `id` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
- intval(api_user()),
- dbesc($_POST['screen_name']));
+ $r = q("SELECT `abook_id` FROM `abook` WHERE `abook_channel`=%d ",
+ intval(api_user())
+ );
- $recipient = api_get_user($a, $r[0]['id']);
+ $recipient = api_get_user($a, $r[0]['abook_id']);
$replyto = '';
$sub = '';
if (x($_REQUEST,'replyto')) {
@@ -1925,10 +1925,11 @@ require_once('include/items.php');
if ($page<0) $page=0;
$start = $page*$count;
-
- $profile_url = $a->get_baseurl() . '/channel/' . $a->user['nickname'];
+ $channel = $a->get_channel();
+
+ $profile_url = $a->get_baseurl() . '/channel/' . $channel['channel_address'];
if ($box=="sentbox") {
- $sql_extra = "`from-url`='".dbesc( $profile_url )."'";
+ $sql_extra = "`from_xchan`='".dbesc( $channel['channel_hash'] )."'";
}
elseif ($box=="conversation") {
$sql_extra = "`parent_mid`='".dbesc( $_GET["uri"] ) ."'";
@@ -1937,10 +1938,10 @@ require_once('include/items.php');
$sql_extra = "true";
}
elseif ($box=="inbox") {
- $sql_extra = "`from-url`!='".dbesc( $profile_url )."'";
+ $sql_extra = "`from_xchan`!='".dbesc( $channel['channel_hash'] )."'";
}
- $r = q("SELECT * FROM `mail` WHERE uid=%d AND $sql_extra ORDER BY created DESC LIMIT %d OFFSET %d",
+ $r = q("SELECT * FROM `mail` WHERE channel_id = %d AND $sql_extra ORDER BY created DESC LIMIT %d OFFSET %d",
intval(api_user()),
intval($count), intval($start)
);