friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

oembed contsant name, fix dfrnpubdeliver, add 'code' editor button

pull/1/head
Friendika 2011-01-31 23:06:45 -08:00
parent 7dbdf8e6fa
commit 9d561d4471
3 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
include/notifier.php
View File

@ -159,11 +159,12 @@ function notifier_run($argv, $argc){
$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0"); $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0");
if( ! count($r)){ // if( ! count($r)){
return; // return;
} // }
$contacts = $r; if(count($r))
$contacts = $r;
} }
$feed_template = load_view_file('view/atom_feed.tpl'); $feed_template = load_view_file('view/atom_feed.tpl');
@ -258,87 +259,87 @@ function notifier_run($argv, $argc){
$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ", $r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ",
dbesc($recip_str) dbesc($recip_str)
); );
if(! count($r)){
return;
}
// delivery loop // delivery loop
require_once('include/salmon.php'); require_once('include/salmon.php');
foreach($r as $contact) { if(count($r)) {
if($contact['self']) foreach($r as $contact) {
continue; if($contact['self'])
continue;
$deliver_status = 0; $deliver_status = 0;
switch($contact['network']) { switch($contact['network']) {
case 'dfrn': case 'dfrn':
logger('notifier: dfrndelivery: ' . $contact['name']); logger('notifier: dfrndelivery: ' . $contact['name']);
$deliver_status = dfrn_deliver($owner,$contact,$atom); $deliver_status = dfrn_deliver($owner,$contact,$atom);
logger('notifier: dfrn_delivery returns ' . $deliver_status);
if($deliver_status == (-1)) {
logger('notifier: delivery failed: queuing message');
// queue message for redelivery
q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
VALUES ( %d, '%s', '%s', '%s') ",
intval($contact['id']),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($atom)
);
}
break;
case 'stat':
if($followup && $contact['notify']) {
logger('notifier: slapdelivery: ' . $contact['name']);
$deliver_status = slapper($owner,$contact['notify'],$slap);
logger('notifier: dfrn_delivery returns ' . $deliver_status);
if($deliver_status == (-1)) { if($deliver_status == (-1)) {
logger('notifier: delivery failed: queuing message');
// queue message for redelivery // queue message for redelivery
q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
VALUES ( %d, '%s', '%s', '%s') ", VALUES ( %d, '%s', '%s', '%s') ",
intval($contact['id']), intval($contact['id']),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($slap) dbesc($atom)
); );
}
break;
case 'stat':
if($followup && $contact['notify']) {
logger('notifier: slapdelivery: ' . $contact['name']);
$deliver_status = slapper($owner,$contact['notify'],$slap);
if($deliver_status == (-1)) {
// queue message for redelivery
q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
VALUES ( %d, '%s', '%s', '%s') ",
intval($contact['id']),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($slap)
);
}
} }
else {
// only send salmon if public - e.g. if it's ok to notify
// a public hub, it's ok to send a salmon
} if(count($slaps) && $notify_hub) {
else { logger('notifier: slapdelivery: ' . $contact['name']);
foreach($slaps as $slappy) {
// only send salmon if public - e.g. if it's ok to notify if($contact['notify']) {
// a public hub, it's ok to send a salmon $deliver_status = slapper($owner,$contact['notify'],$slappy);
if($deliver_status == (-1)) {
if(count($slaps) && $notify_hub) { // queue message for redelivery
logger('notifier: slapdelivery: ' . $contact['name']); q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
foreach($slaps as $slappy) { VALUES ( %d, '%s', '%s', '%s') ",
if($contact['notify']) { intval($contact['id']),
$deliver_status = slapper($owner,$contact['notify'],$slappy); dbesc(datetime_convert()),
if($deliver_status == (-1)) { dbesc(datetime_convert()),
// queue message for redelivery dbesc($slappy)
q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) );
VALUES ( %d, '%s', '%s', '%s') ", }
intval($contact['id']),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($slappy)
);
} }
} }
} }
} }
} break;
break; case 'mail':
case 'mail': case 'dspr':
case 'dspr': case 'feed':
case 'feed': default:
default: break;
break; }
} }
} }
@ -382,7 +383,6 @@ function notifier_run($argv, $argc){
$max_allowed = ((get_config('system','maxpubdeliver') === false) ? 150 : intval(get_config('system','maxdeliver'))); $max_allowed = ((get_config('system','maxpubdeliver') === false) ? 150 : intval(get_config('system','maxdeliver')));
/** /**
* *
* Only get the bare essentials and go back for the full record. * Only get the bare essentials and go back for the full record.
@ -397,7 +397,8 @@ function notifier_run($argv, $argc){
intval(REL_FAN) intval(REL_FAN)
); );
if((count($r)) && ($max_allowed < count($r))) { if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) {
foreach($r as $rr) { foreach($r as $rr) {
/* Don't deliver to folks who have already been delivered to */ /* Don't deliver to folks who have already been delivered to */
@ -406,6 +407,7 @@ function notifier_run($argv, $argc){
$n = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", $n = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($rr['id']) intval($rr['id'])
); );
if(count($n)) { if(count($n)) {
logger('notifier: dfrnpubdelivery: ' . $n[0]['name']); logger('notifier: dfrnpubdelivery: ' . $n[0]['name']);

2
include/oembed.php
View File

@ -56,7 +56,7 @@ function oembed_bbcode2html($text){
if ($stopoembed == true){ if ($stopoembed == true){
return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>". t('Embedding disabled') ." : $1</i><!-- /oembed $1 -->" ,$text); return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>". t('Embedding disabled') ." : $1</i><!-- /oembed $1 -->" ,$text);
} }
return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text); return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", 'oembed_replacecb' ,$text);
} }

2
view/en/jot-header.tpl
View File

@ -9,7 +9,7 @@ tinyMCE.init({
mode : "specific_textareas", mode : "specific_textareas",
editor_selector: /(profile-jot-text|prvmail-text)/, editor_selector: /(profile-jot-text|prvmail-text)/,
plugins : "bbcode,paste", plugins : "bbcode,paste",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "", theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "", theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top", theme_advanced_toolbar_location : "top",