Continued with coding convention:

- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- 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/like.php b/include/like.php
index b04b9b4e0991540366cc3e9a18f27d377357f1ab..94ff33a6996f4dd204993923117d9e17fe072fa1 100644 (file)
--- a/include/like.php
+++ b/include/like.php
@@ -66,7 +66,7 @@ function do_like($item_id, $verb) {
 
        $owner_uid = $item['uid'];
 
-       if(! can_write_wall($a,$owner_uid)) {
+       if (! can_write_wall($a,$owner_uid)) {
                return false;
        }
 
@@ -81,8 +81,9 @@ function do_like($item_id, $verb) {
                if (! dbm::is_result($r)) {
                        return false;
                }
-               if(! $r[0]['self'])
+               if (! $r[0]['self']) {
                        $remote_owner = $r[0];
+               }
        }
 
        // this represents the post owner on this system.
@@ -91,21 +92,22 @@ function do_like($item_id, $verb) {
                WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
                intval($owner_uid)
        );
-       if (dbm::is_result($r))
+       if (dbm::is_result($r)) {
                $owner = $r[0];
+       }
 
-       if(! $owner) {
+       if (! $owner) {
                logger('like: no owner');
                return false;
        }
 
-       if(! $remote_owner)
+       if (! $remote_owner) {
                $remote_owner = $owner;
-
+       }
 
        // This represents the person posting
 
-       if((local_user()) && (local_user() == $owner_uid)) {
+       if ((local_user()) && (local_user() == $owner_uid)) {
                $contact = $owner;
        }
        else {
@@ -116,7 +118,7 @@ function do_like($item_id, $verb) {
                if (dbm::is_result($r))
                        $contact = $r[0];
        }
-       if(! $contact) {
+       if (! $contact) {
                return false;
        }
 
@@ -125,7 +127,7 @@ function do_like($item_id, $verb) {
 
        // event participation are essentially radio toggles. If you make a subsequent choice,
        // we need to eradicate your first choice.
-       if($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) {
+       if ($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) {
                $verbs = " '" . dbesc(ACTIVITY_ATTEND) . "','" . dbesc(ACTIVITY_ATTENDNO) . "','" . dbesc(ACTIVITY_ATTENDMAYBE) . "' ";
        }
 
@@ -162,8 +164,9 @@ function do_like($item_id, $verb) {
        $uri = item_new_uri($a->get_hostname(),$owner_uid);
 
        $post_type = (($item['resource-id']) ? t('photo') : t('status'));
-       if($item['object-type'] === ACTIVITY_OBJ_EVENT)
+       if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
                $post_type = t('event');
+       }
        $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
        $link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
        $body = $item['body'];
@@ -179,20 +182,31 @@ function do_like($item_id, $verb) {
                <content>$body</content>
        </object>
 EOT;
-       if($verb === 'like')
+       if ($verb === 'like') {
                $bodyverb = t('%1$s likes %2$s\'s %3$s');
-       if($verb === 'dislike')
+       }
+       if ($verb === 'dislike') {
                $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
-       if($verb === 'attendyes')
+       }
+       if ($verb === 'attendyes') {
                $bodyverb = t('%1$s is attending %2$s\'s %3$s');
-       if($verb === 'attendno')
+       }
+       if ($verb === 'attendno') {
                $bodyverb = t('%1$s is not attending %2$s\'s %3$s');
-       if($verb === 'attendmaybe')
+       }
+       if ($verb === 'attendmaybe') {
                $bodyverb = t('%1$s may attend %2$s\'s %3$s');
+       }
 
-       if(! isset($bodyverb))
-                       return false;
+       if (! isset($bodyverb)) {
+               return false;
+       }
+
+       $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+       $alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+       $plink = '[url=' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
 
+       /// @TODO Or rewrite this to multi-line initialization of the array?
        $arr = array();
 
        $arr['guid'] = get_guid(32);
@@ -212,12 +226,7 @@ EOT;
        $arr['author-name'] = $contact['name'];
        $arr['author-link'] = $contact['url'];
        $arr['author-avatar'] = $contact['thumb'];
-
-       $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
-       $alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-       $plink = '[url=' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
        $arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
-
        $arr['verb'] = $activity;
        $arr['object-type'] = $objtype;
        $arr['object'] = $obj;
@@ -231,7 +240,7 @@ EOT;
 
        $post_id = item_store($arr);
 
-       if(! $item['visible']) {
+       if (! $item['visible']) {
                $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
                        intval($item['id']),
                        intval($owner_uid)

diff --git a/mod/item.php b/mod/item.php
index 487ddee916c3596bc34614528e87c4fbb69ea2a7..2080bb1653438016268221ba78b2755f37de9402 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -646,8 +646,9 @@ function item_post(App &$a) {
                                intval($mtch)
                        );
                        if (dbm::is_result($r)) {
-                               if(strlen($attachments))
+                               if (strlen($attachments)) {
                                        $attachments .= ',';
+                               }
                                $attachments .= '[attach]href="' . App::get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
                        }
                        $body = str_replace($match[1],'',$body);
@@ -656,14 +657,17 @@ function item_post(App &$a) {
 
        $wall = 0;
 
-       if($post_type === 'wall' || $post_type === 'wall-comment')
+       if ($post_type === 'wall' || $post_type === 'wall-comment') {
                $wall = 1;
+       }
 
-       if(! strlen($verb))
+       if (! strlen($verb)) {
                $verb = ACTIVITY_POST ;
+       }
 
-       if ($network == "")
+       if ($network == "") {
                $network = NETWORK_DFRN;
+       }
 
        $gravity = (($parent) ? 6 : 0 );
 
@@ -677,8 +681,9 @@ function item_post(App &$a) {
        $uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid, $guid));
 
        // Fallback so that we alway have a thr-parent
-       if(!$thr_parent)
+       if (!$thr_parent) {
                $thr_parent = $uri;
+       }
 
        $datarray = array();
        $datarray['uid']           = $profile_uid;

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 33255f0fa4214e6c1df1dbb8897c3f778b598368..758ce8ba5316f1b889d605543d48892629a5aa43 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -26,7 +26,6 @@ function noscrape_init(App &$a) {
        $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
        $keywords = explode(',', $keywords);
 
-       /// @TODO This query's result is not being used (see below), maybe old-lost code?
        $r = q("SELECT `photo` FROM `contact` WHERE `self` AND `uid` = %d",
                intval($a->profile['uid']));
 

diff --git a/mod/settings.php b/mod/settings.php
index 515a97c14dc2c5e30e5e9c8e6627e297a093e7df..3c0087fafae02783ebd9444eb437f85b92278e98 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -627,7 +627,7 @@ function settings_post(App &$a) {
                );
        }
 
-       if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
+       if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
                // Update global directory in background
                $url = $_SESSION['my_url'];
                if ($url && strlen(get_config('system','directory'))) {
@@ -642,10 +642,10 @@ function settings_post(App &$a) {
        update_gcontact_for_user(local_user());
 
        //$_SESSION['theme'] = $theme;
-       if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
+       if ($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
 
-               // FIXME - set to un-verified, blocked and redirect to logout
-               // Why? Are we verifying people or email addresses?
+               /// @TODO set to un-verified, blocked and redirect to logout
+               /// @TODO Why? Are we verifying people or email addresses?
 
        }
 

diff --git a/mod/starred.php b/mod/starred.php
index 0a78f51aa7ecd00d7b701f1ee4021a22ac0e5655..b100c0bff1c7dfad24fd1fc5998fdba21d7bb05d 100644 (file)
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -17,7 +17,7 @@ function starred_init(App &$a) {
                killme();
        }
 
-       $r = q("SELECT starred FROM item WHERE uid = %d AND id = %d LIMIT 1",
+       $r = q("SELECT `starred` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
                intval(local_user()),
                intval($message_id)
        );
@@ -25,10 +25,11 @@ function starred_init(App &$a) {
                killme();
        }
 
-       if(! intval($r[0]['starred']))
+       if (! intval($r[0]['starred'])) {
                $starred = 1;
+       }
 
-       $r = q("UPDATE item SET starred = %d WHERE uid = %d and id = %d",
+       $r = q("UPDATE `item` SET `starred` = %d WHERE `uid` = %d AND `id` = %d",
                intval($starred),
                intval(local_user()),
                intval($message_id)
@@ -38,10 +39,14 @@ function starred_init(App &$a) {
 
        // See if we've been passed a return path to redirect to
        $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
-       if($return_path) {
+       if ($return_path) {
                $rand = '_=' . time();
-               if(strpos($return_path, '?')) $rand = "&$rand";
-               else $rand = "?$rand";
+               if (strpos($return_path, '?')) {
+                       $rand = "&$rand";
+               }
+               else {
+                       $rand = "?$rand";
+               }
 
                goaway(App::get_baseurl() . "/" . $return_path . $rand);
        }

diff --git a/mod/subthread.php b/mod/subthread.php
index 958f4ba03b65bd831689d9cb4e1fba9bfd7c76b9..a00196825bbe4dfb09bfb0be837f9093f8d9c45a 100644 (file)
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -44,8 +44,9 @@ function subthread_content(App &$a) {
                if (! dbm::is_result($r)) {
                        return;
                }
-               if(! $r[0]['self'])
+               if (! $r[0]['self']) {
                        $remote_owner = $r[0];
+               }
        }
 
        // this represents the post owner on this system. 
@@ -57,18 +58,18 @@ function subthread_content(App &$a) {
        if (dbm::is_result($r))
                $owner = $r[0];
 
-       if(! $owner) {
+       if (! $owner) {
                logger('like: no owner');
                return;
        }
 
-       if(! $remote_owner)
+       if (! $remote_owner)
                $remote_owner = $owner;
 
 
        // This represents the person posting
 
-       if((local_user()) && (local_user() == $owner_uid)) {
+       if ((local_user()) && (local_user() == $owner_uid)) {
                $contact = $owner;
        }
        else {
@@ -79,7 +80,7 @@ function subthread_content(App &$a) {
                if (dbm::is_result($r))
                        $contact = $r[0];
        }
-       if(! $contact) {
+       if (! $contact) {
                return;
        }
 
@@ -103,8 +104,9 @@ function subthread_content(App &$a) {
 EOT;
        $bodyverb = t('%1$s is following %2$s\'s %3$s');
 
-       if(! isset($bodyverb))
-                       return;
+       if (! isset($bodyverb)) {
+               return;
+       }
 
        $arr = array();
 
@@ -144,7 +146,7 @@ EOT;
 
        $post_id = item_store($arr);
 
-       if(! $item['visible']) {
+       if (! $item['visible']) {
                $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
                        intval($item['id']),
                        intval($owner_uid)

diff --git a/mod/tagger.php b/mod/tagger.php
index b1f91d1bc403c3b78e1a6b11cde6baa02c7e81e2..da5c4700f95a69a5adde0f87fd0f57c24ff3f9b1 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -94,8 +94,9 @@ EOT;
 
        $bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
 
-       if(! isset($bodyverb))
-                       return;
+       if (! isset($bodyverb)) {
+               return;
+       }
 
        $termlink = html_entity_decode('⌗') . '[url=' . App::get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
 

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 8379495a2dba75016f8acb9e7f34695d0df86837..2a9a26e37bfd4ead658a459076ae082abfa8f4c9 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -59,7 +59,7 @@ function tagrm_content(App &$a) {
        }
 
        $item = (($a->argc > 1) ? intval($a->argv[1]) : 0);
-       if(! $item) {
+       if (! $item) {
                goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
@@ -87,8 +87,7 @@ function tagrm_content(App &$a) {
        $o .= '<input type="hidden" name="item" value="' . $item . '" />';
        $o .= '<ul>';
 
-
-       foreach($arr as $x) {
+       foreach ($arr as $x) {
                $o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . bbcode($x) . '</input></li>';
        }
 
@@ -98,5 +97,5 @@ function tagrm_content(App &$a) {
        $o .= '</form>';
 
        return $o;
-       
+
 }

diff --git a/mod/xrd.php b/mod/xrd.php
index 02a5d7b23c33270e48603e7bc6a7babde96f42be..a56c7fbdffaa0503a971fd3891a6de7b76960e28 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -41,13 +41,15 @@ function xrd_init(App &$a) {
 
        $profile_url = App::get_baseurl().'/profile/'.$r[0]['nickname'];
 
-       if ($acct)
+       if ($acct) {
                $alias = $profile_url;
+       }
        else {
                $alias = 'acct:'.$r[0]['nickname'].'@'.$a->get_hostname();
 
-               if ($a->get_path())
+               if ($a->get_path()) {
                        $alias .= '/'.$a->get_path();
+               }
        }
 
        $o = replace_macros($tpl, array(
@@ -65,7 +67,7 @@ function xrd_init(App &$a) {
                '$salmen'      => App::get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
                '$subscribe'   => App::get_baseurl() . '/follow?url={uri}',
                '$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
-               '$bigkey'      =>  salmon_key($r[0]['pubkey'])
+               '$bigkey'      => salmon_key($r[0]['pubkey']),
        ));