$tabs = '';
if ($a->argc >1 && is_numeric($a->argv[1])) {
- $tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
+ $tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
}
$new = array(
'label' => t('New Message'),
- 'url' => $a->get_baseurl(true) . '/message/new',
+ 'url' => 'message/new',
'sel'=> ($a->argv[1] == 'new'),
'accesskey' => 'm',
);
$a->argv[1] = 'new';
}
else
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
return;
}
- $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
+ $myprofile = 'profile/' . $a->user['nickname'];
$tpl = get_markup_template('mail_head.tpl');
$header = replace_macros($tpl, array(
}
// Now check how the user responded to the confirmation query
if($_REQUEST['canceled']) {
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
$cmd = $a->argv[1];
info( t('Message deleted.') . EOL );
}
//goaway($a->get_baseurl(true) . '/message' );
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
info( t('Conversation removed.') . EOL );
}
//goaway($a->get_baseurl(true) . '/message' );
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
}
dbesc($myprofile)
);
- if(count($r)) $a->set_pager_total($r[0]['total']);
+ if (dba::is_result($r)) {
+ $a->set_pager_total($r[0]['total']);
+ }
$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
- if(! count($r)) {
+ if(! dba::is_result($r)) {
info( t('No messages.') . EOL);
return $o;
}
$sparkle = '';
}
else {
- $from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
+ $from_url = 'redir/' . $message['contact-id'];
$sparkle = ' sparkle';
}
);
}
-function render_messages($msg, $t) {
+function render_messages(array $msg, $t) {
$a = get_app();
$tpl = get_markup_template($t);
$rslt = '';
+ $myprofile = 'profile/' . $a->user['nickname'];
+
foreach($msg as $rr) {
if($rr['unknown']) {
$rslt .= replace_macros($tpl, array(
'$id' => $rr['id'],
'$from_name' => $participants,
- '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
+ '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
'$sparkle' => ' sparkle',
'$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
'$subject' => $subject_e,