oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Continued rewriting:

Browse source 
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2016-05-01 14:24:44 +02:00
parent 56a2bbc740
commit 3e701b90ac
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
93 changed files with 451 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/notifier.php
View file

@ -314,7 +314,7 @@ function notifier_run(&$argv, &$argc){
intval($uid),
dbesc(NETWORK_DFRN)
);
if(count($r))
if(dba::is_result($r))
foreach($r as $rr)
$recipients_followup[] = $rr['id'];
}
@ -425,7 +425,7 @@ function notifier_run(&$argv, &$argc){
$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
if(count($r))
if(dba::is_result($r))
$contacts = $r;
} else
@ -443,7 +443,7 @@ function notifier_run(&$argv, &$argc){
intval($uid),
dbesc(NETWORK_MAIL)
);
if(count($r)) {
if(dba::is_result($r)) {
foreach($r as $rr)
$recipients[] = $rr['id'];
}
@ -471,7 +471,7 @@ function notifier_run(&$argv, &$argc){
// delivery loop
if(count($r)) {
if(dba::is_result($r)) {
foreach($r as $contact) {
if(!$contact['self']) {
@ -572,7 +572,7 @@ function notifier_run(&$argv, &$argc){
$r = array_merge($r2,$r1,$r0);
if(count($r)) {
if(dba::is_result($r)) {
logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
// throw everything into the queue in case we get killed