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/mod/admin.php b/mod/admin.php
index bfc8aef7b62693f6c950ed5f0d8bed0ecaf2d12f..72412f69b439a926b212096c564e14145a5122ad 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1122,7 +1122,7 @@ function admin_page_dbsync(&$a) {
        $failed = array();
        $r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
        if (dbm::is_result($r)) {
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        $upd = intval(substr($rr['k'],7));
                        if($upd < 1139 || $rr['v'] === 'success')
                                continue;

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 773b1ca802367a4d544f2e409d27da9479def1c7..d7f4073b7ee5368b0f4a67b382bf61a687406851 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -49,7 +49,7 @@ function allfriends_content(&$a) {
 
        $id = 0;
 
-       foreach($r as $rr) {
+       foreach ($r as $rr) {
 
                //get further details of the contact
                $contact_details = get_contact_details_by_url($rr['url'], $uid, $rr);

diff --git a/mod/cal.php b/mod/cal.php
index 49706e3989e96f5d4a70219e551ac5047264753d..d49e8f76499a7fff1c15e963c34d924e10e6ef3a 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -229,7 +229,7 @@ function cal_content(&$a) {
 
                if (dbm::is_result($r)) {
                        $r = sort_by_date($r);
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
                                $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
                                if (! x($links,$j)) {
                                        $links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;

diff --git a/mod/common.php b/mod/common.php
index 9781d1607c4f38011ff0e0e081912e63ca51406b..0be8f1d14a7a049493832afbb4264d2ac05fde65 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -100,7 +100,7 @@ function common_content(&$a) {
 
        $id = 0;
 
-       foreach($r as $rr) {
+       foreach ($r as $rr) {
 
                //get further details of the contact
                $contact_details = get_contact_details_by_url($rr['url'], $uid);

diff --git a/mod/contacts.php b/mod/contacts.php
index f9b6f64d86111c8bf4e1752082ef1596aec104ce..b1553393e2aa29cab3ba6d1566093140ac97cab7 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -129,10 +129,12 @@ function contacts_batch_actions(&$a){
                info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
        }
 
-       if(x($_SESSION,'return_url'))
+       if (x($_SESSION,'return_url')) {
                goaway('' . $_SESSION['return_url']);
-       else
+       }
+       else {
                goaway('contacts');
+       }
 
 }
 
@@ -387,7 +389,7 @@ function contacts_content(&$a) {
 
                if($cmd === 'block') {
                        $r = _contact_block($contact_id, $orig_record[0]);
-                       if($r) {
+                       if ($r) {
                                $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
                                info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
                        }
@@ -398,7 +400,7 @@ function contacts_content(&$a) {
 
                if($cmd === 'ignore') {
                        $r = _contact_ignore($contact_id, $orig_record[0]);
-                       if($r) {
+                       if ($r) {
                                $readonly = (($orig_record[0]['readonly']) ? 0 : 1);
                                info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
                        }
@@ -410,7 +412,7 @@ function contacts_content(&$a) {
 
                if($cmd === 'archive') {
                        $r = _contact_archive($contact_id, $orig_record[0]);
-                       if($r) {
+                       if ($r) {
                                $archived = (($orig_record[0]['archive']) ? 0 : 1);
                                info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
                        }
@@ -449,22 +451,26 @@ function contacts_content(&$a) {
                                ));
                        }
                        // Now check how the user responded to the confirmation query
-                       if($_REQUEST['canceled']) {
-                               if(x($_SESSION,'return_url'))
+                       if ($_REQUEST['canceled']) {
+                               if (x($_SESSION,'return_url')) {
                                        goaway('' . $_SESSION['return_url']);
-                               else
+                               }
+                               else {
                                        goaway('contacts');
+                               }
                        }
 
                        _contact_drop($contact_id, $orig_record[0]);
                        info( t('Contact has been removed.') . EOL );
-                       if(x($_SESSION,'return_url'))
+                       if (x($_SESSION,'return_url')) {
                                goaway('' . $_SESSION['return_url']);
-                       else
+                       }
+                       else {
                                goaway('contacts');
+                       }
                        return; // NOTREACHED
                }
-               if($cmd === 'posts') {
+               if ($cmd === 'posts') {
                        return contact_posts($a, $contact_id);
                }
        }

diff --git a/mod/delegate.php b/mod/delegate.php
index 14e542fb4900eb449d370f319d04072f495d9803..1a3f13c763e4738903748dfd2b3a4c3513d53a0d 100644 (file)
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -107,7 +107,7 @@ function delegate_content(&$a) {
        $nicknames = array();
 
        if (dbm::is_result($r)) {
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        $nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
                }
        }

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index e892598b0e8dcff1145adf2788a0e393d4e47c7c..68ef4971b4bd07b31998a9cfb481215a2d4e4638 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -178,7 +178,7 @@ function dfrn_request_post(&$a) {
                                        );
                                }
 
-                               if($r) {
+                               if ($r) {
                                        info( t("Introduction complete.") . EOL);
                                }
 
@@ -301,7 +301,7 @@ function dfrn_request_post(&$a) {
                        dbesc(NETWORK_MAIL2)
                );
                if (dbm::is_result($r)) {
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
                                                intval($rr['cid'])
@@ -326,7 +326,7 @@ function dfrn_request_post(&$a) {
                        dbesc(NETWORK_MAIL2)
                );
                if (dbm::is_result($r)) {
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
                                if(! $rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d",
                                                intval($rr['cid'])

diff --git a/mod/directory.php b/mod/directory.php
index ddea650de2b5796e8c7dbd065c28f44913ba38ad..50a0a93b9ce454e50ec8b604ce5e205e172527ff 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -92,12 +92,14 @@ function directory_content(&$a) {
                        WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
        if (dbm::is_result($r)) {
 
-               if(in_array('small', $a->argv))
+               if (in_array('small', $a->argv)) {
                        $photo = 'thumb';
-               else
+               }
+               else {
                        $photo = 'photo';
+               }
 
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
 
                        $itemurl= '';
 

diff --git a/mod/events.php b/mod/events.php
index 655211774705c3001c213f2ffb8be87b512ee41c..9b5f7cce895c145423a1bca7b6f2e22ccad219c8 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -343,7 +343,7 @@ function events_content(&$a) {
 
                if (dbm::is_result($r)) {
                        $r = sort_by_date($r);
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
                                $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
                                if (! x($links,$j)) {
                                        $links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;

diff --git a/mod/filerm.php b/mod/filerm.php
index c8bf8658bec28f8a3be582ac0b505c709f6e6c52..d3d74a4c2f6b84c0e31e75c08b2877e24db5a845 100644 (file)
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -10,18 +10,21 @@ function filerm_content(&$a) {
        $cat = unxmlify(trim($_GET['cat']));
 
        $category = (($cat) ? true : false);
-       if($category)
+       if ($category) {
                $term = $cat;
+       }
 
        $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
        logger('filerm: tag ' . $term . ' item ' . $item_id);
 
-       if($item_id && strlen($term))
+       if ($item_id && strlen($term)) {
                file_tag_unsave_file(local_user(),$item_id,$term, $category);
+       }
 
-       if(x($_SESSION,'return_url'))
+       if (x($_SESSION,'return_url')) {
                goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
+       }
 
        killme();
 }

diff --git a/mod/follow.php b/mod/follow.php
index 8f8c73c90c0febe7bc1065f13a3200cd692a3297..eb5570e8abc165a451cace1de71b41ac778f5ff6 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -157,8 +157,9 @@ function follow_post(&$a) {
                // NOTREACHED
        }
 
-       if ($_REQUEST['cancel'])
+       if ($_REQUEST['cancel']) {
                goaway($_SESSION['return_url']);
+       }
 
        $uid = local_user();
        $url = notags(trim($_REQUEST['url']));
@@ -170,17 +171,21 @@ function follow_post(&$a) {
 
        $result = new_contact($uid,$url,true);
 
-       if($result['success'] == false) {
-               if($result['message'])
+       if ($result['success'] == false) {
+               if ($result['message']) {
                        notice($result['message']);
+               }
                goaway($return_url);
-       } elseif ($result['cid'])
+       }
+       elseif ($result['cid']) {
                goaway(App::get_baseurl().'/contacts/'.$result['cid']);
+       }
 
        info( t('Contact added').EOL);
 
-       if(strstr($return_url,'contacts'))
+       if (strstr($return_url,'contacts')) {
                goaway(App::get_baseurl().'/contacts/'.$contact_id);
+       }
 
        goaway($return_url);
        // NOTREACHED

diff --git a/mod/group.php b/mod/group.php
index 8a744d1e11c4c8dcf597b78d6ac942c39ee27590..75ccc8f6d92908c506402cf4cbcda4987169d30c 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -25,7 +25,7 @@ function group_post(&$a) {
 
                $name = notags(trim($_POST['groupname']));
                $r = group_add(local_user(),$name);
-               if($r) {
+               if ($r) {
                        info( t('Group created.') . EOL );
                        $r = group_byname(local_user(),$name);
                        if ($r) {

diff --git a/mod/hcard.php b/mod/hcard.php
index 3669863447934785aa9f34fb7fdfd5e64052d9ba..512949f1a3645486313f302cec15c7aa336ab640 100644 (file)
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -4,8 +4,9 @@ function hcard_init(&$a) {
 
        $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
-       if($a->argc > 1)
+       if ($a->argc > 1) {
                $which = $a->argv[1];
+       }
        else {
                notice( t('No profile') . EOL );
                $a->error = 404;
@@ -13,28 +14,30 @@ function hcard_init(&$a) {
        }
 
        $profile = 0;
-       if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
-               $which = $a->user['nickname'];
-               $profile = $a->argv[1];         
+       if ((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
+               $which   = $a->user['nickname'];
+               $profile = $a->argv[1];
        }
 
        profile_load($a,$which,$profile);
 
-       if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
+       if ((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
                $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
        }
-       if(x($a->profile,'openidserver'))                               
+       if (x($a->profile,'openidserver')) {
                $a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
-       if(x($a->profile,'openid')) {
+       }
+       if (x($a->profile,'openid')) {
                $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
                $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
        }
 
-       if(! $blocked) {
+       if (! $blocked) {
                $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
                $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
-               if(strlen($keywords))
+               if (strlen($keywords)) {
                        $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
+               }
        }
 
        $a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
@@ -44,7 +47,7 @@ function hcard_init(&$a) {
        header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
-       foreach($dfrn_pages as $dfrn) {
+       foreach ($dfrn_pages as $dfrn) {
                $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
        }
 

diff --git a/mod/install.php b/mod/install.php
index c5baa17db274f7ed5496692d6b7e9736efff5191..73216e7f882412af21bd3c2699f07aed6945c35e 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -52,7 +52,7 @@ function install_post(&$a) {
                                        $r = q("CREATE DATABASE '%s'",
                                                        dbesc($dbdata)
                                        );
-                                       if($r) {
+                                       if ($r) {
                                                unset($db);
                                                $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
                                        } else {
@@ -520,19 +520,22 @@ function check_smarty3(&$checks) {
 function check_htaccess(&$checks) {
        $status = true;
        $help = "";
-       if (function_exists('curl_init')){
+       if (function_exists('curl_init')) {
                $test = fetch_url(App::get_baseurl()."/install/testrewrite");
 
-               if ($test!="ok")
+               if ($test!="ok") {
                        $test = fetch_url(normalise_link(App::get_baseurl()."/install/testrewrite"));
+               }
 
                if ($test!="ok") {
                        $status = false;
                        $help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
                }
                check_add($checks, t('Url rewrite is working'), $status, true, $help);
-       } else {
+       }
+       else {
                // cannot check modrewrite if libcurl is not installed
+               /// @TODO Maybe issue warning here?
        }
 }
 
@@ -549,7 +552,7 @@ function check_imagik(&$checks) {
        }
        if ($imagick == false) {
                check_add($checks, t('ImageMagick PHP extension is not installed'), $imagick, false, "");
-               }
+       }
        else {
                check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, "");
                if ($imagick) {

diff --git a/mod/invite.php b/mod/invite.php
index ae08c387eb3bf77cb848e92ce367d3599e47ccff..12f8306e8aaaa7540a77f20f2aa348779d00de29 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -116,11 +116,13 @@ function invite_content(&$a) {
 
        $dirloc = get_config('system','directory');
        if(strlen($dirloc)) {
-               if($a->config['register_policy'] == REGISTER_CLOSED)
+               if ($a->config['register_policy'] == REGISTER_CLOSED) {
                        $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/siteinfo');
-               elseif($a->config['register_policy'] != REGISTER_CLOSED)
+               }
+               elseif($a->config['register_policy'] != REGISTER_CLOSED) {
                        $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), App::get_baseurl())
                        . "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/siteinfo');
+               }
        }
        else {
                $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
@@ -129,15 +131,15 @@ function invite_content(&$a) {
 
        $o = replace_macros($tpl, array(
                '$form_security_token' => get_form_security_token("send_invite"),
-               '$invite' => t('Send invitations'),
-               '$addr_text' => t('Enter email addresses, one per line:'),
-               '$msg_text' => t('Your message:'),
-               '$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
+               '$invite'              => t('Send invitations'),
+               '$addr_text'           => t('Enter email addresses, one per line:'),
+               '$msg_text'            => t('Your message:'),
+               '$default_message'     => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
                        . $linktxt
                        . "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') 
                        . "\r\n" . "\r\n" . App::get_baseurl() . '/profile/' . $a->user['nickname']
                        . "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n"  ,
-               '$submit' => t('Submit')
+               '$submit'              => t('Submit')
        ));
 
        return $o;

diff --git a/mod/item.php b/mod/item.php
index c22d4448ad0e0aefe3cee9dc8a59806ff43bba2d..17cf4c6487f97ee08d1cb23c9297c422a8a0715f 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -59,13 +59,14 @@ function item_post(&$a) {
        // Check for doubly-submitted posts, and reject duplicates
        // Note that we have to ignore previews, otherwise nothing will post
        // after it's been previewed
-       if(!$preview && x($_REQUEST['post_id_random'])) {
-               if(x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+       if (!$preview && x($_REQUEST['post_id_random'])) {
+               if (x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
                        logger("item post: duplicate post", LOGGER_DEBUG);
                        item_post_return(App::get_baseurl(), $api_source, $return_path);
                }
-               else
+               else {
                        $_SESSION['post-random'] = $_REQUEST['post_id_random'];
+               }
        }
 
        /**
@@ -82,18 +83,20 @@ function item_post(&$a) {
        $r = false;
        $objecttype = null;
 
-       if($parent || $parent_uri) {
+       if ($parent || $parent_uri) {
 
                $objecttype = ACTIVITY_OBJ_COMMENT;
 
-               if(! x($_REQUEST,'type'))
+               if (! x($_REQUEST,'type')) {
                        $_REQUEST['type'] = 'net-comment';
+               }
 
-               if($parent) {
+               if ($parent) {
                        $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
                                intval($parent)
                        );
-               } elseif($parent_uri && local_user()) {
+               }
+               elseif ($parent_uri && local_user()) {
                        // This is coming from an API source, and we are logged in
                        $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                                dbesc($parent_uri),
@@ -105,7 +108,7 @@ function item_post(&$a) {
                if (dbm::is_result($r)) {
                        $parid = $r[0]['parent'];
                        $parent_uri = $r[0]['uri'];
-                       if($r[0]['id'] != $r[0]['parent']) {
+                       if ($r[0]['id'] != $r[0]['parent']) {
                                $r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
                                        intval($parid)
                                );
@@ -114,8 +117,9 @@ function item_post(&$a) {
 
                if (! dbm::is_result($r)) {
                        notice( t('Unable to locate original post.') . EOL);
-                       if(x($_REQUEST,'return'))
+                       if (x($_REQUEST,'return')) {
                                goaway($return_path);
+                       }
                        killme();
                }
                $parent_item = $r[0];
@@ -125,7 +129,7 @@ function item_post(&$a) {
                //if(($parid) && ($parid != $parent))
                $thr_parent = $parent_uri;
 
-               if($parent_item['contact-id'] && $uid) {
+               if ($parent_item['contact-id'] && $uid) {
                        $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($parent_item['contact-id']),
                                intval($uid)
@@ -448,13 +452,15 @@ function item_post(&$a) {
 
                        $objecttype = ACTIVITY_OBJ_IMAGE;
 
-                       foreach($images as $image) {
-                               if(! stristr($image,App::get_baseurl() . '/photo/'))
+                       foreach ($images as $image) {
+                               if (! stristr($image,App::get_baseurl() . '/photo/')) {
                                        continue;
+                               }
                                $image_uri = substr($image,strrpos($image,'/') + 1);
                                $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
-                               if(! strlen($image_uri))
+                               if (! strlen($image_uri)) {
                                        continue;
+                               }
                                $srch = '<' . intval($contact_id) . '>';
 
                                $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 92e64f7e2e49b235da8547976cb9e3e686e42425..a5ef739cd197564b1e72f9090586009decaa908b 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -102,7 +102,7 @@ function lostpass_content(&$a) {
                        dbesc($new_password_encoded),
                        intval($uid)
                );
-               if($r) {
+               if ($r) {
                        $tpl = get_markup_template('pwdreset.tpl');
                        $o .= replace_macros($tpl,array(
                                '$lbl1' => t('Password Reset'),

diff --git a/mod/message.php b/mod/message.php
index f92635259063d91850fface718c83316363a0f9b..fcf0989ae0773e31fd261536fb276c1a34b18688 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -160,7 +160,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
        $newbody = $newbody . $origbody;
 
        $cnt = 0;
-       foreach($images as $image) {
+       foreach ($images as $image) {
                // We're depending on the property of 'foreach' (specified on the PHP website) that
                // it loops over the array starting from the first element and going sequentially
                // to the last element
@@ -231,7 +231,7 @@ function message_content(&$a) {
                                intval($a->argv[2]),
                                intval(local_user())
                        );
-                       if($r) {
+                       if ($r) {
                                info( t('Message deleted.') . EOL );
                        }
                        //goaway(App::get_baseurl(true) . '/message' );

diff --git a/mod/network.php b/mod/network.php
index ba97148009563a726ec32067f8c9b44f161eaa85..cce511ae19ff66238e2112280effd1274d892d11 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -183,13 +183,13 @@ function saved_searches($search) {
        $saved = array();
 
        if (dbm::is_result($r)) {
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        $saved[] = array(
-                               'id'            => $rr['id'],
-                               'term'          => $rr['term'],
-                               'encodedterm'   => urlencode($rr['term']),
-                               'delete'        => t('Remove term'),
-                               'selected'      => ($search==$rr['term']),
+                               'id'          => $rr['id'],
+                               'term'        => $rr['term'],
+                               'encodedterm' => urlencode($rr['term']),
+                               'delete'      => t('Remove term'),
+                               'selected'    => ($search==$rr['term']),
                        );
                }
        }
@@ -197,10 +197,10 @@ function saved_searches($search) {
 
        $tpl = get_markup_template("saved_searches_aside.tpl");
        $o = replace_macros($tpl, array(
-               '$title'        => t('Saved Searches'),
-               '$add'          => t('add'),
-               '$searchbox'    => search($search,'netsearch-box',$srchurl,true),
-               '$saved'        => $saved,
+               '$title'     => t('Saved Searches'),
+               '$add'       => t('add'),
+               '$searchbox' => search($search,'netsearch-box',$srchurl,true),
+               '$saved'     => $saved,
        ));
 
        return $o;

diff --git a/mod/nogroup.php b/mod/nogroup.php
index f2a5a3b33b2da6dc755e1c256eee9496090eccfc..c75b595c363967f6fbfe0324117b288818e31415 100644 (file)
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -35,7 +35,7 @@ function nogroup_content(&$a) {
        }
        $r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']);
        if (dbm::is_result($r)) {
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
 
                        $contact_details = get_contact_details_by_url($rr['url'], local_user(), $rr);
 

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 98d491bca6af0861750aca5b96b14a3c52706f04..939ccbf79a9e4d9cf914e4673615de5841d59b4a 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -31,21 +31,22 @@ function noscrape_init(&$a) {
                intval($a->profile['uid']));
 
        $json_info = array(
-               'fn' => $a->profile['name'],
-               'addr' => $a->profile['addr'],
-               'nick' => $which,
-               'key' => $a->profile['pubkey'],
+               'fn'       => $a->profile['name'],
+               'addr'     => $a->profile['addr'],
+               'nick'     => $which,
+               'key'      => $a->profile['pubkey'],
                'homepage' => App::get_baseurl()."/profile/{$which}",
-               'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-               'photo' => $r[0]["photo"],
-               'tags' => $keywords
+               'comm'     => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
+               'photo'    => $r[0]["photo"],
+               'tags'     => $keywords
        );
 
-       if(is_array($a->profile) AND !$a->profile['hide-friends']) {
+       if (is_array($a->profile) AND !$a->profile['hide-friends']) {
                $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
                        intval($a->profile['uid']));
-               if (dbm::is_result($r))
+               if (dbm::is_result($r)) {
                        $json_info["updated"] =  date("c", strtotime($r[0]['updated']));
+               }
 
                $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
                                AND `network` IN ('%s', '%s', '%s', '')",
@@ -54,20 +55,21 @@ function noscrape_init(&$a) {
                        dbesc(NETWORK_DIASPORA),
                        dbesc(NETWORK_OSTATUS)
                );
-               if (dbm::is_result($r))
+               if (dbm::is_result($r)) {
                        $json_info["contacts"] = intval($r[0]['total']);
+               }
        }
 
        //These are optional fields.
        $profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
-       foreach($profile_fields as $field) {
-               if(!empty($a->profile[$field])) {
+       foreach ($profile_fields as $field) {
+               if (!empty($a->profile[$field])) {
                        $json_info["$field"] = $a->profile[$field];
                }
        }
 
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
-       foreach($dfrn_pages as $dfrn) {
+       foreach ($dfrn_pages as $dfrn) {
                $json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}";
        }
 

diff --git a/mod/openid.php b/mod/openid.php
index 9ee1877674ced05777bebc6609309c228665ae90..09905198c971f6c554fa5b2ccf04aba4d4e7c30d 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -56,7 +56,7 @@ function openid_content(&$a) {
                        // Successful OpenID login - but we can't match it to an existing account.
                        // New registration?
 
-                       if($a->config['register_policy'] == REGISTER_CLOSED) {
+                       if ($a->config['register_policy'] == REGISTER_CLOSED) {
                                notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
                                goaway(z_root());
                        }
@@ -64,31 +64,41 @@ function openid_content(&$a) {
                        unset($_SESSION['register']);
                        $args = '';
                        $attr = $openid->getAttributes();
-                       if(is_array($attr) && count($attr)) {
-                               foreach($attr as $k => $v) {
-                                       if($k === 'namePerson/friendly')
+                       if (is_array($attr) && count($attr)) {
+                               foreach ($attr as $k => $v) {
+                                       if ($k === 'namePerson/friendly') {
                                                $nick = notags(trim($v));
-                                       if($k === 'namePerson/first')
+                                       }
+                                       if($k === 'namePerson/first') {
                                                $first = notags(trim($v));
-                                       if($k === 'namePerson')
+                                       }
+                                       if($k === 'namePerson') {
                                                $args .= '&username=' . notags(trim($v));
-                                       if($k === 'contact/email')
+                                       }
+                                       if ($k === 'contact/email') {
                                                $args .= '&email=' . notags(trim($v));
-                                       if($k === 'media/image/aspect11')
+                                       }
+                                       if ($k === 'media/image/aspect11') {
                                                $photosq = bin2hex(trim($v));
-                                       if($k === 'media/image/default')
+                                       }
+                                       if ($k === 'media/image/default') {
                                                $photo = bin2hex(trim($v));
+                                       }
                                }
                        }
-                       if($nick)
+                       if ($nick) {
                                $args .= '&nickname=' . $nick;
-                       elseif($first)
+                       }
+                       elseif ($first) {
                                $args .= '&nickname=' . $first;
+                       }
 
-                       if($photosq)
+                       if ($photosq) {
                                $args .= '&photo=' . $photosq;
-                       elseif($photo)
+                       }
+                       elseif ($photo) {
                                $args .= '&photo=' . $photo;
+                       }
 
                        $args .= '&openid_url=' . notags(trim($authid));
 

diff --git a/mod/photos.php b/mod/photos.php
index c60f8dd4967ff17024b1a41f4c0c71c1bc49a8a5..a4bf19e9400e78a9f3ccd21aefcec02dd35cdb2d 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -255,7 +255,7 @@ function photos_post(&$a) {
                                );
                        }
                        if (dbm::is_result($r)) {
-                               foreach($r as $rr) {
+                               foreach ($r as $rr) {
                                        $res[] = "'" . dbesc($rr['rid']) . "'" ;
                                }
                        } else {
@@ -277,7 +277,7 @@ function photos_post(&$a) {
                                intval($page_owner_uid)
                        );
                        if (dbm::is_result($r)) {
-                               foreach($r as $rr) {
+                               foreach ($r as $rr) {
                                        q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
                                                dbesc(datetime_convert()),
                                                dbesc($rr['parent-uri']),

diff --git a/mod/poco.php b/mod/poco.php
index e454d1e668fce7deeea29a82c5017c1eb4719d88..a97ca64e3352c8076cb6d778e918252aa3efd032 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -174,7 +174,7 @@ function poco_init(&$a) {
 
        if(is_array($r)) {
                if (dbm::is_result($r)) {
-                       foreach($r as $rr) {
+                       foreach ($r as $rr) {
                                if (!isset($rr['generation'])) {
                                        if ($global)
                                                $rr['generation'] = 3;

diff --git a/mod/profile.php b/mod/profile.php
index 20206c7335259b058475cf0dfa2d0849e8291094..ae8f2fa720699762c125329efae95f484f3f7628 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -62,7 +62,7 @@ function profile_init(&$a) {
        header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
-       foreach($dfrn_pages as $dfrn) {
+       foreach ($dfrn_pages as $dfrn) {
                $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
        }
        $a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".App::get_baseurl()."/poco/{$which}\" />\r\n";

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 2aca9801d2c858caeaca2505fac5a997a55d835b..eee15c2af29e526bed6efb7b51076055300e2af3 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -201,7 +201,7 @@ function profile_photo_content(&$a) {
                        return;
                }
                $havescale = false;
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        if($rr['scale'] == 5)
                                $havescale = true;
                }

diff --git a/mod/profiles.php b/mod/profiles.php
index 4e29b93fd226b7865242853f096207b63488ecca..9321aacb5928984f26e867b88691b2b0b3fc8866 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -780,24 +780,26 @@ function profiles_content(&$a) {
                if (dbm::is_result($r)) {
 
                        $tpl = get_markup_template('profile_entry.tpl');
-                       foreach($r as $rr) {
+
+                       $profiles = '';
+                       foreach ($r as $rr) {
                                $profiles .= replace_macros($tpl, array(
-                                       '$photo' => $a->remove_baseurl($rr['thumb']),
-                                       '$id' => $rr['id'],
-                                       '$alt' => t('Profile Image'),
+                                       '$photo'        => $a->remove_baseurl($rr['thumb']),
+                                       '$id'           => $rr['id'],
+                                       '$alt'          => t('Profile Image'),
                                        '$profile_name' => $rr['profile-name'],
-                                       '$visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>'
+                                       '$visible'      => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>'
                                                : '<a href="'.'profperm/'.$rr['id'].'" />' . t('Edit visibility') . '</a>')
                                ));
                        }
 
                        $tpl_header = get_markup_template('profile_listing_header.tpl');
                        $o .= replace_macros($tpl_header,array(
-                               '$header' => t('Edit/Manage Profiles'),
-                               '$chg_photo' => t('Change profile photo'),
-                               '$cr_new' => t('Create New Profile'),
+                               '$header'      => t('Edit/Manage Profiles'),
+                               '$chg_photo'   => t('Change profile photo'),
+                               '$cr_new'      => t('Create New Profile'),
                                '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
-                               '$profiles' => $profiles
+                               '$profiles'    => $profiles
                        ));
                }
                return $o;

diff --git a/mod/search.php b/mod/search.php
index c19bb27673a83f2d91b6dd8a7a5eb679d4f0f4b8..3de77a85c42d3b77de9f74c5b718e7277f20844b 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -17,7 +17,7 @@ function search_saved_searches() {
 
        if (dbm::is_result($r)) {
                $saved = array();
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        $saved[] = array(
                                'id'            => $rr['id'],
                                'term'          => $rr['term'],

diff --git a/mod/suggest.php b/mod/suggest.php
index a328b9768b63ae75469f7bc93c63a84694ea10ed..0004128a1a0a54c9d3180b1508ec0586e484ddaf 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -75,7 +75,7 @@ function suggest_content(&$a) {
 
        require_once 'include/contact_selectors.php';
 
-       foreach($r as $rr) {
+       foreach ($r as $rr) {
 
                $connlnk = App::get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
                $ignlnk = App::get_baseurl() . '/suggest?ignore=' . $rr['id'];

diff --git a/mod/videos.php b/mod/videos.php
index 53bba84c6e2ed86e407d8e1aa65dfc503b7fd8ad..dbfc044ea0efdb89ee526b25749bfe3b2f13eace 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -368,8 +368,8 @@ function videos_content(&$a) {
 
        $videos = array();
        if (dbm::is_result($r)) {
-               foreach($r as $rr) {
-                       if($a->theme['template_engine'] === 'internal') {
+               foreach ($r as $rr) {
+                       if ($a->theme['template_engine'] === 'internal') {
                                $alt_e = template_escape($rr['filename']);
                                $name_e = template_escape($rr['album']);
                        }

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 3fd5d79e1b4ae16cfaa12739745656617d53b3d9..ffb7154423e723fc46a9dbd0e83baf84db6c0013 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -76,9 +76,11 @@ function viewcontacts_content(&$a) {
 
        $contacts = array();
 
-       foreach($r as $rr) {
-               if($rr['self'])
+       foreach ($r as $rr) {
+               /// @TODO This triggers an E_NOTICE if 'self' is not there
+               if ($rr['self']) {
                        continue;
+               }
 
                $url = $rr['url'];