mail, i18n, etc.
This commit is contained in:
Mike Macgirvin
parent
f83aa6c8a5
commit
b399b20dee
16 changed files with 412 additions and 184 deletions
|
|
@ -234,6 +234,12 @@ function contacts_content(&$a) {
|
|||
break;
|
||||
}
|
||||
|
||||
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
||||
WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
|
||||
intval($_SESSION['uid']));
|
||||
if(count($r))
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
|
||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
|
||||
intval($_SESSION['uid']));
|
||||
|
||||
|
|
@ -275,6 +281,8 @@ function contacts_content(&$a) {
|
|||
));
|
||||
}
|
||||
$o .= '<div id="contact-edit-end"></div>';
|
||||
$o .= paginate($a);
|
||||
|
||||
}
|
||||
return $o;
|
||||
}
|
||||
|
|
@ -46,6 +46,37 @@ dbg(3);
|
|||
$feed->enable_order_by_date(false);
|
||||
$feed->init();
|
||||
|
||||
$ismail = false;
|
||||
|
||||
$rawmail = $feed->get_feed_tags( NAMESPACE_DFRN, 'mail' );
|
||||
if(isset($rawmail[0]['child'][NAMESPACE_DFRN])) {
|
||||
$ismail = true;
|
||||
$base = $rawmail[0]['child'][NAMESPACE_DFRN];
|
||||
|
||||
$msg = array();
|
||||
$msg['uid'] = $importer['uid'];
|
||||
$msg['from-name'] = notags(unxmlify($base['sender'][0]['child'][NAMESPACE_DFRN]['name'][0]['data']));
|
||||
$msg['from-photo'] = notags(unxmlify($base['sender'][0]['child'][NAMESPACE_DFRN]['avatar'][0]['data']));
|
||||
$msg['from-url'] = notags(unxmlify($base['sender'][0]['child'][NAMESPACE_DFRN]['avatar'][0]['data']));
|
||||
$msg['contact-id'] = $importer['id'];
|
||||
$msg['title'] = notags(unxmlify($base['subject'][0]['data']));
|
||||
$msg['body'] = escape_tags(unxmlify($base['content'][0]['data']));
|
||||
$msg['delivered'] = 1;
|
||||
$msg['seen'] = 0;
|
||||
$msg['replied'] = 0;
|
||||
$msg['uri'] = notags(unxmlify($base['id'][0]['data']));
|
||||
$msg['parent-uri'] = notags(unxmlify($base['in-reply-to'][0]['data']));
|
||||
$msg['created'] = datetime_convert(notags(unxmlify('UTC','UTC',$base['sentdate'][0]['data'])));
|
||||
|
||||
$r = q("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg))
|
||||
. "`) VALUES ('" . implode("', '", array_values($msg)) . "')" );
|
||||
|
||||
// send email notification if requested.
|
||||
|
||||
xml_status(0);
|
||||
return;
|
||||
}
|
||||
|
||||
foreach($feed->get_items() as $item) {
|
||||
|
||||
$deleted = false;
|
||||
|
|
|
|||
110
mod/message.php
110
mod/message.php
|
|
@ -7,11 +7,79 @@ function message_init(&$a) {
|
|||
|
||||
}
|
||||
|
||||
function message_post(&$a) {
|
||||
|
||||
if(! local_user()) {
|
||||
notice( t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$replyto = notags(trim($_POST['replyto']));
|
||||
$recipient = intval($_POST['messageto']);
|
||||
$subject = notags(trim($_POST['subject']));
|
||||
$body = escape_tags(trim($_POST['body']));
|
||||
|
||||
if(! $recipient) {
|
||||
notice( t('No recipient selected.') . EOL );
|
||||
return;
|
||||
}
|
||||
|
||||
$me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
||||
intval($_SESSION['uid'])
|
||||
);
|
||||
$contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($recipient),
|
||||
intval($_SESSION['uid'])
|
||||
);
|
||||
|
||||
if(! (count($me) && (count($contact)))) {
|
||||
notice( t('Unable to locate contact information.') . EOL );
|
||||
return;
|
||||
}
|
||||
|
||||
$hash = random_string();
|
||||
$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . $_SESSION['uid'] . ':' . $hash ;
|
||||
|
||||
if(! strlen($replyto))
|
||||
$replyto = $uri;
|
||||
|
||||
$r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`,
|
||||
`contact-id`, `title`, `body`, `delivered`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
|
||||
VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
|
||||
intval($_SESSION['uid']),
|
||||
dbesc($me[0]['name']),
|
||||
dbesc($me[0]['thumb']),
|
||||
dbesc($me[0]['url']),
|
||||
intval($recipient),
|
||||
dbesc($subject),
|
||||
dbesc($body),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
dbesc($uri),
|
||||
dbesc($replyto),
|
||||
datetime_convert()
|
||||
);
|
||||
$r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
|
||||
dbesc($uri),
|
||||
intval($_SESSION['uid'])
|
||||
);
|
||||
if(count($r))
|
||||
$post_id = $r[0]['id'];
|
||||
|
||||
$url = $a->get_baseurl();
|
||||
|
||||
if($post_id) {
|
||||
proc_close(proc_open("php include/notifier.php \"$url\" \"mail\" \"$post_id\" > mail.log &",
|
||||
array(),$foo));
|
||||
notice( t('Message sent.') . EOL );
|
||||
}
|
||||
else {
|
||||
notice( t('Message could not be sent.') . EOL );
|
||||
}
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
function message_content(&$a) {
|
||||
|
||||
|
|
@ -20,16 +88,25 @@ function message_content(&$a) {
|
|||
return;
|
||||
}
|
||||
|
||||
$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
|
||||
|
||||
if(($a->argc > 1) && ($a->argv[1] == 'new')) {
|
||||
|
||||
$tpl = file_get_contents('view/jot-header.tpl');
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
|
||||
|
||||
$select .= contact_select('messageto','message-to-select');
|
||||
$select .= contact_select('messageto','message-to-select', false, 4, true);
|
||||
$tpl = file_get_contents('view/prv_message.tpl');
|
||||
$o = replace_macros($tpl,array(
|
||||
'$select' => $select
|
||||
'$header' => t('Send Private Message'),
|
||||
'$to' => t('To:'),
|
||||
'$subject' => t('Subject:'),
|
||||
'$yourmessage' => t('Your message:'),
|
||||
'$select' => $select,
|
||||
'$upload' => t('Upload photo'),
|
||||
'$insert' => t('Insert web link'),
|
||||
'$wait' => t('Please wait')
|
||||
|
||||
));
|
||||
|
||||
|
|
@ -38,8 +115,19 @@ function message_content(&$a) {
|
|||
|
||||
if($a->argc == 1) {
|
||||
|
||||
$r = q("SELECT * FROM `mail` WHERE `seen` = 0 AND `uid` = %d LIMIT %d , %d ",
|
||||
$r = q("SELECT count(*) AS `total` FROM `mail`
|
||||
WHERE `mail`.`uid` = %d AND `from-url` != '%s' ",
|
||||
intval($_SESSION['uid']),
|
||||
dbesc($myprofile)
|
||||
);
|
||||
if(count($r))
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
|
||||
$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 `from-url` != '%s' LIMIT %d , %d ",
|
||||
intval($_SESSION['uid']),
|
||||
dbesc($myprofile),
|
||||
intval($a->pager['start']),
|
||||
intval($a->pager['itemspage'])
|
||||
);
|
||||
|
|
@ -48,8 +136,20 @@ function message_content(&$a) {
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
$tpl = file_get_contents('view/mail_list.tpl');
|
||||
foreach($r as $rr) {
|
||||
$o .= replace_macros($tpl, array(
|
||||
'$id' => $rr['id'],
|
||||
'$from_name' =>$rr['from-name'],
|
||||
'$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
|
||||
'$from_photo' => $rr['from-photo'],
|
||||
'$subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
|
||||
'$to_name' => $rr['name'],
|
||||
'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'],'D, d M Y - g:i A')
|
||||
));
|
||||
}
|
||||
$o .= paginate($a);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -116,11 +116,12 @@ function settings_post(&$a) {
|
|||
if(! function_exists('settings_content')) {
|
||||
function settings_content(&$a) {
|
||||
|
||||
if((! x($_SESSION['authenticated'])) && (! (x($_SESSION,'uid')))) {
|
||||
$_SESSION['sysmsg'] .= "Permission denied." . EOL;
|
||||
if(! local_user()) {
|
||||
notice( t('Permission denied.') . EOL );
|
||||
return;
|
||||
}
|
||||
|
||||
require_once('view/acl_selectors.php');
|
||||
|
||||
$username = $a->user['username'];
|
||||
$email = $a->user['email'];
|
||||
|
|
@ -159,8 +160,9 @@ function settings_content(&$a) {
|
|||
'$email' => $email,
|
||||
'$nickname_block' => $nickname_block,
|
||||
'$timezone' => $timezone,
|
||||
'$zoneselect' => select_timezone($timezone)
|
||||
));
|
||||
'$zoneselect' => select_timezone($timezone),
|
||||
'$acl_select' => populate_acl()
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ function viewcontacts_content(&$a) {
|
|||
intval($a->profile['uid'])
|
||||
);
|
||||
if(count($r))
|
||||
$a->pager['totalitems'] = $r[0]['total'];
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
|
||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 ORDER BY `name` ASC LIMIT %d , %d ",
|
||||
intval($a->profile['uid']),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue