flack / openpsa

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

@@ -103,8 +103,7 @@ 
         if ($this->_group->orgOpenpsaObtype < org_openpsa_contacts_group_dba::MYCONTACTS)
         {
             midcom_show_style('show-group-other');
-        }
-        else
+        } else
         {
             midcom_show_style('show-group');
         }
@@ -128,16 +127,14 @@ 
             $data['group_tree'] = $this->_master->get_group_tree();
             $data['members_grid'] = new org_openpsa_widgets_grid('members_grid', 'json');
             org_openpsa_widgets_tree::add_head_elements();
-        }
-        else
+        } else
         {
             $this->_type = 'organization';
             $root_group = org_openpsa_contacts_interface::find_root_group();
             if ($this->_group->owner != $root_group->id)
             {
                 $data['parent_group'] = $this->_group->get_parent();
-            }
-            else
+            } else
             {
                 $data['parent_group'] = false;
             }

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

Spacing +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
 
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('edit %s'), $this->_l10n->get($this->_type)));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $this->get_controller('simple', $this->_group),
             'save_callback' => array($this, 'save_callback')
         ));

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
         if ($this->_group->orgOpenpsaObtype < org_openpsa_contacts_group_dba::MYCONTACTS)
         {
             $this->_type = 'group';
-        }
-        else
+        } else
         {
             $this->_type = 'organization';
         }

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

@@ -54,8 +54,7 @@ 
             {
                 // Set the default type to "department"
                 $defaults['object_type'] = org_openpsa_contacts_group_dba::DEPARTMENT;
-            }
-            else
+            } else
             {
                 $defaults['owner'] = org_openpsa_contacts_interface::find_root_group()->id;
             }
@@ -78,8 +77,7 @@ 
             && $this->_parent_group)
         {
             $this->_group->owner = (int) $this->_parent_group->id;
-        }
-        else
+        } else
         {
             $root_group = org_openpsa_contacts_interface::find_root_group();
             $this->_group->owner = (int) $root_group->id;
@@ -110,8 +108,7 @@ 
             // Get the parent organization
             $this->_parent_group = new org_openpsa_contacts_group_dba($args[1]);
             $this->_parent_group->require_do('midgard:create');
-        }
-        else
+        } else
         {
             // This is a root level organization, require creation permissions under the component root group
             midcom::get()->auth->require_user_do('midgard:create', null, 'org_openpsa_contacts_group_dba');

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

@@ -265,8 +265,7 @@
         {
             //No results at all (from any of the queries)
             midcom_show_style('search-empty');
-        }
-        else
+        } else
         {
             if (count($this->_groups) > 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;

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

Spacing +2 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
     {
         $this->_person = new org_openpsa_contacts_person_dba();
 
-        if (! $this->_person->create())
+        if (!$this->_person->create())
         {
             debug_print_r('We operated on this object:', $this->_person);
             throw new midcom_error("Failed to create a new person, cannot continue. Error: " . midcom_connection::get_error_string());
@@ -84,8 +84,7 @@ 
 
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get('person')));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $this->get_controller('create'),
             'save_callback' => array($this, 'save_callback')
         ));

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
             if ($this->_group->orgOpenpsaObtype >= org_openpsa_contacts_group_dba::ORGANIZATION)
             {
                 $defaults['organizations'] = array($this->_group->id);
-            }
-            else if ($this->_group->orgOpenpsaObtype < org_openpsa_contacts_group_dba::MYCONTACTS)
+            } else if ($this->_group->orgOpenpsaObtype < org_openpsa_contacts_group_dba::MYCONTACTS)
             {
                 $defaults['groups'] = array($this->_group->id);
             }

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

Spacing +3 added lines, -4 removed lines

@@ -59,9 +59,9 @@ 
     {
         $this->_load_schemadb();
         $this->_controller = midcom_helper_datamanager2_controller::create('simple');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->set_storage($this->_contact, $this->_schema);
-        if (! $this->_controller->initialize())
+        if (!$this->_controller->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 controller instance for contact {$this->_contact->id}.");
         }
@@ -82,8 +82,7 @@ 
         $this->_load_controller();
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('edit %s'), $this->_l10n->get('person')));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $this->_controller,
             'save_callback' => array($this, 'save_callback')
         ));

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

Spacing +6 added lines, -11 removed lines

@@ -27,8 +27,7 @@ 
         $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',
             ));
@@ -36,13 +35,11 @@ 
 
         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',
             ));
