flack / openpsa

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

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

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/duplicates/person.php

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');
         }

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

Braces +5 added lines, -10 removed lines

@@ -59,8 +59,7 @@ 
             {
                 $root_groups[$name] = $group;
             }
-        }
-        else
+        } else
         {
             debug_add("OpenPSA Contacts root group could not be found", MIDCOM_LOG_WARN);
 
@@ -168,8 +167,7 @@ 
             try
             {
                 $person = new org_openpsa_contacts_person_dba($args['person']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $handler->print_error("Person {$args['person']} not found, error " . $e->getMessage());
                 return false;
@@ -180,15 +178,13 @@ 
                 return false;
             }
             return $this->_check_person_url($person);
-        }
-        else if (array_key_exists('group', $args))
+        } else if (array_key_exists('group', $args))
         {
             // Handling for groups
             try
             {
                 $group = new org_openpsa_contacts_group_dba($args['group']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $handler->print_error("Group {$args['group']} not found, error " . $e->getMessage());
                 return false;
@@ -255,8 +251,7 @@ 
         {
             // GeoRSS subscription is a good way to keep track of person's location
             $person->set_parameter('org.routamc.positioning:georss', 'georss_url', $data['georss_url']);
-        }
-        else if (array_key_exists('icbm', $data))
+        } else if (array_key_exists('icbm', $data))
         {
             // Instead of using the ICBM position data directly we can subscribe to it so we get modifications too
             $person->set_parameter('org.routamc.positioning:html', 'icbm_url', $person->homepage);

lib/org/openpsa/contacts/duplicates/check.php

Braces +2 added lines, -4 removed lines

@@ -138,8 +138,7 @@ 
         {
             $ret['email_match'] = true;
             $ret['p'] += 1;
-        }
-        else if (!empty($person1['lastname']))
+        } else if (!empty($person1['lastname']))
         {
             // if user's lastname is part of the email address, check to see if the difference is only in the domain part
             $email1 = preg_replace('/@.+/', '', $person1['email']);
@@ -435,8 +434,7 @@ 
             {
                 $obj1 = $class::get_cached($arr1['guid']);
                 $obj2 = $class::get_cached($arr2['guid']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
                 continue;

lib/org/openpsa/calendar/event.php

Braces +3 added lines, -6 removed lines

@@ -310,8 +310,7 @@ 
             if ($linkdata['link']->create())
             {
                 debug_add("saved link to task #{$linkdata['other_obj']->id} (link id #{$linkdata['link']->id})", MIDCOM_LOG_INFO);
-            }
-            else
+            } else
             {
                 debug_add("could not save link to task #{$linkdata['other_obj']->id}, errstr" . midcom_connection::get_error_string(), MIDCOM_LOG_WARN);
             }
@@ -360,8 +359,7 @@ 
             if ($linkdata['link']->create())
             {
                 debug_add("saved sales link to {$linkdata['other_obj']->guid} (link id #{$linkdata['link']->id})", MIDCOM_LOG_INFO);
-            }
-            else
+            } else
             {
                 debug_add("could not save sales link to {$linkdata['other_obj']->guid}, errstr" . midcom_connection::get_error_string(), MIDCOM_LOG_WARN);
             }
@@ -420,8 +418,7 @@ 
         if ($this->orgOpenpsaAccesstype == org_openpsa_core_acl::ACCESS_PRIVATE)
         {
             $this->set_privilege('org.openpsa.calendar:read', 'EVERYONE', MIDCOM_PRIVILEGE_DENY);
-        }
-        else
+        } else
         {
             $this->set_privilege('org.openpsa.calendar:read', 'EVERYONE', MIDCOM_PRIVILEGE_ALLOW);
         }

lib/org/openpsa/calendar/event/member.php

Braces +4 added lines, -8 removed lines

@@ -123,8 +123,7 @@ 
             || $type == 'remove')
         {
             // TODO: Create iCal export with correct delete commands
-        }
-        else
+        } else
         {
             $generator = midcom::get()->serviceloader->load('midcom_core_service_urlgenerator');
             $encoder = new org_openpsa_calendar_vcal;
@@ -158,8 +157,7 @@ 
                 debug_add('person #' . $person->id . 'has no email address, aborting');
                 return false;
             }
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             return false;
         }
@@ -190,8 +188,7 @@ 
             try
             {
                 $event = org_openpsa_calendar_event_dba::get_cached($eid);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 continue;
             }
@@ -247,8 +244,7 @@ 
                     {
                         // First event of the day starts after we have started working, use work start time as last end time.
                         $last_end_time = $workday_starts_ts;
-                    }
-                    else
+                    } else
                     {
                         // Make the first event of the day the last end time and skip rest of the checks
                         $last_end_time = $event->end;

lib/org/openpsa/calendar/handler/create.php

Braces +3 added lines, -6 removed lines

@@ -44,8 +44,7 @@ 
         {
             $person = $person->get_storage();
             $defaults['participants'][$person->id] = $person;
-        }
-        else if ($group = midcom::get()->auth->get_group($this->resource))
+        } else if ($group = midcom::get()->auth->get_group($this->resource))
         {
             foreach ($group->list_members() as $member)
             {
@@ -98,8 +97,7 @@ 
             if (!empty($_GET['end']))
             {
                 $this->_requested_end = strtotime($_GET['end']);
-            }
-            else
+            } else
             {
                 $this->_requested_end = $this->_requested_start + 3600;
             }
@@ -120,8 +118,7 @@ 
             $indexer = new org_openpsa_calendar_midcom_indexer($this->_topic);
             $indexer->index($data['controller']->datamanager);
             midcom::get()->head->add_jsonload('openpsa_calendar_widget.refresh_parent();');
-        }
-        else if (!empty($conflictmanager->busy_members))
+        } else if (!empty($conflictmanager->busy_members))
         {
             midcom::get()->uimessages->add($this->_l10n->get('event conflict'), $conflictmanager->get_message($this->_l10n->get_formatter()), 'warning');
         }

lib/org/openpsa/calendar/handler/admin.php

Braces +2 added lines, -4 removed lines

@@ -65,8 +65,7 @@ 
             $indexer = new org_openpsa_calendar_midcom_indexer($this->_topic);
             $indexer->index($data['controller']->datamanager);
             midcom::get()->head->add_jsonload('openpsa_calendar_widget.refresh_parent();');
-        }
-        else if (!empty($conflictmanager->busy_members))
+        } else if (!empty($conflictmanager->busy_members))
         {
             midcom::get()->uimessages->add($this->_l10n->get('event conflict'), $conflictmanager->get_message($this->_l10n->get_formatter()), 'warning');
         }
@@ -93,8 +92,7 @@ 
         if (empty($_POST['end']))
         {
             $end = $event->end + ($start - $event->start);
-        }
-        else
+        } else
         {
             $end = strtotime($_POST['end']);
         }