flack / openpsa

lib/org/openpsa/notifications/main.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 
         // If user has preference for this message, we use that
         $personal_preferences = $recipient->list_parameters('org.openpsa.notifications');
-        if (   count($personal_preferences) > 0
+        if (count($personal_preferences) > 0
             && array_key_exists("{$component}:{$action}", $personal_preferences)) {
             return $personal_preferences[$action];
         }

Braces +2 added lines, -1 removed lines

@@ -52,7 +52,8 @@
         // TODO: Should we sudo here to ensure getting correct prefs regardless of ACLs?
         try {
             $recipient = midcom_db_person::get_cached($recipient);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
 

lib/midcom/core/collector.php

Spacing +4 added lines, -4 removed lines

@@ -134,7 +134,7 @@ 
         $counter = 0;
 
         foreach ($result as $object_guid => $empty_copy) {
-            if (    $this->_user_id
+            if ($this->_user_id
                 && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $object_guid, $classname, $this->_user_id)) {
                 debug_add("Failed to load result, read privilege on {$object_guid} not granted for the current user.", MIDCOM_LOG_INFO);
                 continue;
@@ -145,7 +145,7 @@ 
                 if ($counter <= $this->_offset) {
                     continue;
                 }
-                if (   $this->_limit
+                if ($this->_limit
                     && $counter > ($this->_offset + $this->_limit)) {
                     break;
                 }
@@ -223,7 +223,7 @@ 
 
     public function get_subkey($key, $property)
     {
-        if (   $this->_user_id
+        if ($this->_user_id
             && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $key, $this->_real_class, $this->_user_id)) {
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
@@ -233,7 +233,7 @@ 
 
     public function get($key)
     {
-        if (   $this->_user_id
+        if ($this->_user_id
             && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $key, $this->_real_class, $this->_user_id)) {
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;

lib/midcom/helper/nav/backend.php

Spacing +6 added lines, -6 removed lines

@@ -256,7 +256,7 @@ 
 
         $lastgoodnode = null;
 
-        while (   $parent_id
+        while ($parent_id
                && !isset(self::$_nodes[$parent_id])) {
             try {
                 self::$_nodes[$parent_id] = $this->_loadNodeData($parent_id);
@@ -273,14 +273,14 @@ 
 
             $parent_id = $this->_get_parent_id($topic_id);
 
-            if (   $up
+            if ($up
                 && $up_id = array_pop($up_ids)
                 && $up_id != $parent_id) {
                 $parent_id = $up_id;
             }
         }
 
-        if (   !is_null($lastgoodnode)
+        if (!is_null($lastgoodnode)
             && (empty($this->_lastgoodnode) || $this->_lastgoodnode < 0)) {
             $this->_lastgoodnode = $lastgoodnode;
         }
@@ -316,7 +316,7 @@ 
     {
         $node = new midcom_helper_nav_node($this, $topic_id, $up);
 
-        if (    !$node->is_object_visible()
+        if (!$node->is_object_visible()
              || !$node->is_readable_by($this->_user_id)) {
             throw new midcom_error_forbidden('Node cannot be read or is invisible');
         }
@@ -361,7 +361,7 @@ 
         });
         foreach ($leaves as $id => $leaf) {
             $this->_leaves[$id] = $leaf;
-            $this->_loaded_leaves[$node->id][$id] =& $this->_leaves[$id];
+            $this->_loaded_leaves[$node->id][$id] = & $this->_leaves[$id];
         }
     }
 
@@ -447,7 +447,7 @@ 
             }
             $subnode_id = $this->_nodeid($id, $up);
 
-            if (   !$show_noentry
+            if (!$show_noentry
                 && self::$_nodes[$subnode_id]->noentry) {
                 // Hide "noentry" items
                 continue;

Braces +6 added lines, -3 removed lines

@@ -260,10 +260,12 @@ 
                && !isset(self::$_nodes[$parent_id])) {
             try {
                 self::$_nodes[$parent_id] = $this->_loadNodeData($parent_id);
-            } catch (midcom_error_forbidden $e) {
+            }
+            catch (midcom_error_forbidden $e) {
                 debug_add("The Node {$parent_id} is invisible, could not satisfy the dependency chain to Node #{$node_id}", MIDCOM_LOG_WARN);
                 return $e->getCode();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return $e->getCode();
             }
 
@@ -287,7 +289,8 @@ 
 
         try {
             self::$_nodes[$node_id] = $this->_loadNodeData($topic_id);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $e->getCode();
         }
         return MIDCOM_ERROK;

lib/net/nehmer/static/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         }
 
         $config = $this->get_config_for_topic($topic);
-        if (   $object->name == 'index'
+        if ($object->name == 'index'
             && !$config->get('autoindex')) {
             return '';
         }

Braces +2 added lines, -1 removed lines

@@ -29,7 +29,8 @@
         foreach ($qb->execute() as $article) {
             try {
                 $datamanager->set_storage($article);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log(MIDCOM_LOG_WARN);
                 continue;
             }

lib/org/openpsa/contacts/midcom/interfaces.php

Spacing +6 added lines, -6 removed lines

@@ -78,11 +78,11 @@ 
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof org_openpsa_contacts_group_dba
+        if ($object instanceof org_openpsa_contacts_group_dba
             || $object instanceof midcom_db_group) {
             return "group/{$object->guid}/";
         }
-        if (   $object instanceof org_openpsa_contacts_person_dba
+        if ($object instanceof org_openpsa_contacts_person_dba
             || $object instanceof midcom_db_person) {
             return "person/{$object->guid}/";
         }
@@ -111,8 +111,8 @@ 
             // We have a feed URL, but we should check if it is GeoRSS as well
             $items = net_nemein_rss_fetch::raw_fetch($data['rss_url'])->get_items();
 
-            if (   count($items) > 0
-                && (   $items[0]->get_latitude()
+            if (count($items) > 0
+                && ($items[0]->get_latitude()
                     || $items[0]->get_longitude())) {
                 // This is a GeoRSS feed
                 $data['georss_url'] = $data['rss_url'];
@@ -175,14 +175,14 @@ 
         $data = $this->_get_data_from_url($group->homepage);
 
         // Use the data we got
-        if (   midcom::get()->componentloader->is_installed('org.routamc.positioning')
+        if (midcom::get()->componentloader->is_installed('org.routamc.positioning')
             && array_key_exists('icbm', $data)) {
             // We know where the group is located
             $icbm_parts = explode(',', $data['icbm']);
             if (count($icbm_parts) == 2) {
                 $latitude = (float) $icbm_parts[0];
                 $longitude = (float) $icbm_parts[1];
-                if (   abs($latitude) < 90
+                if (abs($latitude) < 90
                     && abs($longitude) < 180) {
                     $location = new org_routamc_positioning_location_dba();
                     $location->date = time();

Braces +2 added lines, -1 removed lines

@@ -159,7 +159,8 @@
 
         try {
             $object = new $classname($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error($type . " {$guid} not found, error " . $e->getMessage());
             return false;
         }

lib/net/nemein/tag/tag.php

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
 
     public function _on_creating()
     {
-        return (   $this->validate_tag($this->tag)
+        return ($this->validate_tag($this->tag)
                 && $this->_check_duplicates() == 0);
     }
 
@@ -66,7 +66,7 @@ 
             midcom::get()->uimessages->add(midcom::get()->i18n->get_string('net.nemein.tag', 'net.nemein.tag'), sprintf(midcom::get()->i18n->get_string('tag "%s" is not valid. tags may not be numeric', 'net.nemein.tag'), $tag), 'info');
             return false;
         }
-        if (   strstr($tag, '"')
+        if (strstr($tag, '"')
             || strstr($tag, "'")) {
             midcom::get()->uimessages->add(midcom::get()->i18n->get_string('net.nemein.tag', 'net.nemein.tag'), sprintf(midcom::get()->i18n->get_string('tag "%s" is not valid. tags may not contain quotes', 'net.nemein.tag'), $tag), 'info');
             return false;
@@ -77,7 +77,7 @@ 
 
     public function _on_updating()
     {
-        return (   $this->validate_tag($this->tag)
+        return ($this->validate_tag($this->tag)
                 && $this->_check_duplicates() == 0);
     }
 

lib/net/nemein/tag/exec/merge.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 <h1>Merge tags</h1>
 
 <?php
-if (   isset($_POST['from'])
+if (isset($_POST['from'])
     && isset($_POST['to'])) {
     if (net_nemein_tag_handler::merge_tags($_POST['from'], $_POST['to'])) {
         echo "<p>Successfully merged tag \"{$_POST['from']}\" to \"{$_POST['to']}\"</p>\n";

lib/net/nemein/redirector/viewer.php

Braces +2 added lines, -1 removed lines

@@ -152,7 +152,8 @@
                     try {
                         $topic = new midcom_db_topic($id);
                         $id = $topic->id;
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         $e->log();
                         break;
                     }

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
     public function _on_initialize()
     {
         // Match /
-        if (   is_null($this->_config->get('redirection_type'))
-            || (   $this->_topic->can_do('net.nemein.redirector:noredirect')
+        if (is_null($this->_config->get('redirection_type'))
+            || ($this->_topic->can_do('net.nemein.redirector:noredirect')
                 && !$this->_config->get('admin_redirection'))) {
             $this->_request_switch['redirect'] = [
                 'handler' => [net_nemein_redirector_handler_tinyurl::class, 'list'],

lib/net/nemein/wiki/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof midcom_db_article
+        if ($object instanceof midcom_db_article
             && $topic->id == $object->topic) {
             if ($object->name == 'index') {
                 return '';

Braces +2 added lines, -1 removed lines

@@ -30,7 +30,8 @@
             foreach ($result as $wikipage) {
                 try {
                     $datamanager->set_storage($wikipage);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log(MIDCOM_LOG_WARN);
                     continue;
                 }