@@ -51,8 +48,7 @@ 
         $p_merger = new org_openpsa_contacts_duplicates_merge('person', $this->_config);
         if ($p_merger->merge_needed())
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => 'duplicates/person/',
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('merge persons'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/repair.png',
@@ -61,11 +57,10 @@ 
         }
         $this->_view_toolbar->add_items($buttons);
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config'))
         {
-            $this->_node_toolbar->add_item($workflow->get_button('config/', array
-            (
+            $this->_node_toolbar->add_item($workflow->get_button('config/', array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
                 MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_folder-properties.png',

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

Spacing +10 added lines, -10 removed lines

@@ -45,7 +45,7 @@ 
 
     private function load_next()
     {
-        $i =& $this->_request_data['loop_i'];
+        $i = & $this->_request_data['loop_i'];
         while ($i < 100)
         {
             debug_add("Loop iteration {$i}");
@@ -79,7 +79,7 @@ 
                 continue;
             }
             // Make sure we actually have enough rights to do this
-            if (   !$person1->can_do('midgard:update')
+            if (!$person1->can_do('midgard:update')
                 || !$person1->can_do('midgard:delete')
                 || !$person2->can_do('midgard:update')
                 || !$person2->can_do('midgard:delete'))
@@ -89,7 +89,7 @@ 
                 continue;
             }
             // Extra sanity check (in case of semi-successful not-duplicate mark)
-            if (   $person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
+            if ($person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
                 || $person2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person1->guid))
             {
                 debug_add("It seems these two (#{$person1->id} and #{$person2->id}) have also marked as not duplicates, some cleanup might be a good thing", MIDCOM_LOG_WARN);
@@ -97,7 +97,7 @@ 
                 continue;
             }
 
-            $this->_request_data['probability'] = (float)$param->value;
+            $this->_request_data['probability'] = (float) $param->value;
             $this->_request_data['person1'] = $person1;
             $this->_request_data['person2'] = $person2;
             break;
@@ -106,7 +106,7 @@ 
 
     private function process_submit()
     {
-        if (   !empty($_POST['org_openpsa_contacts_handler_duplicates_person_keep'])
+        if (!empty($_POST['org_openpsa_contacts_handler_duplicates_person_keep'])
             && !empty($_POST['org_openpsa_contacts_handler_duplicates_person_options'])
             && count($_POST['org_openpsa_contacts_handler_duplicates_person_options']) == 2)
         {
@@ -117,7 +117,7 @@ 
             {
                 $option1->require_do('midgard:update');
                 $option2->require_do('midgard:update');
-                if (   $option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
+                if ($option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
                     && $option2->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option1->guid, time()))
                 {
                     // Clear the possible duplicate parameters
@@ -141,13 +141,13 @@ 
             {
                 if ($keep == $option1->guid)
                 {
-                    $person1 =& $option1;
-                    $person2 =& $option2;
+                    $person1 = & $option1;
+                    $person2 = & $option2;
                 }
                 else if ($keep == $option2->guid)
                 {
-                    $person1 =& $option2;
-                    $person2 =& $option1;
+                    $person1 = & $option2;
+                    $person2 = & $option1;
                 }
                 else
                 {

Braces +7 added lines, -14 removed lines

@@ -72,8 +72,7 @@ 
             {
                 $person1 = new org_openpsa_contacts_person_dba($param->parentguid);
                 $person2 = new org_openpsa_contacts_person_dba($param->name);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $i++;
                 continue;
@@ -126,8 +125,7 @@ 
 
                     // TODO: Localize
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), "Keeping both \"{$option1->name}\" and \"{$option2->name}\", they will not be marked as duplicates in the future", 'ok');
-                }
-                else
+                } else
                 {
                     $errstr = midcom_connection::get_error_string();
                     // Failed to set as not duplicate, clear parameter that might have been set (could have only been the first)
@@ -136,20 +134,17 @@ 
                     // TODO: Localize
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), "Failed to mark #{$option1->id} and # {$option2->id} as not duplicates, errstr: {$errstr}", 'error');
                 }
-            }
-            else
+            } else
             {
                 if ($keep == $option1->guid)
                 {
                     $person1 =& $option1;
                     $person2 =& $option2;
-                }
-                else if ($keep == $option2->guid)
+                } else if ($keep == $option2->guid)
                 {
                     $person1 =& $option2;
                     $person2 =& $option1;
-                }
-                else
+                } else
                 {
                     throw new midcom_error('Something weird happened (basically we got bogus data)');
                 }
@@ -160,8 +155,7 @@ 
                 {
                     $merger = new org_openpsa_contacts_duplicates_merge('person', $this->_config);
                     $merger->merge_delete($person1, $person2);
-                }
-                catch (midcom_error $e)
+                } catch (midcom_error $e)
                 {
                     // TODO: Localize
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), 'Merge failed, errstr: ' . $e->getMessage(), 'error');
@@ -182,8 +176,7 @@ 
         if (!$this->_request_data['notfound'])
         {
             midcom_show_style('show-duplicate-persons');
-        }
-        else
+        } else
         {
             midcom_show_style('show-duplicate-persons-notfound');
         }