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 <roland@mxchange.org>

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 4c0b610d4615c879792bebd8c7fa88f5e19b48d6..f6c4f947edc4ff5e724fbda2d38da9beb6a7b09c 100644 (file)
--- 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 3d5d4d33ab97daaafe07576260ecc7a77c7dfcab..5bd611f22082dab60d9ad43a21c9076c57c10524 100644 (file)
--- 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;
        }