flack / openpsa

lib/org/routamc/positioning/aerodrome.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      */
     public function _on_creating()
     {
-        if (   $this->longitude
+        if ($this->longitude
             && $this->latitude)
         {
             $qb = org_routamc_positioning_aerodrome_dba::new_query_builder();

lib/org/routamc/positioning/location.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
      */
     public function _on_created()
     {
-        if (   !$this->log
+        if (!$this->log
             && $this->relation == self::RELATION_IN)
         {
             // This location entry is defined as being made in a location,

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
                 if (isset($parent->title))
                 {
                     $label = $parent->title;
-                }
-                elseif (method_exists($parent, 'get_label'))
+                } elseif (method_exists($parent, 'get_label'))
                 {
                     $label = $parent->get_label();
                 }

lib/org/routamc/positioning/user.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 {
     static public function set_location(array $location)
     {
-        if (   !isset($location['latitude'])
+        if (!isset($location['latitude'])
             || !isset($location['longitude']))
         {
             throw new InvalidArgumentException('No coordinates provided');
@@ -65,7 +65,7 @@ 
 
     static public function set_location_for_person(array $location, midcom_db_person $person)
     {
-        if (   !isset($location['latitude'])
+        if (!isset($location['latitude'])
             || !isset($location['longitude']))
         {
             throw new InvalidArgumentException('No coordinates provided');

lib/org/routamc/positioning/country.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     public function _on_creating()
     {
         $qb = org_routamc_positioning_country_dba::new_query_builder();
-        $qb->add_constraint('name', '=', (string)$this->name);
+        $qb->add_constraint('name', '=', (string) $this->name);
         $qb->set_limit(1);
         $matches = $qb->execute_unchecked();
         if (count($matches) > 0)

lib/org/routamc/positioning/person.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      */
     function seek_log($time = null)
     {
-        if (   is_null($this->_person)
+        if (is_null($this->_person)
             || !$this->_person->id)
         {
             return null;

lib/org/openpsa/contacts/handler/group/view.php

Spacing +8 added lines, -14 removed lines

@@ -42,30 +42,25 @@ 
         $buttons = array();
         if ($this->_group->can_do('midgard:update'))
         {
-            $buttons = array
-            (
-                $workflow->get_button("group/edit/{$this->_group->guid}/", array
-                (
+            $buttons = array(
+                $workflow->get_button("group/edit/{$this->_group->guid}/", array(
                     MIDCOM_TOOLBAR_ACCESSKEY => 'e',
                 )),
-                $workflow->get_button("group/create/organization/{$this->_group->guid}/", array
-                (
+                $workflow->get_button("group/create/organization/{$this->_group->guid}/", array(
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create suborganization'),
                     MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people-new.png',
                 )),
-                $workflow->get_button("group/create/group/{$this->_group->guid}/", array
-                (
+                $workflow->get_button("group/create/group/{$this->_group->guid}/", array(
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create subgroup'),
                     MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people-new.png',
                 ))
             );
         }
 
-        if (   midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_contacts_person_dba')
+        if (midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_contacts_person_dba')
             && $this->_group->can_do('midgard:create'))
         {
-            $buttons[] = $workflow->get_button("person/create/{$this->_group->guid}/", array
-            (
+            $buttons[] = $workflow->get_button("person/create/{$this->_group->guid}/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create person'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_person-new.png',
             ));
@@ -73,11 +68,10 @@ 
 
         $siteconfig = org_openpsa_core_siteconfig::get_instance();
         $user_url = $siteconfig->get_node_full_url('org.openpsa.user');
-        if (   $user_url
+        if ($user_url
             && midcom::get()->auth->can_user_do('org.openpsa.user:access', null, 'org_openpsa_user_interface'))
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => $user_url . "group/{$this->_group->guid}/",
                 MIDCOM_TOOLBAR_LABEL => $this->_i18n->get_string('user management', 'org.openpsa.user'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/properties.png',

Braces +3 added lines, -6 removed lines

@@ -57,8 +57,7 @@ 
             // This is the root node
             $node_identifier = '';
             $nodes['/'] = $node;
-        }
-        else
+        } else
         {
             $node_identifier = $prefix . trim($node[MIDCOM_NAV_URL], '/');
             $nodes[$node_identifier] = $node;
@@ -112,8 +111,7 @@ 
             // The linked page is in same namespace
             $nap = new midcom_helper_nav();
             $folder = $nap->get_node($this->_topic);
-        }
-        else
+        } else
         {
             $folder = $this->resolve_namespaces($path, $matches, $levels, $force_resolve_folder_tree, $force_as_root);
         }
@@ -128,8 +126,7 @@ 
             if (count($wikipages) == 1)
             {
                 $matches['wikipage'] = $wikipages[0];
-            }
-            else
+            } else
             {
                 // No page found, go to create
                 $matches['folder'] = $folder;

lib/org/openpsa/contacts/handler/group/create.php

Spacing +3 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
     {
         $this->_group = new org_openpsa_contacts_group_dba();
 
-        if (   $this->_type == 'organization'
+        if ($this->_type == 'organization'
             && $this->_parent_group)
         {
             $this->_group->owner = (int) $this->_parent_group->id;
@@ -86,7 +86,7 @@ 
         }
         $this->_group->name = time();
 
-        if (! $this->_group->create())
+        if (!$this->_group->create())
         {
             debug_print_r('We operated on this object:', $this->_group);
             throw new midcom_error("Failed to create a new group. Error: " . midcom_connection::get_error_string());
@@ -119,8 +119,7 @@ 
 
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get($this->_type)));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $this->get_controller('create'),
             'save_callback' => array($this, 'save_callback')
         ));

Braces +3 added lines, -6 removed lines

@@ -43,8 +43,7 @@ 
                  * this group id
                  */
                 $product_qb->add_constraint('productGroup', 'INTREE', $groups[0]->id);
-            }
-            else
+            } else
             {
                 $product_qb->add_constraint('productGroup', 'IN', $categories);
             }
@@ -80,8 +79,7 @@ 
         {
             $product_group = $args[0];
             $show_products = (int) $args[1];
-        }
-        else
+        } else
         {
             $show_products = (int) $args[0];
             $product_group = '';
@@ -147,8 +145,7 @@ 
         if ($handler_id == 'updated_products_feed_intree')
         {
             $this->_list_products($this->_config->get('show_items_in_feed'), $args[0]);
-        }
-        else
+        } else
         {
             $this->_list_products($this->_config->get('show_items_in_feed'));
         }

lib/org/openpsa/contacts/handler/search.php

Spacing +10 added lines, -15 removed lines

@@ -82,7 +82,7 @@ 
 
         // Handle automatic wildcards
         $auto_wildcards = $this->_config->get('auto_wildcards');
-        if (   $auto_wildcards
+        if ($auto_wildcards
             && strpos($this->_query_string_processed, '%') === false)
         {
             switch ($auto_wildcards)
@@ -132,7 +132,7 @@ 
      */
     public function _show_search_type($handler_id, array &$data)
     {
-        if (   $this->_view == 'foaf'
+        if ($this->_view == 'foaf'
             && sizeof($this->_persons) > 0)
         {
             midcom_show_style('foaf-header');
@@ -169,12 +169,12 @@ 
             return $this->_prepare_json_reply();
         }
 
-        if (   count($this->_groups) == 1
+        if (count($this->_groups) == 1
             && count($this->_persons) == 0)
         {
             return new midcom_response_relocate('group/' . $this->_groups[0]->guid . '/');
         }
-        if (   count($this->_groups) == 0
+        if (count($this->_groups) == 0
             && count($this->_persons) == 1)
         {
             return new midcom_response_relocate('person/' . $this->_persons[0]->guid . '/');
@@ -193,8 +193,7 @@ 
         $data = array();
         foreach ($this->_persons as $person)
         {
-            $data[] = array
-            (
+            $data[] = array(
                 'category' => $this->_l10n->get('persons'),
                 'label' => $person->get_label(),
                 'value' => $person->get_label(),
@@ -203,8 +202,7 @@ 
         }
         foreach ($this->_groups as $group)
         {
-            $data[] = array
-            (
+            $data[] = array(
                 'category' => $this->_l10n->get('groups'),
                 'label' => $group->get_label(),
                 'value' => $group->get_label(),
@@ -222,21 +220,18 @@ 
         $buttons = array();
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_contacts_person_dba'))
         {
-            $buttons[] = $workflow->get_button('person/create/', array
-            (
+            $buttons[] = $workflow->get_button('person/create/', array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create person'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_person-new.png',
             ));
         }
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_contacts_group_dba'))
         {
-            $buttons[] = $workflow->get_button('group/create/organization/', array
-            (
+            $buttons[] = $workflow->get_button('group/create/organization/', array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create organization'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people-new.png',
             ));
-            $buttons[] = $workflow->get_button('group/create/group/', array
-            (
+            $buttons[] = $workflow->get_button('group/create/group/', array(
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get('group')),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people-new.png',
             ));
@@ -259,7 +254,7 @@ 
 
         midcom_show_style('search-header');
 
-        if (   count($this->_groups) == 0
+        if (count($this->_groups) == 0
             && count($this->_persons) == 0
             && $this->_query_string)
         {

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 throw new midcom_error(midcom_connection::get_error_string());
             }
-        }
-        else
+        } else
         {
             $nodes = $object_qb->execute();
             $node = $nodes[0];

lib/org/openpsa/contacts/handler/person/view.php

Spacing +11 added lines, -18 removed lines

@@ -72,10 +72,8 @@ 
         if ($data['person_rss_url'])
         {
             // We've autoprobed that this contact has a RSS feed available, link it
-            midcom::get()->head->add_link_head
-            (
-                array
-                (
+            midcom::get()->head->add_link_head(
+                array(
                     'rel'   => 'alternate',
                     'type'  => 'application/rss+xml',
                     'title' => sprintf($this->_l10n->get('rss feed of person %s'), $this->_contact->name),
@@ -105,8 +103,7 @@ 
         $buttons = array();
         if ($this->_contact->can_do('midgard:update'))
         {
-            $buttons[] = $workflow->get_button("person/edit/{$this->_contact->guid}/", array
-            (
+            $buttons[] = $workflow->get_button("person/edit/{$this->_contact->guid}/", array(
                 MIDCOM_TOOLBAR_ACCESSKEY => 'e',
             ));
         }
@@ -115,24 +112,22 @@ 
         $invoices_url = $siteconfig->get_node_full_url('org.openpsa.invoices');
         $user_url = $siteconfig->get_node_full_url('org.openpsa.user');
 
-        if (   $invoices_url
+        if ($invoices_url
             && midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_invoices_invoice_dba'))
         {
             if ($this->_contact->can_do('midgard:update'))
             {
-                $buttons[] = $workflow->get_button($invoices_url . "billingdata/" . $this->_contact->guid . '/', array
-                (
+                $buttons[] = $workflow->get_button($invoices_url . "billingdata/" . $this->_contact->guid . '/', array(
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('edit billingdata'),
                 ));
             }
         }
 
-        if (   $user_url
-            && (   midcom_connection::get_user() == $this->_contact->id
+        if ($user_url
+            && (midcom_connection::get_user() == $this->_contact->id
                 || midcom::get()->auth->can_user_do('org.openpsa.user:access', null, 'org_openpsa_user_interface')))
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => $user_url . "view/{$this->_contact->guid}/",
                 MIDCOM_TOOLBAR_LABEL => $this->_i18n->get_string('user management', 'org.openpsa.user'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/properties.png',
@@ -150,8 +145,7 @@ 
         if ($mycontacts->is_member($this->_contact->guid))
         {
             // We're buddies, show remove button
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "mycontacts/remove/{$this->_contact->guid}/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('remove from my contacts'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png',
@@ -160,8 +154,7 @@ 
         else
         {
             // We're not buddies, show add button
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "mycontacts/add/{$this->_contact->guid}/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('add to my contacts'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_person.png',
@@ -215,7 +208,7 @@ 
     public function _show_group_memberships($handler_id, array &$data)
     {
         // This is most likely a dynamic_load
-        if (   count($data['organizations']) == 0
+        if (count($data['organizations']) == 0
             && count($data['groups']) == 0)
         {
             midcom_show_style('show-person-groups-empty');

Braces +3 added lines, -6 removed lines

@@ -156,8 +156,7 @@ 
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('remove from my contacts'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png',
             );
-        }
-        else
+        } else
         {
             // We're not buddies, show add button
             $buttons[] = array
@@ -220,8 +219,7 @@ 
         {
             midcom_show_style('show-person-groups-empty');
 
-        }
-        else
+        } else
         {
             $this->_show_memberships('organizations');
             $this->_show_memberships('groups');
@@ -241,8 +239,7 @@ 
             try
             {
                 $this->_request_data['group'] = org_openpsa_contacts_group_dba::get_cached($member->gid);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
                 continue;