From ca82678a6da703157a95a815d57649af5066397b Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 20 Dec 2016 21:13:50 +0100 Subject: [PATCH] Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder --- include/acl_selectors.php | 6 +++--- include/message.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 4c0b610d4..f6c4f947e 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -272,7 +272,7 @@ function prune_deadguys($arr) { $r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 "); - if ($r) { + if (dbm::is_result($r)) { $ret = array(); foreach ($r as $rr) { $ret[] = intval($rr['id']); @@ -585,9 +585,9 @@ function acl_lookup(&$a, $out_type = 'json') { ); echo json_encode($o); killme(); - } - else + } else { $r = array(); + } if (dbm::is_result($r)) { diff --git a/include/message.php b/include/message.php index 3d5d4d33a..5bd611f22 100644 --- a/include/message.php +++ b/include/message.php @@ -153,7 +153,8 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ if ($post_id) { proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id); return intval($post_id); - } else { + } + else { return -3; }