|
|
|
@ -139,7 +139,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
|
|
|
|
|
|
|
|
|
|
for($i = 0; $i < count($images); $i++) { |
|
|
|
|
$search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is'; |
|
|
|
|
$replace = '[url=' . z_path() . '/redir/' . $cid |
|
|
|
|
$replace = '[url=' . z_path() . '/redir/' . $cid |
|
|
|
|
. '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ; |
|
|
|
|
|
|
|
|
|
$img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]'); |
|
|
|
@ -256,17 +256,17 @@ function message_content(&$a) {
|
|
|
|
|
|
|
|
|
|
if($r) |
|
|
|
|
info( t('Conversation removed.') . EOL ); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//goaway($a->get_baseurl(true) . '/message' ); |
|
|
|
|
goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(($a->argc > 1) && ($a->argv[1] === 'new')) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$o .= $header; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* $plaintext = false; |
|
|
|
|
if(intval(get_pconfig(local_user(),'system','plaintext'))) |
|
|
|
|
$plaintext = true;*/ |
|
|
|
@ -282,7 +282,7 @@ function message_content(&$a) {
|
|
|
|
|
'$nickname' => $a->user['nickname'], |
|
|
|
|
'$linkurl' => t('Please enter a link URL:') |
|
|
|
|
)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$tpl = get_markup_template('msg-end.tpl'); |
|
|
|
|
$a->page['end'] .= replace_macros($tpl, array( |
|
|
|
|
'$baseurl' => $a->get_baseurl(true), |
|
|
|
@ -290,9 +290,9 @@ function message_content(&$a) {
|
|
|
|
|
'$nickname' => $a->user['nickname'], |
|
|
|
|
'$linkurl' => t('Please enter a link URL:') |
|
|
|
|
)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$preselect = (isset($a->argv[2])?array($a->argv[2]):false); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$prename = $preurl = $preid = ''; |
|
|
|
|
|
|
|
|
@ -306,19 +306,19 @@ function message_content(&$a) {
|
|
|
|
|
$preurl = $r[0]['url']; |
|
|
|
|
$preid = $r[0]['id']; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$prefill = (($preselect) ? $prename : ''); |
|
|
|
|
|
|
|
|
|
// the ugly select box |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); |
|
|
|
|
|
|
|
|
|
$tpl = get_markup_template('prv_message.tpl'); |
|
|
|
|
$o .= replace_macros($tpl,array( |
|
|
|
|
'$header' => t('Send Private Message'), |
|
|
|
|
'$to' => t('To:'), |
|
|
|
|
'$showinputs' => 'true', |
|
|
|
|
'$showinputs' => 'true', |
|
|
|
|
'$prefill' => $prefill, |
|
|
|
|
'$autocomp' => $autocomp, |
|
|
|
|
'$preid' => $preid, |
|
|
|
@ -347,8 +347,8 @@ function message_content(&$a) {
|
|
|
|
|
|
|
|
|
|
$o .= $header; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$r = q("SELECT count(*) AS `total` FROM `mail` |
|
|
|
|
|
|
|
|
|
$r = q("SELECT count(*) AS `total` FROM `mail` |
|
|
|
|
WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", |
|
|
|
|
intval(local_user()), |
|
|
|
|
dbesc($myprofile) |
|
|
|
@ -356,10 +356,10 @@ function message_content(&$a) {
|
|
|
|
|
if(count($r)) |
|
|
|
|
$a->set_pager_total($r[0]['total']); |
|
|
|
|
|
|
|
|
|
$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, |
|
|
|
|
$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, |
|
|
|
|
`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, |
|
|
|
|
count( * ) as count |
|
|
|
|
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` |
|
|
|
|
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` |
|
|
|
|
WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", |
|
|
|
|
intval(local_user()), |
|
|
|
|
// |
|
|
|
@ -394,7 +394,7 @@ function message_content(&$a) {
|
|
|
|
|
$body_e = $rr['body']; |
|
|
|
|
$to_name_e = $rr['name']; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$o .= replace_macros($tpl, array( |
|
|
|
|
'$id' => $rr['id'], |
|
|
|
|
'$from_name' => $partecipants, |
|
|
|
@ -411,7 +411,7 @@ function message_content(&$a) {
|
|
|
|
|
'$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']), |
|
|
|
|
)); |
|
|
|
|
} |
|
|
|
|
$o .= paginate($a); |
|
|
|
|
$o .= paginate($a); |
|
|
|
|
return $o; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -423,13 +423,13 @@ function message_content(&$a) {
|
|
|
|
|
if( local_user() && feature_enabled(local_user(),'richtext') ) |
|
|
|
|
$plaintext = false; |
|
|
|
|
|
|
|
|
|
$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` |
|
|
|
|
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` |
|
|
|
|
$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` |
|
|
|
|
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` |
|
|
|
|
WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1", |
|
|
|
|
intval(local_user()), |
|
|
|
|
intval($a->argv[1]) |
|
|
|
|
); |
|
|
|
|
if(count($r)) { |
|
|
|
|
if(count($r)) { |
|
|
|
|
$contact_id = $r[0]['contact-id']; |
|
|
|
|
$convid = $r[0]['convid']; |
|
|
|
|
|
|
|
|
@ -438,10 +438,10 @@ function message_content(&$a) {
|
|
|
|
|
$sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ", |
|
|
|
|
dbesc($r[0]['parent-uri']), |
|
|
|
|
intval($convid) |
|
|
|
|
); |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` |
|
|
|
|
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` |
|
|
|
|
$messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` |
|
|
|
|
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` |
|
|
|
|
WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC", |
|
|
|
|
intval(local_user()) |
|
|
|
|
); |
|
|
|
@ -522,7 +522,7 @@ function message_content(&$a) {
|
|
|
|
|
'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'), |
|
|
|
|
'ago' => relative_date($message['created']), |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$seen = $message['seen']; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -545,9 +545,9 @@ function message_content(&$a) {
|
|
|
|
|
'$thread_seen' => $seen, |
|
|
|
|
'$delete' => t('Delete conversation'), |
|
|
|
|
'$canreply' => (($unknown) ? false : '1'), |
|
|
|
|
'$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."), |
|
|
|
|
'$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."), |
|
|
|
|
'$mails' => $mails, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// reply |
|
|
|
|
'$header' => t('Send Reply'), |
|
|
|
|
'$to' => t('To:'), |
|
|
|
|