clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:fabrixxm/friendika

This commit is contained in:
fabrixxm 2011-02-01 18:46:28 +01:00
parent 0bec0fc5fb 042aa2e169
commit 58e0129433
5 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/notifier.php
View File

@ -159,10 +159,11 @@ 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;
} // }
if(count($r))
$contacts = $r; $contacts = $r;
} }
@ -258,13 +259,12 @@ 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');
if(count($r)) {
foreach($r as $contact) { foreach($r as $contact) {
if($contact['self']) if($contact['self'])
continue; continue;
@ -341,6 +341,7 @@ function notifier_run($argv, $argc){
break; break;
} }
} }
}
// send additional slaps to mentioned remote tags (@foo@example.com) // send additional slaps to mentioned remote tags (@foo@example.com)
@ -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
tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js vendored
View File

@ -36,7 +36,7 @@ link_desc:"Insert/edit link",
unlink_desc:"Unlink", unlink_desc:"Unlink",
image_desc:"Insert/edit image", image_desc:"Insert/edit image",
cleanup_desc:"Cleanup messy code", cleanup_desc:"Cleanup messy code",
code_desc:"Edit HTML Source", code_desc:"Edit BBcode Source",
sub_desc:"Subscript", sub_desc:"Subscript",
sup_desc:"Superscript", sup_desc:"Superscript",
hr_desc:"Insert horizontal ruler", hr_desc:"Insert horizontal ruler",

2
tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js vendored
View File

@ -10,7 +10,7 @@ about_version:"Version",
about_loaded:"Loaded plugins", about_loaded:"Loaded plugins",
anchor_title:"Insert/edit anchor", anchor_title:"Insert/edit anchor",
anchor_name:"Anchor name", anchor_name:"Anchor name",
code_title:"HTML Source Editor", code_title:"BBcode Source Editor",
code_wordwrap:"Word wrap", code_wordwrap:"Word wrap",
colorpicker_title:"Select a color", colorpicker_title:"Select a color",
colorpicker_picker_tab:"Picker", colorpicker_picker_tab:"Picker",

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",