added spaces + some curly braces + some usage of dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/include/features.php b/include/features.php
index 74c110427ce6c8d87d02c1039bc59407d1960aa9..07dcced0e6da630b1142f9112f080a68b8843d19 100644 (file)
--- a/include/features.php
+++ b/include/features.php
@@ -36,9 +36,9 @@ function feature_enabled($uid, $feature) {
  */
 function get_feature_default($feature) {
        $f = get_features();
-       foreach($f as $cat) {
-               foreach($cat as $feat) {
-                       if(is_array($feat) && $feat[0] === $feature)
+       foreach ($f as $cat) {
+               foreach ($cat as $feat) {
+                       if (is_array($feat) && $feat[0] === $feature)
                                return $feat[3];
                }
        }
@@ -116,13 +116,13 @@ function get_features($filtered = true) {
 
        // removed any locked features and remove the entire category if this makes it empty
 
-       if($filtered) {
-               foreach($arr as $k => $x) {
+       if ($filtered) {
+               foreach ($arr as $k => $x) {
                        $has_items = false;
                        $kquantity = count($arr[$k]);
-                       for($y = 0; $y < $kquantity; $y ++) {
-                               if(is_array($arr[$k][$y])) {
-                                       if($arr[$k][$y][4] === false) {
+                       for ($y = 0; $y < $kquantity; $y ++) {
+                               if (is_array($arr[$k][$y])) {
+                                       if ($arr[$k][$y][4] === false) {
                                                $has_items = true;
                                        }
                                        else {
@@ -130,7 +130,7 @@ function get_features($filtered = true) {
                                        }
                                }
                        }
-                       if(! $has_items) {
+                       if (! $has_items) {
                                unset($arr[$k]);
                        }
                }

diff --git a/include/feed.php b/include/feed.php
index 2117676dbab6eb9cf34c4581e81ec0450df8df12..32044e663e7113f8eda3834ef986579de5378df9 100644 (file)
--- a/include/feed.php
+++ b/include/feed.php
@@ -55,7 +55,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
        if ($xpath->query('/atom:feed')->length > 0) {
                $alternate = $xpath->query("atom:link[@rel='alternate']")->item(0)->attributes;
                if (is_object($alternate)) {
-                       foreach($alternate AS $attributes) {
+                       foreach ($alternate AS $attributes) {
                                if ($attributes->name == "href") {
                                        $author["author-link"] = $attributes->textContent;
                                }
@@ -68,7 +68,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                if ($author["author-link"] == "") {
                        $self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
                        if (is_object($self)) {
-                               foreach($self AS $attributes) {
+                               foreach ($self AS $attributes) {
                                        if ($attributes->name == "href") {
                                                $author["author-link"] = $attributes->textContent;
                                        }
@@ -163,7 +163,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 
        $header["contact-id"] = $contact["id"];
 
-       if(!strlen($contact["notify"])) {
+       if (!strlen($contact["notify"])) {
                // one way feed - no remote comment ability
                $header["last-child"] = 0;
        }
@@ -188,7 +188,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                        $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
                }
                if (is_object($alternate)) {
-                       foreach($alternate AS $attributes) {
+                       foreach ($alternate AS $attributes) {
                                if ($attributes->name == "href") {
                                        $item["plink"] = $attributes->textContent;
                                }
@@ -271,6 +271,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                if ($creator != "") {
                        $item["author-name"] = $creator;
                }
+
                /// @TODO ?
                // <category>Ausland</category>
                // <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>
@@ -284,7 +285,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                        $type = "";
                        $title = "";
 
-                       foreach($enclosure->attributes AS $attributes) {
+                       foreach ($enclosure->attributes AS $attributes) {
                                if ($attributes->name == "url") {
                                        $href = $attributes->textContent;
                                } elseif ($attributes->name == "length") {
@@ -293,8 +294,9 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
                                        $type = $attributes->textContent;
                                }
                        }
-                       if(strlen($item["attach"]))
+                       if (strlen($item["attach"])) {
                                $item["attach"] .= ',';
+                       }
 
                        $attachments[] = array("link" => $href, "type" => $type, "length" => $length);
 

diff --git a/include/files.php b/include/files.php
index 7bff0e3468bd7d0331e0549ce2dd9c3616aa574a..c20a6d832d6898b3356eef1f705cc27a77d392ca 100644 (file)
--- a/include/files.php
+++ b/include/files.php
@@ -33,7 +33,7 @@ function create_files_from_item($itemid) {
 function create_files_from_itemuri($itemuri, $uid) {
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-       if(count($messages)) {
+       if (count($messages)) {
                foreach ($messages as $message)
                        create_files_from_item($message["id"]);
        }

diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php
index 9ba2d2a744dcc88fea320253dec337d54345fefd..f497fbee017c94b9bb35db66b457dd2191ebe813 100644 (file)
--- a/include/friendica_smarty.php
+++ b/include/friendica_smarty.php
@@ -18,7 +18,7 @@ class FriendicaSmarty extends Smarty {
                // setTemplateDir can be set to an array, which Smarty will parse in order.
                // The order is thus very important here
                $template_dirs = array('theme' => "view/theme/$theme/".SMARTY3_TEMPLATE_FOLDER."/");
-               if( x($a->theme_info,"extends") )
+               if ( x($a->theme_info,"extends") )
                        $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/".SMARTY3_TEMPLATE_FOLDER."/");
                $template_dirs = $template_dirs + array('base' => "view/".SMARTY3_TEMPLATE_FOLDER."/");
                $this->setTemplateDir($template_dirs);
@@ -35,7 +35,7 @@ class FriendicaSmarty extends Smarty {
        }
 
        function parsed($template = '') {
-               if($template) {
+               if ($template) {
                        return $this->fetch('string:' . $template);
                }
                return $this->fetch('file:' . $this->filename);
@@ -48,7 +48,7 @@ class FriendicaSmartyEngine implements ITemplateEngine {
        static $name ="smarty3";
 
     public function __construct(){
-               if(!is_writable('view/smarty3/')){
+               if (!is_writable('view/smarty3/')){
                        echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver."; killme();
                }
        }
@@ -56,7 +56,7 @@ class FriendicaSmartyEngine implements ITemplateEngine {
        // ITemplateEngine interface
        public function replace_macros($s, $r) {
                $template = '';
-               if(gettype($s) === 'string') {
+               if (gettype($s) === 'string') {
                        $template = $s;
                        $s = new FriendicaSmarty();
                }
@@ -71,8 +71,8 @@ class FriendicaSmartyEngine implements ITemplateEngine {
                call_hooks("template_vars", $arr);
                $r = $arr['vars'];
 
-               foreach($r as $key=>$value) {
-                       if($key[0] === '$') {
+               foreach ($r as $key=>$value) {
+                       if ($key[0] === '$') {
                                $key = substr($key, 1);
                        }
                        $s->assign($key, $value);

diff --git a/include/gprobe.php b/include/gprobe.php
index 719cfce48635ac4adb109964d9eed19a3f7a498b..e79cc64764a3265211bf4f4458cbaeb39e77aff8 100644 (file)
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -33,11 +33,13 @@ function gprobe_run(&$argv, &$argc){
 
                $arr = probe_url($url);
 
-               if (is_null($result))
+               if (is_null($result)) {
                        Cache::set("gprobe:".$urlparts["host"], $arr);
+               }
 
-               if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
+               if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
                        update_gcontact($arr);
+               }
 
                $r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
                        dbesc(normalise_link($url))

diff --git a/include/group.php b/include/group.php
index 6332c45da2a81852235ff782e7f987180c92e9a9..fa0e8f59a69af6854e2d1822d08c6038a52bb458 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -4,9 +4,9 @@
 function group_add($uid,$name) {
 
        $ret = false;
-       if(x($uid) && x($name)) {
+       if (x($uid) && x($name)) {
                $r = group_byname($uid,$name); // check for dups
-               if($r !== false) {
+               if ($r !== false) {
 
                        // This could be a problem.
                        // Let's assume we've just created a group which we once deleted
@@ -17,7 +17,7 @@ function group_add($uid,$name) {
                        $z = q("SELECT * FROM `group` WHERE `id` = %d LIMIT 1",
                                intval($r)
                        );
-                       if(count($z) && $z[0]['deleted']) {
+                       if (count($z) && $z[0]['deleted']) {
                                $r = q("UPDATE `group` SET `deleted` = 0 WHERE `uid` = %d AND `name` = '%s'",
                                        intval($uid),
                                        dbesc($name)
@@ -39,14 +39,14 @@ function group_add($uid,$name) {
 
 function group_rmv($uid,$name) {
        $ret = false;
-       if(x($uid) && x($name)) {
+       if (x($uid) && x($name)) {
                $r = q("SELECT id FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
                        intval($uid),
                        dbesc($name)
                );
                if (dbm::is_result($r))
                        $group_id = $r[0]['id'];
-               if(! $group_id)
+               if (! $group_id)
                        return false;
 
                // remove group from default posting lists
@@ -57,20 +57,20 @@ function group_rmv($uid,$name) {
                        $user_info = $r[0];
                        $change = false;
 
-                       if($user_info['def_gid'] == $group_id) {
+                       if ($user_info['def_gid'] == $group_id) {
                                $user_info['def_gid'] = 0;
                                $change = true;
                        }
-                       if(strpos($user_info['allow_gid'], '<' . $group_id . '>') !== false) {
+                       if (strpos($user_info['allow_gid'], '<' . $group_id . '>') !== false) {
                                $user_info['allow_gid'] = str_replace('<' . $group_id . '>', '', $user_info['allow_gid']);
                                $change = true;
                        }
-                       if(strpos($user_info['deny_gid'], '<' . $group_id . '>') !== false) {
+                       if (strpos($user_info['deny_gid'], '<' . $group_id . '>') !== false) {
                                $user_info['deny_gid'] = str_replace('<' . $group_id . '>', '', $user_info['deny_gid']);
                                $change = true;
                        }
 
-                       if($change) {
+                       if ($change) {
                                q("UPDATE user SET def_gid = %d, allow_gid = '%s', deny_gid = '%s' WHERE uid = %d",
                                  intval($user_info['def_gid']),
                                  dbesc($user_info['allow_gid']),
@@ -100,7 +100,7 @@ function group_rmv($uid,$name) {
 }
 
 function group_byname($uid,$name) {
-       if((! $uid) || (! strlen($name)))
+       if ((! $uid) || (! strlen($name)))
                return false;
        $r = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
                intval($uid),
@@ -113,9 +113,9 @@ function group_byname($uid,$name) {
 
 function group_rmv_member($uid,$name,$member) {
        $gid = group_byname($uid,$name);
-       if(! $gid)
+       if (! $gid)
                return false;
-       if(! ( $uid && $gid && $member))
+       if (! ( $uid && $gid && $member))
                return false;
        $r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d",
                intval($uid),
@@ -129,9 +129,9 @@ function group_rmv_member($uid,$name,$member) {
 
 
 function group_add_member($uid,$name,$member,$gid = 0) {
-       if(! $gid)
+       if (! $gid)
                $gid = group_byname($uid,$name);
-       if((! $gid) || (! $uid) || (! $member))
+       if ((! $gid) || (! $uid) || (! $member))
                return false;
 
        $r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1",
@@ -156,7 +156,7 @@ function group_add_member($uid,$name,$member,$gid = 0) {
 
 function group_get_members($gid) {
        $ret = array();
-       if(intval($gid)) {
+       if (intval($gid)) {
                $r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member`
                        INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
                        WHERE `gid` = %d AND `group_member`.`uid` = %d AND
@@ -173,7 +173,7 @@ function group_get_members($gid) {
 
 function group_public_members($gid) {
        $ret = 0;
-       if(intval($gid)) {
+       if (intval($gid)) {
                $r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member`
                        INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
                        WHERE `gid` = %d AND `group_member`.`uid` = %d
@@ -252,7 +252,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro
                intval($_SESSION['uid'])
        );
        $member_of = array();
-       if($cid) {
+       if ($cid) {
                $member_of = groups_containing(local_user(),$cid);
        }
 
@@ -302,7 +302,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro
 }
 
 function expand_groups($a,$check_dead = false, $use_gcontact = false) {
-       if(! (is_array($a) && count($a)))
+       if (! (is_array($a) && count($a)))
                return array();
        $groups = implode(',', $a);
        $groups = dbesc($groups);
@@ -318,9 +318,9 @@ function expand_groups($a,$check_dead = false, $use_gcontact = false) {
 
        $ret = array();
        if (dbm::is_result($r))
-               foreach($r as $rr)
+               foreach ($r as $rr)
                        $ret[] = $rr['contact-id'];
-       if($check_dead AND !$use_gcontact) {
+       if ($check_dead AND !$use_gcontact) {
                require_once('include/acl_selectors.php');
                $ret = prune_deadguys($ret);
        }
@@ -347,8 +347,9 @@ function groups_containing($uid,$c) {
 
        $ret = array();
        if (dbm::is_result($r)) {
-               foreach($r as $rr)
+               foreach ($r as $rr) {
                        $ret[] = $rr['gid'];
+               }
        }
 
        return $ret;
@@ -399,7 +400,7 @@ function get_default_group($uid, $network = "") {
                return $default_group;
 
        $g = q("SELECT `def_gid` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
-       if($g && intval($g[0]["def_gid"]))
+       if ($g && intval($g[0]["def_gid"]))
                $default_group = $g[0]["def_gid"];
 
        return $default_group;

diff --git a/include/html2plain.php b/include/html2plain.php
index 1d5910d83bea975a11a02b2aef1e8c3eba01e68b..dc2cb137c49358e986f513860c5dda7d8f2b049e 100644 (file)
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -49,7 +49,7 @@ function quotelevel($message, $wraplength = 75)
 
        $newlines = array();
        $level = 0;
-       foreach($lines as $line) {;
+       foreach ($lines as $line) {;
                $line = trim($line);
                $startquote = false;
                while (strpos("*".$line, '[quote]') > 0) {

diff --git a/include/identity.php b/include/identity.php
index a21624a212a35219672db2d8a274d60253f8136d..1fea5b25d659880ed1e07cb4c501f53c364b4d62 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -38,7 +38,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
                dbesc($nickname)
        );
 
-       if(!$user && count($user) && !count($profiledata)) {
+       if (!$user && count($user) && !count($profiledata)) {
                logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
                notice( t('Requested account is not available.') . EOL );
                $a->error = 404;
@@ -47,7 +47,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
 
        $pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile);
 
-       if(($pdata === false) || (!count($pdata)) && !count($profiledata)) {
+       if (($pdata === false) || (!count($pdata)) && !count($profiledata)) {
                logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
                notice( t('Requested profile is not available.') . EOL );
                $a->error = 404;
@@ -56,11 +56,11 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
 
        // fetch user tags if this isn't the default profile
 
-       if(!$pdata['is-default']) {
+       if (!$pdata['is-default']) {
                $x = q("SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
                                intval($pdata['profile_uid'])
                );
-               if($x && count($x))
+               if ($x && count($x))
                        $pdata['pub_keywords'] = $x[0]['pub_keywords'];
        }
 
@@ -88,10 +88,10 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
                require_once($theme_info_file);
        }
 
-       if(! (x($a->page,'aside')))
+       if (! (x($a->page,'aside')))
                $a->page['aside'] = '';
 
-       if(local_user() && local_user() == $a->profile['uid'] && $profiledata) {
+       if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
                $a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
                        '$editprofile' => t('Edit profile'),
                        '$profid' => $a->profile['id']
@@ -110,7 +110,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
        else
                $a->page['aside'] .= profile_sidebar($a->profile, $block);
 
-       /*if(! $block)
+       /*if (! $block)
         $a->page['aside'] .= contact_block();*/
 
        return;
@@ -133,9 +133,9 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
  *     Includes all available profile data
  */
 function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
-       if(remote_user() && count($_SESSION['remote'])) {
-                       foreach($_SESSION['remote'] as $visitor) {
-                               if($visitor['uid'] == $uid) {
+       if (remote_user() && count($_SESSION['remote'])) {
+                       foreach ($_SESSION['remote'] as $visitor) {
+                               if ($visitor['uid'] == $uid) {
                                        $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
                                                intval($visitor['cid'])
                                        );
@@ -148,7 +148,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
 
        $r = null;
 
-       if($profile) {
+       if ($profile) {
                $profile_int = intval($profile);
                $r = q("SELECT `contact`.`id` AS `contact_id`, `profile`.`uid` AS `profile_uid`, `profile`.*,
                                `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
@@ -200,20 +200,22 @@ function profile_sidebar($profile, $block = 0) {
        $o = '';
        $location = false;
        $address = false;
-//             $pdesc = true;
+       // $pdesc = true;
 
        // This function can also use contact information in $profile
        $is_contact = x($profile, 'cid');
 
-       if((! is_array($profile)) && (! count($profile)))
+       if ((! is_array($profile)) && (! count($profile))) {
                return $o;
+       }
 
        $profile['picdate'] = urlencode($profile['picdate']);
 
        if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
-               $profile['network_name'] = format_network_name($profile['network'],$profile['url']);
-       } else
+               $profile['network_name'] = format_network_name($profile['network'], $profile['url']);
+       } else {
                $profile['network_name'] = "";
+       }
 
        call_hooks('profile_sidebar_enter', $profile);
 
@@ -222,9 +224,9 @@ function profile_sidebar($profile, $block = 0) {
        $connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
 
        // don't show connect link to authenticated visitors either
-       if(remote_user() && count($_SESSION['remote'])) {
-               foreach($_SESSION['remote'] as $visitor) {
-                       if($visitor['uid'] == $profile['uid']) {
+       if (remote_user() && count($_SESSION['remote'])) {
+               foreach ($_SESSION['remote'] as $visitor) {
+                       if ($visitor['uid'] == $profile['uid']) {
                                $connect = false;
                                break;
                        }
@@ -325,7 +327,7 @@ function profile_sidebar($profile, $block = 0) {
        // Fetch the account type
        $account_type = account_type($profile);
 
-       if((x($profile,'address') == 1)
+       if ((x($profile,'address') == 1)
                        || (x($profile,'location') == 1)
                        || (x($profile,'locality') == 1)
                        || (x($profile,'region') == 1)
@@ -344,7 +346,7 @@ function profile_sidebar($profile, $block = 0) {
 
        $xmpp = ((x($profile,'xmpp') == 1) ?  t('XMPP:') : False);
 
-       if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
+       if (($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
                $location = $pdesc = $gender = $marital = $homepage = $about = False;
        }
 
@@ -371,7 +373,7 @@ function profile_sidebar($profile, $block = 0) {
        if (!$block){
                $contact_block = contact_block();
 
-               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))
@@ -393,7 +395,7 @@ function profile_sidebar($profile, $block = 0) {
        }
 
        $p = array();
-       foreach($profile as $k => $v) {
+       foreach ($profile as $k => $v) {
                $k = str_replace('-','_',$k);
                $p[$k] = $v;
        }
@@ -409,7 +411,7 @@ function profile_sidebar($profile, $block = 0) {
        if (isset($p["photo"]))
                $p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL);
 
-       if($a->theme['template_engine'] === 'internal')
+       if ($a->theme['template_engine'] === 'internal')
                $location = template_escape($location);
 
        $tpl = get_markup_template('profile_vcard.tpl');
@@ -448,13 +450,13 @@ function get_birthdays() {
        $a = get_app();
        $o = '';
 
-       if(! local_user() || $a->is_mobile || $a->is_tablet)
+       if (! local_user() || $a->is_mobile || $a->is_tablet)
                return $o;
 
 //             $mobile_detect = new Mobile_Detect();
 //             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
 
-//             if($is_mobile)
+//             if ($is_mobile)
 //                     return $o;
 
        $bd_format = t('g A l F d') ; // 8 AM Friday January 18
@@ -482,27 +484,27 @@ function get_birthdays() {
 
                $istoday = false;
                foreach ($r as $rr) {
-                       if(strlen($rr['name']))
+                       if (strlen($rr['name']))
                                $total ++;
-                       if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
+                       if ((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
                                $istoday = true;
                }
                $classtoday = $istoday ? ' birthday-today ' : '';
-               if($total) {
-                       foreach($r as &$rr) {
-                               if(! strlen($rr['name']))
+               if ($total) {
+                       foreach ($r as &$rr) {
+                               if (! strlen($rr['name']))
                                        continue;
 
                                // avoid duplicates
 
-                               if(in_array($rr['cid'],$cids))
+                               if (in_array($rr['cid'],$cids))
                                        continue;
                                $cids[] = $rr['cid'];
 
                                $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
                                $sparkle = '';
                                $url = $rr['url'];
-                               if($rr['network'] === NETWORK_DFRN) {
+                               if ($rr['network'] === NETWORK_DFRN) {
                                        $sparkle = " sparkle";
                                        $url = App::get_baseurl() . '/redir/'  . $rr['cid'];
                                }
@@ -537,14 +539,14 @@ function get_events() {
 
        $a = get_app();
 
-       if(! local_user() || $a->is_mobile || $a->is_tablet)
+       if (! local_user() || $a->is_mobile || $a->is_tablet)
                return $o;
 
 
 //             $mobile_detect = new Mobile_Detect();
 //             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
 
-//             if($is_mobile)
+//             if ($is_mobile)
 //                     return $o;
 
        $bd_format = t('g A l F d') ; // 8 AM Friday January 18
@@ -562,30 +564,30 @@ function get_events() {
                $now = strtotime('now');
                $istoday = false;
                foreach ($r as $rr) {
-                       if(strlen($rr['name']))
+                       if (strlen($rr['name']))
                                $total ++;
 
                        $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
-                       if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
+                       if ($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
                                $istoday = true;
                }
                $classtoday = (($istoday) ? 'event-today' : '');
 
                $skip = 0;
 
-               foreach($r as &$rr) {
+               foreach ($r as &$rr) {
                        $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
 
-                       if(strlen($title) > 35)
+                       if (strlen($title) > 35)
                                $title = substr($title,0,32) . '... ';
 
                        $description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
-                       if(! $description)
+                       if (! $description)
                                $description = t('[No description]');
 
                        $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
 
-                       if(substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
+                       if (substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
                                $skip++;
                                continue;
                        }
@@ -620,7 +622,7 @@ function advanced_profile(App $a) {
                '$title' => t('Profile')
        ));
 
-       if($a->profile['name']) {
+       if ($a->profile['name']) {
 
                $tpl = get_markup_template('profile_advanced.tpl');
 
@@ -628,11 +630,9 @@ function advanced_profile(App $a) {
 
                $profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ;
 
-               if($a->profile['gender']) $profile['gender'] = array( t('Gender:'),  $a->profile['gender'] );
-
-
-               if(($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) {
+               if ($a->profile['gender']) $profile['gender'] = array( t('Gender:'),  $a->profile['gender'] );
 
+               if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) {
                        $year_bd_format = t('j F, Y');
                        $short_bd_format = t('j F');
 
@@ -645,10 +645,10 @@ function advanced_profile(App $a) {
 
                }
 
-               if($age = age($a->profile['dob'],$a->profile['timezone'],''))  $profile['age'] = array( t('Age:'), $age );
+               if ($age = age($a->profile['dob'],$a->profile['timezone'],''))  $profile['age'] = array( t('Age:'), $age );
 
 
-               if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
+               if ($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
 
                /// @TODO Maybe use x() here, plus below?
                if ($a->profile['with']) {
@@ -853,14 +853,14 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 }
 
 function get_my_url() {
-       if(x($_SESSION,'my_url'))
+       if (x($_SESSION,'my_url'))
                return $_SESSION['my_url'];
        return false;
 }
 
 function zrl_init(App $a) {
        $tmp_str = get_my_url();
-       if(validate_url($tmp_str)) {
+       if (validate_url($tmp_str)) {
 
                // Is it a DDoS attempt?
                // The check fetches the cached value from gprobe to reduce the load for this system
@@ -881,16 +881,20 @@ function zrl_init(App $a) {
 }
 
 function zrl($s,$force = false) {
-       if(! strlen($s))
+       if (! strlen($s)) {
                return $s;
-       if((! strpos($s,'/profile/')) && (! $force))
+       }
+       if ((! strpos($s,'/profile/')) && (! $force)) {
                return $s;
-       if($force && substr($s,-1,1) !== '/')
+       }
+       if ($force && substr($s,-1,1) !== '/') {
                $s = $s . '/';
+       }
        $achar = strpos($s,'?') ? '&' : '?';
        $mine = get_my_url();
-       if($mine and ! link_compare($mine,$s))
+       if ($mine and ! link_compare($mine,$s)) {
                return $s . $achar . 'zrl=' . urlencode($mine);
+       }
        return $s;
 }
 
@@ -910,9 +914,10 @@ function zrl($s,$force = false) {
  */
 function get_theme_uid() {
        $uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
-       if(local_user()) {
-               if((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))
+       if (local_user()) {
+               if ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid)) {
                        return local_user();
+               }
        }
 
        return $uid;